aboutsummaryrefslogtreecommitdiff
path: root/net-im/tg_owt/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/tg_owt/files')
-rw-r--r--net-im/tg_owt/files/patch-CMakeLists.txt54
-rw-r--r--net-im/tg_owt/files/patch-cmake_external.cmake25
-rw-r--r--net-im/tg_owt/files/patch-src_rtc__base_physical__socket__server.cc10
3 files changed, 15 insertions, 74 deletions
diff --git a/net-im/tg_owt/files/patch-CMakeLists.txt b/net-im/tg_owt/files/patch-CMakeLists.txt
deleted file mode 100644
index 9dc40d79540b..000000000000
--- a/net-im/tg_owt/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
---- CMakeLists.txt.orig 2021-02-03 11:42:41 UTC
-+++ CMakeLists.txt
-@@ -54,7 +54,6 @@ include(cmake/libopenh264.cmake)
- include(cmake/libpffft.cmake)
- include(cmake/librnnoise.cmake)
- include(cmake/libsrtp.cmake)
--include(cmake/libusrsctp.cmake)
- include(cmake/libvpx.cmake)
- include(cmake/libwebrtcbuild.cmake)
- include(cmake/libyuv.cmake)
-@@ -88,7 +87,6 @@ if (is_x86 OR is_x64)
- tg_owt::libpffft
- tg_owt::librnnoise
- tg_owt::libsrtp
-- tg_owt::libusrsctp
- tg_owt::libvpx
- tg_owt::libvpx_mmx
- tg_owt::libvpx_sse2
-@@ -112,7 +111,6 @@
- tg_owt::libpffft
- tg_owt::librnnoise
- tg_owt::libsrtp
-- tg_owt::libusrsctp
- tg_owt::libvpx
- tg_owt::libyuv
- )
-@@ -137,6 +135,7 @@ endif()
- link_openssl(tg_owt)
- link_ffmpeg(tg_owt)
- link_opus(tg_owt)
-+link_usrsctp(tg_owt)
-
- if (UNIX AND NOT APPLE)
- link_libalsa(tg_owt)
-@@ -145,6 +144,11 @@ if (UNIX AND NOT APPLE)
- link_x11(tg_owt)
- endif()
-
-+target_include_directories(tg_owt BEFORE PRIVATE $<TARGET_PROPERTY:tg_owt::libabsl,INTERFACE_INCLUDE_DIRECTORIES>)
-+target_include_directories(tg_owt BEFORE PRIVATE $<TARGET_PROPERTY:tg_owt::libvpx,INTERFACE_INCLUDE_DIRECTORIES>)
-+target_include_directories(tg_owt BEFORE PRIVATE $<TARGET_PROPERTY:tg_owt::libyuv,INTERFACE_INCLUDE_DIRECTORIES>)
-+target_include_directories(tg_owt BEFORE PRIVATE "src")
-+
- function(add_sublibrary postfix)
- add_library(tg_owt_${postfix} OBJECT)
- init_feature_target(tg_owt_${postfix} ${postfix})
-@@ -2188,7 +2192,6 @@ set(export_targets
- libpffft
- librnnoise
- libsrtp
-- libusrsctp
- libvpx
- ${vpx_export}
- libwebrtcbuild
diff --git a/net-im/tg_owt/files/patch-cmake_external.cmake b/net-im/tg_owt/files/patch-cmake_external.cmake
index 8d3d5c8d1fa8..820b2709d5be 100644
--- a/net-im/tg_owt/files/patch-cmake_external.cmake
+++ b/net-im/tg_owt/files/patch-cmake_external.cmake
@@ -1,16 +1,11 @@
---- cmake/external.cmake.orig 2021-02-03 11:42:41 UTC
+--- cmake/external.cmake.orig 2021-06-27 05:27:48 UTC
+++ cmake/external.cmake
-@@ -141,3 +141,13 @@ function(link_x11 target_name)
- target_link_libraries(${target_name} PRIVATE ${X11_Xtst_LIB})
- endif()
- endfunction()
-+
-+# usrsctp
-+function(link_usrsctp target_name)
-+ if (TG_OWT_PACKAGED_BUILD)
-+ find_package(PkgConfig REQUIRED)
-+ pkg_check_modules(USRSCTP REQUIRED usrsctp)
-+ target_include_directories(${target_name} PRIVATE ${USRSCTP_INCLUDE_DIRS})
-+ target_link_libraries(${target_name} PRIVATE ${USRSCTP_LINK_LIBRARIES})
-+ endif()
-+endfunction()
+@@ -109,7 +109,7 @@ endfunction()
+ # libabsl
+ # HINT: System abseil should be built with -DCMAKE_CXX_STANDARD=17
+ function(link_libabsl target_name)
+- if (TG_OWT_PACKAGED_BUILD)
++ if (0)
+ find_package(absl)
+ set(absl_FOUND ${absl_FOUND} PARENT_SCOPE)
+ if (absl_FOUND)
diff --git a/net-im/tg_owt/files/patch-src_rtc__base_physical__socket__server.cc b/net-im/tg_owt/files/patch-src_rtc__base_physical__socket__server.cc
index 95f883cce8e0..3cb199f32e2f 100644
--- a/net-im/tg_owt/files/patch-src_rtc__base_physical__socket__server.cc
+++ b/net-im/tg_owt/files/patch-src_rtc__base_physical__socket__server.cc
@@ -1,7 +1,7 @@
---- src/rtc_base/physical_socket_server.cc.orig 2021-02-03 11:42:41 UTC
+--- src/rtc_base/physical_socket_server.cc.orig 2021-06-27 05:27:48 UTC
+++ src/rtc_base/physical_socket_server.cc
-@@ -50,6 +50,8 @@
- #include "rtc_base/null_socket_server.h"
+@@ -51,6 +51,8 @@
+ #include "rtc_base/synchronization/mutex.h"
#include "rtc_base/time_utils.h"
+#undef WEBRTC_LINUX
@@ -9,7 +9,7 @@
#if defined(WEBRTC_LINUX)
#include <linux/sockios.h>
#endif
-@@ -69,7 +71,7 @@ typedef void* SockOptArg;
+@@ -70,7 +72,7 @@ typedef void* SockOptArg;
#endif // WEBRTC_POSIX
@@ -18,7 +18,7 @@
int64_t GetSocketRecvTimestamp(int socket) {
struct timeval tv_ioctl;
-@@ -571,7 +573,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -564,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
*slevel = IPPROTO_IP;
*sopt = IP_DONTFRAGMENT;
break;