Attachment #226559 for bug #257289

View | Details | Raw Unified | Return to bug 257289
Collapse All | Expand All




# Created by: Henry Hu <henry.hu.sh@gmail.com>

PORTNAME=	tg_owt
PORTVERSION=	0.0.20210718
CATEGORIES=	net-im

MAINTAINER=	henry.hu.sh@gmail.com

LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
		libjpeg.so:graphics/jpeg-turbo \
		libopus.so:audio/opus \
		libpipewire-0.3.so:multimedia/pipewire \
		libusrsctp.so:net/libusrsctp

USES=		cmake pkgconfig xorg
USE_XORG=	x11 xcomposite xdamage xrender xrandr
USE_GITHUB=	yes
GH_ACCOUNT=	desktop-app
GH_PROJECT=	tg_owt
GH_TAGNAME=	91d836d
# libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
GH_TUPLE=	webmproject:libvpx:5b63f0f:libvpx/src/third_party/libvpx/source/libvpx \
		HenryHu:libyuv:ad89006:libyuv/src/third_party/libyuv

Lines 1-6 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620510291	1	TIMESTAMP = 1626645454
2	SHA256 (desktop-app-tg_owt-0.0.20210422-18cb4cd_GH0.tar.gz) = c2533892f1a574bdad61f08586799e91225d5031afe54c17887e3278cd7a983e	2	SHA256 (desktop-app-tg_owt-0.0.20210718-91d836d_GH0.tar.gz) = b2fea9bd360b973eee30a2f8c2fdecdae9b29c9f9733d2750d59233d7133bc71
3	SIZE (desktop-app-tg_owt-0.0.20210422-18cb4cd_GH0.tar.gz) = 16153820	3	SIZE (desktop-app-tg_owt-0.0.20210718-91d836d_GH0.tar.gz) = 16259103
4	SHA256 (webmproject-libvpx-5b63f0f_GH0.tar.gz) = 4fdacb6ee107b504cb21b072784c649be9af6b6d73103906a0d9ea5f3000de74	4	SHA256 (webmproject-libvpx-5b63f0f_GH0.tar.gz) = 4fdacb6ee107b504cb21b072784c649be9af6b6d73103906a0d9ea5f3000de74
5	SIZE (webmproject-libvpx-5b63f0f_GH0.tar.gz) = 5333441	5	SIZE (webmproject-libvpx-5b63f0f_GH0.tar.gz) = 5333441
6	SHA256 (HenryHu-libyuv-ad89006_GH0.tar.gz) = 96fc87a2c7051d289a9dcf31c4f8100e341dda3b5499e4bf6d82369f5d18416e	6	SHA256 (HenryHu-libyuv-ad89006_GH0.tar.gz) = 96fc87a2c7051d289a9dcf31c4f8100e341dda3b5499e4bf6d82369f5d18416e




--- 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




--- cmake/external.cmake.orig	2021-06-27 05:27:48 UTC
+++ cmake/external.cmake
@@ -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)
+        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()




--- src/rtc_base/physical_socket_server.cc.orig	2021-06-27 05:27:48 UTC
+++ src/rtc_base/physical_socket_server.cc
@@ -51,6 +51,8 @@
 #include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/time_utils.h"
 
+#undef WEBRTC_LINUX

 #if defined(WEBRTC_LINUX)
 #include <linux/sockios.h>
 #endif
