[audiofile/cgltf/libsbml] Update to the latest version (#20066)

* [audiofile/cgltf/libsbml] Update to the latest version

* Format manifests

* [libsbml] Update branch from stable to development

* Update versions/l-/libsbml.json

* [audiofile] Add options to vcpkg_cmake_configure

12 files changed, 141 insertions, 73 deletions

diff --git a/ports/audiofile/fix-cmakeLists.patch b/ports/audiofile/fix-cmakeLists.patch
new file mode 100644
index 000000000..a7551d6ad
--- /dev/null
+++ b/ports/audiofile/fix-cmakeLists.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d43c0c7..1bf21cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,8 @@ cmake_minimum_required (VERSION 3.12)
+ project ("AudioFile" VERSION 1.0.9
+                      DESCRIPTION "A simple C++ library for reading and writing audio files."
+                      HOMEPAGE_URL "https://github.com/adamstark/AudioFile")
++option(BUILD_EXAMPLES "Build examples" OFF)
++option(BUILD_TESTS "Build tests" OFF)
+ 
+ #===============================================================================
+ include (GNUInstallDirs)
+@@ -21,10 +23,20 @@ target_include_directories (
+ target_compile_features (${PROJECT_NAME} INTERFACE cxx_std_11)
+ 
+ #===============================================================================
++if(BUILD_EXAMPLES)
+ add_subdirectory (examples)
++endif()
+ 
++if(BUILD_TESTS)
+ enable_testing()
+ add_subdirectory (tests)
+-
++endif()
+ #===============================================================================
+-set (CMAKE_SUPPRESS_REGENERATION true)
+\ No newline at end of file
++set (CMAKE_SUPPRESS_REGENERATION true)
++
++#install and export targets
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config)
++export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_NAME}Config.cmake)
++install(EXPORT ${PROJECT_NAME}Config DESTINATION share/AudioFile FILE ${PROJECT_NAME}Config.cmake)
++#install headers
++install(FILES AudioFile.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+\ No newline at end of file
diff --git a/ports/audiofile/portfile.cmake b/ports/audiofile/portfile.cmake
index 49f9a67d2..df0fff374 100644
--- a/ports/audiofile/portfile.cmake
+++ b/ports/audiofile/portfile.cmake
@@ -3,11 +3,24 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO adamstark/AudioFile
-    REF ccb64bd86881099e65a329f104733679ae03f63e # 1.0.7
-    SHA512 f172f9df95a028c9c3da29cd530dd4b55acad76ee7503000f96ba10c5d014abd219fcd145cea4b7ca7a902c38d968518b39de285d25f7e3ccc56d1ba3769d7b8
+    REF b7dd84abd5763f64fcf74e58499c4b5d779a396d # 1.0.9
+    SHA512 daadbf7badadee4a189453af137b1ea5a5ba3486780d02664d1516f379c3705155b1036a9f8f7acd49b6a82269a07e510edcd5e9de55c73f47250244a510ccbb
     HEAD_REF master
+    PATCHES
+        fix-cmakeLists.patch
 )
 
