From ede6765542c8c04941ae34bd6f55662556ccc489 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:57:49 +0000 Subject: [PATCH] [libsrt] Fix feature tool (#41074) Co-authored-by: Monica --- ports/libsrt/fix-tool.patch | 30 ++++++++++++++++++++++++++++++ ports/libsrt/portfile.cmake | 1 + ports/libsrt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsrt.json | 5 +++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 ports/libsrt/fix-tool.patch diff --git a/ports/libsrt/fix-tool.patch b/ports/libsrt/fix-tool.patch new file mode 100644 index 0000000000..7a5bdaa085 --- /dev/null +++ b/ports/libsrt/fix-tool.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e8062a..2277e33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1300,11 +1300,13 @@ if (ENABLE_APPS) + + # Applications + +- srt_add_application(srt-live-transmit ${VIRTUAL_srtsupport}) ++ srt_add_application(srt-live-transmit ${VIRTUAL_srtsupport} ${VIRTUAL_srt}) ++ target_link_libraries(srt-live-transmit ${SSL_LIBRARIES}) + if (DEFINED EXTRA_stransmit) + set_target_properties(srt-live-transmit PROPERTIES COMPILE_FLAGS "${EXTRA_stransmit}") + endif() +- srt_add_application(srt-file-transmit ${VIRTUAL_srtsupport}) ++ srt_add_application(srt-file-transmit ${VIRTUAL_srtsupport} ${VIRTUAL_srt}) ++ target_link_libraries(srt-file-transmit ${SSL_LIBRARIES}) + + if (MINGW) + # FIXME: with MINGW, it fails to build apps that require C++11 +@@ -1313,7 +1315,8 @@ if (ENABLE_APPS) + else() + # srt-multiplex temporarily blocked + #srt_add_application(srt-multiplex ${VIRTUAL_srtsupport}) +- srt_add_application(srt-tunnel ${VIRTUAL_srtsupport}) ++ srt_add_application(srt-tunnel ${VIRTUAL_srtsupport} ${VIRTUAL_srt}) ++ target_link_libraries(srt-tunnel ${SSL_LIBRARIES}) + target_compile_definitions(srt-tunnel PUBLIC -DSRT_ENABLE_VERBOSE_LOCK) + endif() + diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index e610dd539c..2109919f3c 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-static.patch pkgconfig.diff + fix-tool.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 28e919d7f3..fa980bf75f 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsrt", "version": "1.5.3", - "port-version": 2, + "port-version": 3, "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 65d0367faa..334ae8cd1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5106,7 +5106,7 @@ }, "libsrt": { "baseline": "1.5.3", - "port-version": 2 + "port-version": 3 }, "libsrtp": { "baseline": "2.5.0", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index 2270fac7bb..6518529953 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9f3ed628ea5aed328a62750b1af9c4d9685225d", + "version": "1.5.3", + "port-version": 3 + }, { "git-tree": "578c7b45771245ff525647973280f997fef43d9b", "version": "1.5.3",