@@ -70,7 +72,7 @@ typedef void* SockOptArg;
 
 #endif  // WEBRTC_POSIX
 

 
 int64_t GetSocketRecvTimestamp(int socket) {
   struct timeval tv_ioctl;
@@ -564,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
       *slevel = IPPROTO_IP;
       *sopt = IP_DONTFRAGMENT;
       break;

Return to bug 257289

Lines 1-7 Link Here

(-)./Makefile (-3 / +5 lines)
1	# Created by: Henry Hu <henry.hu.sh@gmail.com>	1	# Created by: Henry Hu <henry.hu.sh@gmail.com>
2		2
3	PORTNAME= tg_owt	3	PORTNAME= tg_owt
4	PORTVERSION= 0.0.20210422	4	PORTVERSION= 0.0.20210718
5	CATEGORIES= net-im	5	CATEGORIES= net-im
6		6
7	MAINTAINER= henry.hu.sh@gmail.com	7	MAINTAINER= henry.hu.sh@gmail.com
Lines 17-29 Link Here
17	LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \	17	LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
18	libjpeg.so:graphics/jpeg-turbo \	18	libjpeg.so:graphics/jpeg-turbo \
19	libopus.so:audio/opus \	19	libopus.so:audio/opus \
		20	libpipewire-0.3.so:multimedia/pipewire \
20	libusrsctp.so:net/libusrsctp	21	libusrsctp.so:net/libusrsctp
21		22
22	USES= cmake pkgconfig	23	USES= cmake pkgconfig xorg
		24	USE_XORG= x11 xcomposite xdamage xrender xrandr
23	USE_GITHUB= yes	25	USE_GITHUB= yes
24	GH_ACCOUNT= desktop-app	26	GH_ACCOUNT= desktop-app
25	GH_PROJECT= tg_owt	27	GH_PROJECT= tg_owt
26	GH_TAGNAME= 18cb4cd	28	GH_TAGNAME= 91d836d
27	# libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv	29	# libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
28	GH_TUPLE= webmproject:libvpx:5b63f0f:libvpx/src/third_party/libvpx/source/libvpx \	30	GH_TUPLE= webmproject:libvpx:5b63f0f:libvpx/src/third_party/libvpx/source/libvpx \
29	HenryHu:libyuv:ad89006:libyuv/src/third_party/libyuv	31	HenryHu:libyuv:ad89006:libyuv/src/third_party/libyuv

Lines 1-54 Link Here

(-)./files/patch-CMakeLists.txt (-54 lines)
1	--- CMakeLists.txt.orig 2021-02-03 11:42:41 UTC
2	+++ CMakeLists.txt
3	@@ -54,7 +54,6 @@ include(cmake/libopenh264.cmake)
4	include(cmake/libpffft.cmake)
5	include(cmake/librnnoise.cmake)
6	include(cmake/libsrtp.cmake)
7	-include(cmake/libusrsctp.cmake)
8	include(cmake/libvpx.cmake)
9	include(cmake/libwebrtcbuild.cmake)
10	include(cmake/libyuv.cmake)
11	@@ -88,7 +87,6 @@ if (is_x86 OR is_x64)
12	tg_owt::libpffft
13	tg_owt::librnnoise
14	tg_owt::libsrtp
15	- tg_owt::libusrsctp
16	tg_owt::libvpx
17	tg_owt::libvpx_mmx
18	tg_owt::libvpx_sse2
19	@@ -112,7 +111,6 @@
20	tg_owt::libpffft
21	tg_owt::librnnoise
22	tg_owt::libsrtp
23	- tg_owt::libusrsctp
24	tg_owt::libvpx
25	tg_owt::libyuv
26	)
27	@@ -137,6 +135,7 @@ endif()
28	link_openssl(tg_owt)
29	link_ffmpeg(tg_owt)
30	link_opus(tg_owt)
31	+link_usrsctp(tg_owt)
32
33	if (UNIX AND NOT APPLE)
34	link_libalsa(tg_owt)
35	@@ -145,6 +144,11 @@ if (UNIX AND NOT APPLE)
36	link_x11(tg_owt)
37	endif()
38
39	+target_include_directories(tg_owt BEFORE PRIVATE $<TARGET_PROPERTY:tg_owt::libabsl,INTERFACE_INCLUDE_DIRECTORIES>)
40	+target_include_directories(tg_owt BEFORE PRIVATE $<TARGET_PROPERTY:tg_owt::libvpx,INTERFACE_INCLUDE_DIRECTORIES>)
41	+target_include_directories(tg_owt BEFORE PRIVATE $<TARGET_PROPERTY:tg_owt::libyuv,INTERFACE_INCLUDE_DIRECTORIES>)
42	+target_include_directories(tg_owt BEFORE PRIVATE "src")
43	+
44	function(add_sublibrary postfix)
45	add_library(tg_owt_${postfix} OBJECT)
46	init_feature_target(tg_owt_${postfix} ${postfix})
47	@@ -2188,7 +2192,6 @@ set(export_targets
48	libpffft
49	librnnoise
50	libsrtp
51	- libusrsctp
52	libvpx
53	${vpx_export}
54	libwebrtcbuild

Lines 1-16 Link Here

(-)./files/patch-cmake_external.cmake (-15 / +10 lines)
1	--- cmake/external.cmake.orig 2021-02-03 11:42:41 UTC	1	--- cmake/external.cmake.orig 2021-06-27 05:27:48 UTC
2	+++ cmake/external.cmake	2	+++ cmake/external.cmake
3	@@ -141,3 +141,13 @@ function(link_x11 target_name)	3	@@ -109,7 +109,7 @@ endfunction()
4	target_link_libraries(${target_name} PRIVATE ${X11_Xtst_LIB})	4	# libabsl
5	endif()	5	# HINT: System abseil should be built with -DCMAKE_CXX_STANDARD=17
6	endfunction()	6	function(link_libabsl target_name)
7	+	7	- if (TG_OWT_PACKAGED_BUILD)
8	+# usrsctp	8	+ if (0)
9	+function(link_usrsctp target_name)	9	find_package(absl)
10	+ if (TG_OWT_PACKAGED_BUILD)	10	set(absl_FOUND ${absl_FOUND} PARENT_SCOPE)
11	+ find_package(PkgConfig REQUIRED)	11	if (absl_FOUND)
12	+ pkg_check_modules(USRSCTP REQUIRED usrsctp)
13	+ target_include_directories(${target_name} PRIVATE ${USRSCTP_INCLUDE_DIRS})
14	+ target_link_libraries(${target_name} PRIVATE ${USRSCTP_LINK_LIBRARIES})
15	+ endif()
16	+endfunction()

Lines 1-7 Link Here

(-)./files/patch-src_rtc__base_physical__socket__server.cc (-5 / +5 lines)
1	--- src/rtc_base/physical_socket_server.cc.orig 2021-02-03 11:42:41 UTC	1	--- src/rtc_base/physical_socket_server.cc.orig 2021-06-27 05:27:48 UTC
2	+++ src/rtc_base/physical_socket_server.cc	2	+++ src/rtc_base/physical_socket_server.cc
3	@@ -50,6 +50,8 @@	3	@@ -51,6 +51,8 @@
4	#include "rtc_base/null_socket_server.h"	4	#include "rtc_base/synchronization/mutex.h"
5	#include "rtc_base/time_utils.h"	5	#include "rtc_base/time_utils.h"
6		6
7	+#undef WEBRTC_LINUX	7	+#undef WEBRTC_LINUX
Lines 9-15 Link Here
9	#if defined(WEBRTC_LINUX)	9	#if defined(WEBRTC_LINUX)
10	#include <linux/sockios.h>	10	#include <linux/sockios.h>
11	#endif	11	#endif
12	@@ -69,7 +71,7 @@ typedef void* SockOptArg;	12	@@ -70,7 +72,7 @@ typedef void* SockOptArg;
13		13
14	#endif // WEBRTC_POSIX	14	#endif // WEBRTC_POSIX
15		15
Lines 18-24 Link Here
18		18
19	int64_t GetSocketRecvTimestamp(int socket) {	19	int64_t GetSocketRecvTimestamp(int socket) {
20	struct timeval tv_ioctl;	20	struct timeval tv_ioctl;
21	@@ -571,7 +573,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s	21	@@ -564,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
22	*slevel = IPPROTO_IP;	22	*slevel = IPPROTO_IP;
23	*sopt = IP_DONTFRAGMENT;	23	*sopt = IP_DONTFRAGMENT;
24	break;	24	break;

Lines 1-5 Link Here

(-)./pkg-plist (-22 / +27 lines)
1	include/tg_owt/api/adaptation/resource.h	1	include/tg_owt/api/adaptation/resource.h
2	include/tg_owt/api/array_view.h	2	include/tg_owt/api/array_view.h
		3	include/tg_owt/api/async_dns_resolver.h
3	include/tg_owt/api/async_resolver_factory.h	4	include/tg_owt/api/async_resolver_factory.h
4	include/tg_owt/api/audio/audio_frame.h	5	include/tg_owt/api/audio/audio_frame.h
5	include/tg_owt/api/audio/audio_frame_processor.h	6	include/tg_owt/api/audio/audio_frame_processor.h
Lines 107-112 Link Here
107	include/tg_owt/api/rtp_transceiver_interface.h	108	include/tg_owt/api/rtp_transceiver_interface.h
108	include/tg_owt/api/scoped_refptr.h	109	include/tg_owt/api/scoped_refptr.h
109	include/tg_owt/api/sctp_transport_interface.h	110	include/tg_owt/api/sctp_transport_interface.h
		111	include/tg_owt/api/sequence_checker.h
110	include/tg_owt/api/set_local_description_observer_interface.h	112	include/tg_owt/api/set_local_description_observer_interface.h
111	include/tg_owt/api/set_remote_description_observer_interface.h	113	include/tg_owt/api/set_remote_description_observer_interface.h
112	include/tg_owt/api/stats/rtc_stats.h	114	include/tg_owt/api/stats/rtc_stats.h
Lines 153-158 Link Here
153	include/tg_owt/api/test/mock_video_encoder_factory.h	155	include/tg_owt/api/test/mock_video_encoder_factory.h
154	include/tg_owt/api/test/neteq_simulator.h	156	include/tg_owt/api/test/neteq_simulator.h
155	include/tg_owt/api/test/neteq_simulator_factory.h	157	include/tg_owt/api/test/neteq_simulator_factory.h
		158	include/tg_owt/api/test/network_emulation/create_cross_traffic.h
		159	include/tg_owt/api/test/network_emulation/cross_traffic.h
156	include/tg_owt/api/test/network_emulation/network_emulation_interfaces.h	160	include/tg_owt/api/test/network_emulation/network_emulation_interfaces.h
157	include/tg_owt/api/test/network_emulation_manager.h	161	include/tg_owt/api/test/network_emulation_manager.h
158	include/tg_owt/api/test/peerconnection_quality_test_fixture.h	162	include/tg_owt/api/test/peerconnection_quality_test_fixture.h
Lines 218-224 Link Here
218	include/tg_owt/api/video/video_source_interface.h	222	include/tg_owt/api/video/video_source_interface.h
219	include/tg_owt/api/video/video_stream_decoder.h	223	include/tg_owt/api/video/video_stream_decoder.h
220	include/tg_owt/api/video/video_stream_decoder_create.h	224	include/tg_owt/api/video/video_stream_decoder_create.h
221	include/tg_owt/api/video/video_stream_encoder_create.h
222	include/tg_owt/api/video/video_stream_encoder_interface.h	225	include/tg_owt/api/video/video_stream_encoder_interface.h
223	include/tg_owt/api/video/video_stream_encoder_observer.h	226	include/tg_owt/api/video/video_stream_encoder_observer.h
224	include/tg_owt/api/video/video_stream_encoder_settings.h	227	include/tg_owt/api/video/video_stream_encoder_settings.h
Lines 241-246 Link Here
241	include/tg_owt/api/video_codecs/vp8_temporal_layers.h	244	include/tg_owt/api/video_codecs/vp8_temporal_layers.h
242	include/tg_owt/api/video_codecs/vp8_temporal_layers_factory.h	245	include/tg_owt/api/video_codecs/vp8_temporal_layers_factory.h
243	include/tg_owt/api/video_track_source_proxy.h	246	include/tg_owt/api/video_track_source_proxy.h
		247	include/tg_owt/api/voip/test/mock_voip_engine.h
244	include/tg_owt/api/voip/voip_base.h	248	include/tg_owt/api/voip/voip_base.h
245	include/tg_owt/api/voip/voip_codec.h	249	include/tg_owt/api/voip/voip_codec.h