-file(COPY ${SOURCE_PATH}/AudioFile.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/ports/audiofile/vcpkg.json b/ports/audiofile/vcpkg.json
index d77964203..8d982a697 100644
--- a/ports/audiofile/vcpkg.json
+++ b/ports/audiofile/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "audiofile",
-  "version-string": "1.0.7",
+  "version": "1.0.9",
   "description": "A simple header-only C++ library for reading and writing audio files.",
   "homepage": "https://github.com/adamstark/AudioFile",
-  "license": "GPL-3.0"
+  "license": "GPL-3.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake
index de7e6ad32..54b8dade6 100644
--- a/ports/cgltf/portfile.cmake
+++ b/ports/cgltf/portfile.cmake
@@ -3,13 +3,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jkuhlmann/cgltf
-    REF v1.8
-    SHA512 d77064bf333b7d1cbc91e261f375f1fdd60934aeb3cf87f1121cf4c4ae294532885381a265f4380c79d6bc75de72ed5f3e57153c5d0d0db98a65ee14f8b1bbfe
+    REF 1bdc84d3bb81fa69bcf71ed5cafe63e58df1448a #v1.10
+    SHA512 d7f06912a2654633e6d596805e09dbb315453837d066189091c78f7eb837a2caff1768d79f15e8b0536105ffeb67a46e7093e2d6b61091301754f4722c494ada
     HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/cgltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/cgltf_write.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY "${SOURCE_PATH}/cgltf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/cgltf_write.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 # Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
\ No newline at end of file
diff --git a/ports/cgltf/vcpkg.json b/ports/cgltf/vcpkg.json
index 14e732885..aa9ebec52 100644
--- a/ports/cgltf/vcpkg.json
+++ b/ports/cgltf/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cgltf",
-  "version-string": "1.8",
-  "port-version": 1,
+  "version": "1.10",
   "description": "Single-file glTF 2.0 loader and writer written in C99",
   "homepage": "https://github.com/jkuhlmann/cgltf"
 }
diff --git a/ports/libsbml/fix-linkage-type.patch b/ports/libsbml/fix-linkage-type.patch
deleted file mode 100644
index 08186357a..000000000
--- a/ports/libsbml/fix-linkage-type.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index eb692cf..11158db 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -524,7 +524,7 @@ INSTALL(
- endif()
- 
-   
--endif()
-+else()
- 
- add_library (${LIBSBML_LIBRARY}-static STATIC ${LIBSBML_SOURCES} )
- 
-@@ -560,7 +560,7 @@ INSTALL(FILES
-   DESTINATION ${PACKAGE_CONFIG_DIR}
- )
- endif()
--
-+endif()
- ##############################################################################
- #
- # add native tests
diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake
index ed7749daa..47a1cc601 100644
--- a/ports/libsbml/portfile.cmake
+++ b/ports/libsbml/portfile.cmake
@@ -1,31 +1,30 @@
-vcpkg_download_distfile(ARCHIVE

-    URLS "https://sourceforge.net/projects/sbml/files/libsbml/5.18.0/stable/libSBML-5.18.0-core-plus-packages-src.tar.gz/download"

-    FILENAME "libSBML-5.18.0.zip"

-    SHA512 49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b

-)

+vcpkg_fail_port_install(ON_TARGET "uwp")

 

-vcpkg_extract_source_archive_ex(

+vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

-    ARCHIVE ${ARCHIVE}

-    PATCHES fix-linkage-type.patch

+    REPO sbmlteam/libsbml

+    REF 118ffbf11f1a5245cc544c1eac71019d979ecb20 #libSBML-5.19.0

+    SHA512 7fe8b4d594876c6408e01c646187cb1587d0b4e12707a43286150d4e4646841e547bde971de917de1cdfbbb9365172aeac43c8e02f7d354400f9166f0f1c2c3d

+    HEAD_REF development

 )

 

 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY)

 

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

-    comp        ENABLE_COMP

-    fbc         ENABLE_FBC

-    groups      ENABLE_GROUPS

-    layout      ENABLE_LAYOUT

-    multi       ENABLE_MULTI

-    qual        ENABLE_QUAL

-    render      ENABLE_RENDER

-    render      ENABLE_LAYOUT

-    bzip2       WITH_BZIP2

-    zlib        WITH_ZLIB

-    test        WITH_CHECK

-    namespace   WITH_CPP_NAMESPACE

+    FEATURES

+        comp        ENABLE_COMP

+        fbc         ENABLE_FBC

+        groups      ENABLE_GROUPS

+        layout      ENABLE_LAYOUT

+        multi       ENABLE_MULTI

+        qual        ENABLE_QUAL

+        render      ENABLE_RENDER

+        render      ENABLE_LAYOUT

+        bzip2       WITH_BZIP2

+        zlib        WITH_ZLIB

+        test        WITH_CHECK

