[lilv] Fix dependencies, tools

microsoft · Dec 18, 2024 · 3d44200 · 3d44200
1 parent 2dc91c6
commit 3d44200
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/ports/lilv/portfile.cmake b/ports/lilv/portfile.cmake
@@ -7,15 +7,34 @@ vcpkg_from_gitlab(
     HEAD_REF master
 )
 
+set(options "")
+if("tools" IN_LIST FEATURES)
+    list(APPEND options -Dtools=enabled)
+else()
+    list(APPEND options -Dtools=disabled)
+endif()
+
 vcpkg_configure_meson(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${options}
+        -Dbindings_cpp=enabled
+        -Dbindings_py=disabled
+        -Ddocs=disabled
         -Dtests=disabled
 )
 
 vcpkg_install_meson()
-vcpkg_copy_tools(TOOL_NAMES lv2info lv2ls AUTO_CLEAN)
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES lv2apply lv2bench lv2info lv2ls AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/etc"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/lilv/vcpkg.json b/ports/lilv/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "lilv",
   "version": "0.24.24",
+  "port-version": 1,
   "description": "Lilv is a C library for simple use of LV2 plugins in applications.",
   "homepage": "https://drobilla.net/software/lilv",
   "license": "ISC",
-  "supports": "!uwp",
   "dependencies": [
     "lv2",
     "serd",
@@ -13,6 +13,16 @@
     {
       "name": "vcpkg-tool-meson",
       "host": true
+    },
+    "zix"
+  ],
+  "features": {
+    "tools": {
+      "description": "Build tools",
+      "supports": "!windows",
+      "dependencies": [
+        "libsndfile"
+      ]
     }
-  ]
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5546,7 +5546,7 @@
     },
     "lilv": {
       "baseline": "0.24.24",
-      "port-version": 0
+      "port-version": 1
     },
     "linalg": {
       "baseline": "2.2",

diff --git a/versions/l-/lilv.json b/versions/l-/lilv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "75faa9fdbf900e93fb303580d24c06ac31be7e6e",
+      "version": "0.24.24",
+      "port-version": 1
+    },
     {
       "git-tree": "350900cd2f7b77c0b2cfc8d033fe98dc4f092ee7",
       "version": "0.24.24",