Avoid optional dependencies in zlmediakit. (microsoft#37961)

gavinltomra · Apr 4, 2024 · 13766fc · 13766fc
1 parent 25b12ce
commit 13766fc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/ports/zlmediakit/portfile.cmake b/ports/zlmediakit/portfile.cmake
@@ -37,12 +37,14 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" static ZLMEDIAKIT_CRT_STATIC)
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         openssl ENABLE_OPENSSL
+        openssl CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL
         mp4     ENABLE_MP4
         mp4     ENABLE_RTPPROXY
         mp4     ENABLE_HLS
         sctp    ENABLE_SCTP
         webrtc  ENABLE_WEBRTC
     INVERTED_FEATURES
+        openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL
 )
 
 vcpkg_cmake_configure(
@@ -67,6 +69,9 @@ vcpkg_cmake_configure(
         -DUSE_SOLUTION_FOLDERS=ON
         -DENABLE_TESTS=OFF
         -DENABLE_MEM_DEBUG=OFF # only valid on Linux
+        -DCMAKE_DISABLE_FIND_PACKAGE_GIT=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_JEMALLOC=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON
         ${FEATURE_OPTIONS}
 )
 

diff --git a/ports/zlmediakit/vcpkg.json b/ports/zlmediakit/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "zlmediakit",
   "version-date": "2024-03-30",
+  "port-version": 1,
   "description": "A high-performance carrier-grade streaming media service framework based on C++11.",
   "homepage": "https://github.com/ZLMediaKit/ZLMediaKit",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -9602,7 +9602,7 @@
     },
     "zlmediakit": {
       "baseline": "2024-03-30",
-      "port-version": 0
+      "port-version": 1
     },
     "zoe": {
       "baseline": "3.0",

diff --git a/versions/z-/zlmediakit.json b/versions/z-/zlmediakit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f84ad2056d32e9ea7bdc07160784c2458c12e15d",
+      "version-date": "2024-03-30",
+      "port-version": 1
+    },
     {
       "git-tree": "1af9543148c012a8e58061be6e613dc28f38d0d5",
       "version-date": "2024-03-30",