Skip to content

Commit

Permalink
[libsrt] Fix feature tool (microsoft#41074)
Browse files Browse the repository at this point in the history
Co-authored-by: Monica <[email protected]>
  • Loading branch information
MonicaLiu0311 and Monica authored Sep 24, 2024
1 parent d9af3f5 commit ede6765
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 2 deletions.
30 changes: 30 additions & 0 deletions ports/libsrt/fix-tool.patch
Original file line number Diff line number Diff line change
@@ -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()

1 change: 1 addition & 0 deletions ports/libsrt/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ports/libsrt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5106,7 +5106,7 @@
},
"libsrt": {
"baseline": "1.5.3",
"port-version": 2
"port-version": 3
},
"libsrtp": {
"baseline": "2.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libsrt.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d9f3ed628ea5aed328a62750b1af9c4d9685225d",
"version": "1.5.3",
"port-version": 3
},
{
"git-tree": "578c7b45771245ff525647973280f997fef43d9b",
"version": "1.5.3",
Expand Down

0 comments on commit ede6765

Please sign in to comment.