diff --git a/ports/zlmediakit/fix-android-build.patch b/ports/zlmediakit/fix-android-build.patch deleted file mode 100644 index 203f760891..0000000000 --- a/ports/zlmediakit/fix-android-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72a4544e..8f34f1c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -445,6 +445,8 @@ endif() - - if(WIN32) - update_cached_list(MK_LINK_LIBRARIES WS2_32 Iphlpapi shlwapi) -+elseif(ANDROID) -+ update_cached_list(MK_LINK_LIBRARIES log) - elseif(NOT ANDROID OR IOS) - update_cached_list(MK_LINK_LIBRARIES pthread) - endif() diff --git a/ports/zlmediakit/fix-android.patch b/ports/zlmediakit/fix-android.patch new file mode 100644 index 0000000000..c2414bee9a --- /dev/null +++ b/ports/zlmediakit/fix-android.patch @@ -0,0 +1,22 @@ +Index: src/Rtcp/RtcpFCI.h +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/Rtcp/RtcpFCI.h b/src/Rtcp/RtcpFCI.h +--- a/src/Rtcp/RtcpFCI.h (revision 6b2fcf79435656be7797d396203adcc6c11ecc52) ++++ b/src/Rtcp/RtcpFCI.h (date 1727606590493) +@@ -247,8 +247,13 @@ + // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + class FCI_NACK { + public: ++#if defined(ANDROID) ++ inline static constexpr size_t kSize = 4; ++ inline static constexpr size_t kBitSize = 16; ++#else + static constexpr size_t kSize = 4; + static constexpr size_t kBitSize = 16; ++#endif + + FCI_NACK(uint16_t pid_h, const std::vector &type); + diff --git a/ports/zlmediakit/fix-core.patch b/ports/zlmediakit/fix-core.patch deleted file mode 100644 index fc7d6ef5ea..0000000000 --- a/ports/zlmediakit/fix-core.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/server/WebApi.cpp b/server/WebApi.cpp -index 5fbe4e19..1ba30b58 100755 ---- a/server/WebApi.cpp -+++ b/server/WebApi.cpp -@@ -1872,6 +1872,7 @@ void installWebApi() { - }); - #endif - -+#if ENABLE_MP4 - api_regist("/index/api/loadMP4File", [](API_ARGS_MAP) { - CHECK_SECRET(); - CHECK_ARGS("vhost", "app", "stream", "file_path"); -@@ -1890,6 +1891,7 @@ void installWebApi() { - // sample_ms设置为0,从配置文件加载;file_repeat可以指定,如果配置文件也指定循环解复用,那么强制开启 - reader->startReadMP4(0, true, allArgs["file_repeat"]); - }); -+#endif - - GET_CONFIG_FUNC(std::set, download_roots, API::kDownloadRoot, [](const string &str) -> std::set { - std::set ret; diff --git a/ports/zlmediakit/portfile.cmake b/ports/zlmediakit/portfile.cmake index 9e45f4e3fe..724e58e26f 100644 --- a/ports/zlmediakit/portfile.cmake +++ b/ports/zlmediakit/portfile.cmake @@ -1,20 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ZLMediaKit/ZLMediaKit - REF af3ef996b0ae265e000344e7faf753577f9abf4e - SHA512 e45572a579d4644b4e48e70c999796d032947d64f074d7f143bd760238523d46ae061f079d9fe539a21542032f3c94ff7465fe2ba6c9fb39dbeac245dffd188b + REF 6b2fcf79435656be7797d396203adcc6c11ecc52 + SHA512 a2efe81f7fe6267418cc1e98f74283a10481b995815131324b7587c82f451d4bd35aa0190ef59efe46a057369208d4bf0658eaba44ae1a8532c6162cfb6e34f5 HEAD_REF master PATCHES fix-dependency.patch - fix-android-build.patch - fix-core.patch + fix-android.patch ) vcpkg_from_github( OUT_SOURCE_PATH TOOL_KIT_SOURCE_PATH REPO ZLMediaKit/ZLToolKit - REF 04d1c47d2568f5ce1ff84260cefaf2754e514a5e - SHA512 f467168507cb99f70f1c8f3db4742ecee8cfb3d9ac982b8dfee59907a6fbaf5ca6db4e0c60d8c293843f802a0489270d7a35daf17338f30d78c6b0e854b6ac17 + REF 46231014e2a7ec1903d4a37e96222481ecc779d8 + SHA512 2a0b834f072fbc64edc84f408050e2c992f8d59f2480c67a372cace17d49f21eb2f40587288481acc42118e94a5b7863043982680c3f56bdde3863f97ca69356 HEAD_REF master ) @@ -25,8 +24,8 @@ if ("mp4" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH MEDIA_SRV_SOURCE_PATH REPO ireader/media-server - REF 527c0f5117b489fda78fcd123d446370ddd9ec9a - SHA512 d90788fea5bff79e951604a6b290042e36dae9295fe967c6bc72ec2b5db8159c4465dd3568fc116b6954f90185f845671a3b3e3c2d3ccca7aaf913391e69630c + REF 4e1a89c3247db72076893d3fc5ad80f4b3c04ec2 + SHA512 baa7c8b69f86117e0eb8e3bb3769f3aa7fac498a7a59a24382a703a16ec8c5997e858b01a4681795ad0f8eab0408bf69fe1907400fa941dff588b1c739ffa324 HEAD_REF master ) @@ -53,6 +52,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_POLICY_DEFAULT_CMP0057=NEW -DENABLE_API=ON -DENABLE_API_STATIC_LIB=${ZLMEDIAKIT_BUILD_STATIC} -DENABLE_MSVC_MT=${ZLMEDIAKIT_CRT_STATIC} diff --git a/ports/zlmediakit/vcpkg.json b/ports/zlmediakit/vcpkg.json index 588d4de964..cc6b35805a 100644 --- a/ports/zlmediakit/vcpkg.json +++ b/ports/zlmediakit/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlmediakit", - "version-date": "2024-03-30", - "port-version": 3, + "version-date": "2024-09-29", "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 334a60d99b..06ea617c8a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9893,8 +9893,8 @@ "port-version": 1 }, "zlmediakit": { - "baseline": "2024-03-30", - "port-version": 3 + "baseline": "2024-09-29", + "port-version": 0 }, "zoe": { "baseline": "3.1", diff --git a/versions/z-/zlmediakit.json b/versions/z-/zlmediakit.json index 7e046a52fc..3cfb096680 100644 --- a/versions/z-/zlmediakit.json +++ b/versions/z-/zlmediakit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee4983a040a7165456de12910b16f1e24f078c32", + "version-date": "2024-09-29", + "port-version": 0 + }, { "git-tree": "e2e858d8f4618dbb8a41963656970b659ad02813", "version-date": "2024-03-30",