[zlmediakit] update zlmediakit's code and enable sctp default

microsoft · Mar 23, 2024 · 80800c9 · 80800c9
1 parent 0557210
commit 80800c9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/ports/zlmediakit/fix-dependency.patch b/ports/zlmediakit/fix-dependency.patch
@@ -1,30 +1,38 @@
+Index: 3rdpart/CMakeLists.txt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
 diff --git a/3rdpart/CMakeLists.txt b/3rdpart/CMakeLists.txt
-index c90129d..06bde42 100644
---- a/3rdpart/CMakeLists.txt
-+++ b/3rdpart/CMakeLists.txt
+--- a/3rdpart/CMakeLists.txt	(revision 7aaafa18e782e4dc69a5091d22db78066ef97aca)
++++ b/3rdpart/CMakeLists.txt	(date 1711211002253)
 @@ -24,6 +24,7 @@
  ##############################################################################
- 
+
  # jsoncpp
 +if (0)
  file(GLOB JSONCPP_SRC_LIST
    ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/include/json/*.h
    ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/src/lib_json/*.cpp
-@@ -38,7 +39,8 @@ target_include_directories(jsoncpp
+@@ -38,7 +39,8 @@
    PUBLIC
      "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/jsoncpp/include")
- 
+
 -update_cached_list(MK_LINK_LIBRARIES jsoncpp)
 +endif()
 +update_cached_list(MK_LINK_LIBRARIES JsonCpp::JsonCpp)
- 
+
  ##############################################################################
-
+
+Index: CMakeLists.txt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb85679..c9390bb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -434,6 +434,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+--- a/CMakeLists.txt	(revision 7aaafa18e782e4dc69a5091d22db78066ef97aca)
++++ b/CMakeLists.txt	(date 1711213148306)
+@@ -479,6 +479,7 @@
  # for assert.h
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpart)
 

diff --git a/ports/zlmediakit/portfile.cmake b/ports/zlmediakit/portfile.cmake
@@ -1,17 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ZLMediaKit/ZLMediaKit
-    REF 2e05119df12ba0721a2b7061dba55187569d891b
-    SHA512 8b72af231ff2080b7472284e0c89977c8d6c9c32ec35cbb4fe3700f58543c3b831722b58f39288ef44b274c61f746869f530eaccddfa0e8b242df11f729c3ba1
+    REF 7aaafa18e782e4dc69a5091d22db78066ef97aca
+    SHA512 d14590403d0bc6555941594b37064d0f5f2717e0af354a4188b556d83fddd67463566f4d413d960deaf1f51ae8a190ccb905093d871ac8bdca8d8f0f1e28794c
     HEAD_REF master
     PATCHES fix-dependency.patch
 )
 
 vcpkg_from_github(
     OUT_SOURCE_PATH TOOL_KIT_SOURCE_PATH
     REPO ZLMediaKit/ZLToolKit
-    REF d2016522a0e4b1d8df51a78b7415fe148f7245ca
-    SHA512 350730903fb24ce8e22710adea7af67dc1f74d157ae17b9f2e5fabd1c5aced8f45de0abce985130f5013871a3e31f9eaf78b161f734c16a9966da5b876a90e1b
+    REF 04d1c47d2568f5ce1ff84260cefaf2754e514a5e
+    SHA512 f467168507cb99f70f1c8f3db4742ecee8cfb3d9ac982b8dfee59907a6fbaf5ca6db4e0c60d8c293843f802a0489270d7a35daf17338f30d78c6b0e854b6ac17
     HEAD_REF master
 )
 
@@ -22,8 +22,8 @@ if ("mp4" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH MEDIA_SRV_SOURCE_PATH
         REPO ireader/media-server
-        REF cdbb3d6b9ea254f454c6e466c5962af5ace01199
-        SHA512 c9b6ed487ec283572022fe6eb8562258063a84b513ccc3f8783e4da9f46b19705ce41baf9603277a7642683e24ac4168a11a0c4e7a18b5f56145bf4986064664
+        REF 527c0f5117b489fda78fcd123d446370ddd9ec9a
+        SHA512 d90788fea5bff79e951604a6b290042e36dae9295fe967c6bc72ec2b5db8159c4465dd3568fc116b6954f90185f845671a3b3e3c2d3ccca7aaf913391e69630c
         HEAD_REF master
     )
 
@@ -38,7 +38,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         openssl ENABLE_OPENSSL
         mp4     ENABLE_MP4
-        mp4     ENABLE_HLS_FMP4
         mp4     ENABLE_RTPPROXY
         mp4     ENABLE_HLS
         sctp    ENABLE_SCTP

diff --git a/ports/zlmediakit/vcpkg.json b/ports/zlmediakit/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "zlmediakit",
-  "version-date": "2023-08-12",
+  "version-date": "2024-03-24",
   "description": "A high-performance carrier-grade streaming media service framework based on C++11.",
   "homepage": "https://github.com/ZLMediaKit/ZLMediaKit",
   "license": "MIT",
@@ -19,6 +19,7 @@
   "default-features": [
     "mp4",
     "openssl",
+    "sctp",
     "webrtc"
   ],
   "features": {
@@ -34,23 +35,14 @@
     "sctp": {
       "description": "Enable SCTP",
       "dependencies": [
-        "usrsctp",
-        {
-          "name": "zlmediakit",
-          "default-features": false,
-          "features": [
-            "webrtc"
-          ]
-        }
+        "usrsctp"
       ]
     },
     "webrtc": {
       "description": "Enable WebRTC",
       "dependencies": [
-        "libsrtp",
         {
-          "name": "zlmediakit",
-          "default-features": false,
+          "name": "libsrtp",
           "features": [
             "openssl"
           ]

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -9581,7 +9581,7 @@
       "port-version": 0
     },
     "zlmediakit": {
-      "baseline": "2023-08-12",
+      "baseline": "2024-03-24",
       "port-version": 0
     },
     "zoe": {

diff --git a/versions/z-/zlmediakit.json b/versions/z-/zlmediakit.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1ffc79ad1687b7ff6465289a821b9ac9e0ead1bc",
+      "version-date": "2024-03-24",
+      "port-version": 0
+    },
     {
       "git-tree": "d93e0b2a7502f835d4f23ba0fb2b3e5e8537aaec",
       "version-date": "2023-08-12",