+        namespace   WITH_CPP_NAMESPACE

 )

 

 # Handle conflict features

@@ -48,9 +47,8 @@ if ("test" IN_LIST FEATURES AND WIN32)
     message(FATAL_ERROR "Feature test only support UNIX.")

 endif()

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA # Disable this option if project cannot be built with Ninja

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS ${FEATURE_OPTIONS}

         -DWITH_EXPAT=${WITH_EXPAT}

         -DWITH_LIBXML=${WITH_LIBXML}

@@ -59,25 +57,33 @@ vcpkg_configure_cmake(
         -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY}

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)

+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)

 

 vcpkg_copy_pdbs()

 

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

-file(GLOB TXT_FILES ${CURRENT_PACKAGES_DIR}/debug/*.txt)

+file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt")

 if (TXT_FILES)

     file(REMOVE ${TXT_FILES})

 endif()

-file(GLOB TXT_FILES ${CURRENT_PACKAGES_DIR}/*.txt)

+file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt")

 if (TXT_FILES)

     file(REMOVE ${TXT_FILES})

 endif()

 

-if (EXISTS ${CURRENT_PACKAGES_DIR}/debug/share)

-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

+if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

+endif()

+

+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md")

+endif()

+

+if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md")

 endif()

 

-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json
index b67542721..aeb7318e6 100644
--- a/ports/libsbml/vcpkg.json
+++ b/ports/libsbml/vcpkg.json
@@ -1,9 +1,18 @@
 {
   "name": "libsbml",
-  "version-string": "5.18.0",
-  "port-version": 1,
+  "version": "5.19.0",
   "description": "A library for reading / writing SBML files",
   "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "comp",
     "expat",
diff --git a/versions/a-/audiofile.json b/versions/a-/audiofile.json
index 44ce155fb..cc7517be6 100644
--- a/versions/a-/audiofile.json
+++ b/versions/a-/audiofile.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "73a1d7555de8baaf7a1b34ca1410d7e9978bf75f",
+      "version": "1.0.9",
+      "port-version": 0
+    },
+    {
       "git-tree": "3bf2b19891a915f88803b1fa079c525e4d253ba0",
       "version-string": "1.0.7",
       "port-version": 0
diff --git a/versions/baseline.json b/versions/baseline.json
index f0f9883a0..6ea64c553 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -217,7 +217,7 @@
       "port-version": 7
     },
     "audiofile": {
-      "baseline": "1.0.7",
+      "baseline": "1.0.9",
       "port-version": 0
     },
     "aurora": {
@@ -1237,8 +1237,8 @@
       "port-version": 3
     },
     "cgltf": {
-      "baseline": "1.8",
-      "port-version": 1
+      "baseline": "1.10",
+      "port-version": 0
     },
     "cgns": {
       "baseline": "4.2.0",
@@ -3661,8 +3661,8 @@
       "port-version": 1
     },
     "libsbml": {
-      "baseline": "5.18.0",
-      "port-version": 1
+      "baseline": "5.19.0",
+      "port-version": 0
     },
     "libsbsms": {
       "baseline": "2.3.0",
diff --git a/versions/c-/cgltf.json b/versions/c-/cgltf.json
index 5cb89f988..6d2410588 100644
--- a/versions/c-/cgltf.json
+++ b/versions/c-/cgltf.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "3fc2cb13947f1e5bdabb4333fbc2a4f5ec3128f7",
+      "version": "1.10",
+      "port-version": 0
+    },
+    {
       "git-tree": "835b27ec3e0694edf605a79e0e7322dccd69d82f",
       "version-string": "1.8",
       "port-version": 1
diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json
index 3acc1b246..7faeb17e4 100644
--- a/versions/l-/libsbml.json
+++ b/versions/l-/libsbml.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "6b31fe78dcb93a9935119d5b9bcefbb1f3950d6a",
+      "version": "5.19.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "1a609c8dc53ab3d8895e749d2361c9085084dfec",
       "version-string": "5.18.0",
       "port-version": 1