[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

3 files changed, 48 insertions, 55 deletions

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",