[lilv] update to 0.24.24 (#42537)

microsoft · Dec 14, 2024 · b545373 · b545373
1 parent 3b57fb2
commit b545373
Show file tree

Hide file tree

Showing 24 changed files with 158 additions and 340 deletions.
diff --git a/ports/lilv/CMakeLists.txt b/ports/lilv/CMakeLists.txt
diff --git a/ports/lilv/portfile.cmake b/ports/lilv/portfile.cmake
@@ -2,24 +2,20 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lv2/lilv
-    REF v0.24.10
-    SHA512 be47b72f2671f3bbab219944519b990156547e26aa432c2618273683c86dc23ae3b071d1de586f45dfda3ea8dbbc095429ad318fda60efcf715ae917a7caa34b
+    REF "v${VERSION}"
+    SHA512 844d72a07d3978e1cc908962f0fb957b47032277a419e1639885e3a49d27278fc48ab774229d18ba2b811bab755c8a1cbfa10b805de5f1cfe1bc2f9424913f5a
     HEAD_REF master
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
+vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
+    OPTIONS
+        -Dtests=disabled
 )
 
-vcpkg_cmake_install()
-
+vcpkg_install_meson()
+vcpkg_copy_tools(TOOL_NAMES lv2info lv2ls AUTO_CLEAN)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
-file(
-    INSTALL "${SOURCE_PATH}/COPYING"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/lilv/vcpkg.json b/ports/lilv/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "lilv",
-  "version": "0.24.10",
-  "port-version": 2,
+  "version": "0.24.24",
   "description": "Lilv is a C library for simple use of LV2 plugins in applications.",
   "homepage": "https://drobilla.net/software/lilv",
   "license": "ISC",
@@ -12,11 +11,7 @@
     "sord",
     "sratom",
     {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
+      "name": "vcpkg-tool-meson",
       "host": true
     }
   ]

diff --git a/ports/lv2/portfile.cmake b/ports/lv2/portfile.cmake
@@ -1,5 +1,3 @@
-set(VCPKG_BUILD_TYPE release) # header-only
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lv2/lv2
@@ -17,8 +15,9 @@ vcpkg_configure_meson(
 )
 
 vcpkg_install_meson()
+vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/lv2-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/lv2/vcpkg.json b/ports/lv2/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "lv2",
   "version": "1.18.10",
+  "port-version": 1,
   "description": "LV2 is a plugin standard for audio systems. It defines a minimal yet extensible C API for plugin code and a format for plugin \"bundles\".",
   "homepage": "https://lv2plug.in",
   "license": "ISC",

diff --git a/ports/serd/CMakeLists.txt b/ports/serd/CMakeLists.txt
diff --git a/ports/serd/portfile.cmake b/ports/serd/portfile.cmake
@@ -2,24 +2,19 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO drobilla/serd
-    REF v0.30.4
-    SHA512 59b4f67dfa8a2c01119b1c69609030d851339ba6d85c5c559b7c2454492ef40498ce710e5cf5f7a698a292db81e6bffacb86f9dafa5d7f3fe0c60d53d6e2281f
-    HEAD_REF master
+    REF "v${VERSION}"
+    SHA512 f90bf597579c5f858ebfe19a7e7cb0b824fe7485c475e3cce88427dd99f9228f5bf4708b7a9f2c67763a3c76166043cdc8cfc2d4891fab6d2a85d6ae8cd97615
+    HEAD_REF main
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
+vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
 )
 
-vcpkg_cmake_install()
+vcpkg_install_meson()
 
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
-file(
-    INSTALL "${SOURCE_PATH}/COPYING"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_tools(TOOL_NAMES serdi AUTO_CLEAN)
+vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/serd/vcpkg.json b/ports/serd/vcpkg.json
@@ -1,17 +1,12 @@
 {
   "name": "serd",
-  "version": "0.30.4",
-  "port-version": 2,
+  "version": "0.32.2",
   "description": "Serd is a lightweight C library for RDF syntax which supports reading and writing Turtle, TRiG, NTriples, and NQuads.",
   "homepage": "https://drobilla.net/software/serd",
   "license": "ISC",
   "dependencies": [
     {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
+      "name": "vcpkg-tool-meson",
       "host": true
     }
   ]

diff --git a/ports/sord/CMakeLists.txt b/ports/sord/CMakeLists.txt
diff --git a/ports/sord/portfile.cmake b/ports/sord/portfile.cmake
@@ -2,24 +2,19 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO drobilla/sord
-    REF v0.16.4
-    SHA512 cad8f8fd07afb5075938fce247d95f9d666f61f4d913ff0c3fde335384177de066a5c0f2620c76e098178aeded0412b3e76ef63a1ae65aba7eb99e3e8ce15896
+    REF "v${VERSION}"
+    SHA512 73011eba2beea1620f6ca2a911ac331e7a5b31835361893158ac04345504d7d071525fcae6126c2bd87e087c0a407afbd7dbcd37020a3e43cdf5679cb4b27a8b
     HEAD_REF master
 )
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_cmake_configure(
+vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
 )
 
-vcpkg_cmake_install()
+vcpkg_install_meson()
 
 vcpkg_copy_pdbs()
-vcpkg_cmake_config_fixup()
-file(
-    INSTALL "${SOURCE_PATH}/COPYING"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_tools(TOOL_NAMES sordi sord_validate AUTO_CLEAN)
+vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/sord/vcpkg.json b/ports/sord/vcpkg.json
@@ -1,19 +1,17 @@
 {
   "name": "sord",
-  "version": "0.16.4",
-  "port-version": 2,
+  "version": "0.16.16",
   "description": "Sord is a lightweight C library for storing RDF statements in memory.",
   "homepage": "https://drobilla.net/software/sord",
   "license": "ISC",
+  "supports": "!uwp",
   "dependencies": [
+    "pcre2",
     "serd",
     {
-      "name": "vcpkg-cmake",
+      "name": "vcpkg-tool-meson",
       "host": true
     },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    "zix"
   ]
 }