From 13766fcd1292a973fea53fba731a0fb90c7ee310 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 4 Apr 2024 11:55:22 -0700 Subject: [PATCH] Avoid optional dependencies in zlmediakit. (#37961) --- ports/zlmediakit/portfile.cmake | 5 +++++ ports/zlmediakit/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zlmediakit.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/zlmediakit/portfile.cmake b/ports/zlmediakit/portfile.cmake index a690b5261a..7ff61eb660 100644 --- 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 index 13fc5bf4c8..2caaec4511 100644 --- 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 index 0ec3a8a854..839bc6d48f 100644 --- 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 index 1b82ed405f..e832bb7112 100644 --- 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",