[libnice-gst] meson dep & copy pdb only if it exists (#37251)

microsoft · Mar 8, 2024 · 363e5e8 · 363e5e8
1 parent 908701a
commit 363e5e8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/ports/libnice-gst/portfile.cmake b/ports/libnice-gst/portfile.cmake
@@ -64,10 +64,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer")
         file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}"
                     "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}")
-        if(VCPKG_TARGET_IS_WINDOWS)
+        if(VCPKG_TARGET_IS_WINDOWS AND EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb")
             file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb"
                         "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/gstnice.pdb")
-        else()
+        endif()
+        if(NOT VCPKG_TARGET_IS_WINDOWS)
             file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
         endif()
 
@@ -77,10 +78,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/gstreamer")
         file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}"
                     "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}")
-        if(VCPKG_TARGET_IS_WINDOWS)
+        if(VCPKG_TARGET_IS_WINDOWS AND EXISTS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb")
             file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb"
                         "${CURRENT_PACKAGES_DIR}/plugins/gstreamer/gstnice.pdb")
-        else()
+        endif()
+        if(NOT VCPKG_TARGET_IS_WINDOWS)
             file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
         endif()
 

diff --git a/ports/libnice-gst/vcpkg.json b/ports/libnice-gst/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "libnice-gst",
   "version": "0.1.21",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Gstreamer Libnice plugins.",
   "homepage": "https://nice.freedesktop.org",
   "license": "LGPL-2.1-only AND MPL-1.1",
   "supports": "!xbox",
   "dependencies": [
     "gstreamer",
-    "libnice"
+    "libnice",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4658,7 +4658,7 @@
     },
     "libnice-gst": {
       "baseline": "0.1.21",
-      "port-version": 3
+      "port-version": 4
     },
     "libnick": {
       "baseline": "2024.3.0",

diff --git a/versions/l-/libnice-gst.json b/versions/l-/libnice-gst.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3717f8377e0dbac46191136366973c45a623850f",
+      "version": "0.1.21",
+      "port-version": 4
+    },
     {
       "git-tree": "0454363efa550f5437e9bafac810b425ad2cef12",
       "version": "0.1.21",