commit d56b2d98ec2527e1837d6edd948f6b00d1504e45 Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Mon Feb 1 18:44:50 2021 +0100 Updated to the latest Git snapshot. .gitignore | 1 + sources | 2 +- tg_owt-shared-fixes.patch | 124 ++++++++++++++++++++++++++++++++++++++++++++++ tg_owt.spec | 28 ++++++----- 4 files changed, 142 insertions(+), 13 deletions(-) --- diff --git a/.gitignore b/.gitignore index 651ebb0..d3979b4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libvpx-5b63f0f.tar.gz /libyuv-ad89006.tar.gz /tg_owt-6eaebec.tar.gz +/tg_owt-be23804.tar.gz diff --git a/sources b/sources index 14c20e5..6274e2e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (libvpx-5b63f0f.tar.gz) = 6980b073efae2757a0e2068bd90778baf88a057b1df74380737958e319cd0e6a2fe6ef9462289fb8959a8482a01de4c599f5c52c7dfe78a6142f6c6246af3d19 SHA512 (libyuv-ad89006.tar.gz) = fbb1b7ab7801c371dfc5b9991fbcd49cec17f8af0ebf210eaa33b8c19b5a7333c0dfc831253628278eb7656b019424f4c33ecf8d8e5629d308f79f3bcbf415ba -SHA512 (tg_owt-6eaebec.tar.gz) = efa25d580eac6acd207151733543a71e85fd5c8588f1f8c2ff52fbdbd37c0d57bbfcc8d5b31713a014a0130a9268987e7938d4d849ecfaaca3473168620fd052 +SHA512 (tg_owt-be23804.tar.gz) = bb7956df7678f8046c9084ca2b7187c1ae89e71c8764912bbb9a7f9ff68c95be462cbf64fea42a2f13dbcf7161c564e4f230964bf6ee0069d776579ebff82bb5 diff --git a/tg_owt-shared-fixes.patch b/tg_owt-shared-fixes.patch new file mode 100644 index 0000000..62ee876 --- /dev/null +++ b/tg_owt-shared-fixes.patch @@ -0,0 +1,124 @@ +From 1958098091b858767e801456625bc324d4e1d0fb Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; +Date: Sun, 31 Jan 2021 22:49:36 +0100 +Subject: [PATCH] Fixed packaged build as a shared library. + +Signed-off-by: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; +--- + CMakeLists.txt | 31 ++++++++++++++++++++++++++++++- + cmake/external.cmake | 12 ++++++++++++ + 2 files changed, 42 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a5bb2c5..f82dbbc4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,6 +142,7 @@ if (UNIX AND NOT APPLE) + link_libalsa(tg_owt) + link_libpulse(tg_owt) + link_dl(tg_owt) ++ link_x11(tg_owt) + endif() + + function(add_sublibrary postfix) +@@ -383,7 +384,8 @@ PRIVATE + rtc_base/numerics/moving_average.cc + rtc_base/numerics/sample_counter.cc + rtc_base/numerics/sample_stats.cc +- # rtc_base/numerics/samples_stats_counter.cc ++ api/numerics/samples_stats_counter.cc ++ api/numerics/samples_stats_counter.h + rtc_base/strings/audio_format_to_string.cc + rtc_base/strings/string_builder.cc + rtc_base/synchronization/mutex.cc +@@ -1322,6 +1324,8 @@ PRIVATE + modules/rtp_rtcp/source/rtp_sender_audio.h + modules/rtp_rtcp/source/rtp_sender_egress.cc + modules/rtp_rtcp/source/rtp_sender_egress.h ++ modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc ++ modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h + modules/rtp_rtcp/source/rtp_sender_video.cc + modules/rtp_rtcp/source/rtp_sender_video.h + modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc +@@ -1459,6 +1463,8 @@ PRIVATE + modules/video_coding/media_opt_util.h + modules/video_coding/histogram.cc + modules/video_coding/histogram.h ++ modules/video_coding/deprecated/nack_module.h ++ modules/video_coding/deprecated/nack_module.cc + modules/video_coding/nack_module2.cc + modules/video_coding/nack_module2.h + modules/video_coding/encoded_frame.cc +@@ -1850,6 +1856,8 @@ PRIVATE + video/video_send_stream_impl.h + video/video_stream_decoder.cc + video/video_stream_decoder.h ++ video/video_stream_decoder_impl.cc ++ video/video_stream_decoder_impl.h + video/video_stream_decoder2.cc + video/video_stream_decoder2.h + video/alignment_adjuster.cc +@@ -1944,6 +1952,7 @@ PRIVATE + modules/desktop_capture/mouse_cursor.cc + modules/desktop_capture/mouse_cursor.h + modules/desktop_capture/mouse_cursor_monitor.h ++ modules/desktop_capture/mouse_cursor_monitor_null.cc + modules/desktop_capture/resolution_tracker.cc + modules/desktop_capture/resolution_tracker.h + modules/desktop_capture/rgba_color.cc +@@ -1951,8 +1960,17 @@ PRIVATE + modules/desktop_capture/screen_capture_frame_queue.h + modules/desktop_capture/screen_capturer_helper.cc + modules/desktop_capture/screen_capturer_helper.h ++ modules/desktop_capture/screen_capturer_null.cc + modules/desktop_capture/window_finder.cc + modules/desktop_capture/window_finder.h ++ ++ #linux specific ++ modules/desktop_capture/window_capturer_linux.cc ++ modules/desktop_capture/screen_drawer_lock_posix.cc ++ modules/desktop_capture/screen_drawer_lock_posix.h ++ modules/desktop_capture/screen_drawer_linux.cc ++ modules/desktop_capture/linux/shared_x_display.cc ++ modules/desktop_capture/linux/shared_x_display.h + + #mac specific // + modules/desktop_capture/mac/desktop_configuration.mm +@@ -2027,6 +2045,17 @@ if (NOT WIN32) + ) + endif() + ++if ((NOT BUILD_SHARED_LIBS) OR (NOT UNIX)) ++ remove_target_sources(tg_owt ${webrtc_loc} ++ modules/desktop_capture/window_capturer_linux.cc ++ modules/desktop_capture/screen_drawer_lock_posix.cc ++ modules/desktop_capture/screen_drawer_lock_posix.h ++ modules/desktop_capture/screen_drawer_linux.cc ++ modules/desktop_capture/linux/shared_x_display.cc ++ modules/desktop_capture/linux/shared_x_display.h ++ ) ++endif() ++ + if ((NOT is_x86) AND (NOT is_x64)) + remove_target_sources(tg_owt ${webrtc_loc} + common_audio/fir_filter_sse.cc +diff --git a/cmake/external.cmake b/cmake/external.cmake +index 964e2609..54ae707c 100644 +--- a/cmake/external.cmake ++++ b/cmake/external.cmake +@@ -129,3 +129,15 @@ function(link_dl target_name) + target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS}) + endif() + endfunction() ++ ++# x11 ++function(link_x11 target_name) ++ if (TG_OWT_PACKAGED_BUILD) ++ find_package(X11 REQUIRED COMPONENTS Xtst) ++ target_include_directories(${target_name} PRIVATE ${X11_X11_INCLUDE_PATH}) ++ target_include_directories(${target_name} PRIVATE ${X11_Xlib_INCLUDE_PATH}) ++ target_link_libraries(${target_name} PRIVATE ${X11_X11_LIB}) ++ target_include_directories(${target_name} PRIVATE ${X11_Xtst_INCLUDE_PATH}) ++ target_link_libraries(${target_name} PRIVATE ${X11_Xtst_LIB}) ++ endif() ++endfunction() diff --git a/tg_owt.spec b/tg_owt.spec index 7b9ce0e..c43b0a2 100644 --- a/tg_owt.spec +++ b/tg_owt.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build -%global commit0 6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39 +%global commit0 be23804afce3bb2e80a1d57a7c1318c71b82b7de %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global date 20201218 +%global date 20210124 # Git revision of libvpx... %global commit1 5b63f0f821e94f8072eb483014cfc33b05978bb9 @@ -14,7 +14,7 @@ Name: tg_owt Version: 0 -Release: 4.%{date}git%{shortcommit0}%{?dist} +Release: 5.%{date}git%{shortcommit0}%{?dist} # Main project - BSD # abseil-cpp - ASL 2.0 @@ -33,6 +33,9 @@ Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source1: https://chromium.googlesource.com/webm/libvpx/+archive/%{commit1}.tar.gz#... Source2: https://chromium.googlesource.com/libyuv/libyuv/+archive/%{commit2}.tar.g... +# https://github.com/desktop-app/tg_owt/pull/47 +Patch100: %{name}-shared-fixes.patch + BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) @@ -44,6 +47,8 @@ BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xtst) BuildRequires: cmake BuildRequires: gcc @@ -54,7 +59,6 @@ BuildRequires: yasm Provides: bundled(abseil-cpp) = 0~gitfba8a31 Provides: bundled(base64) = 0~git Provides: bundled(fft) = 0~git -Provides: bundled(fft4g) = 0~git Provides: bundled(g711) = 0~git Provides: bundled(g722) = 0~git Provides: bundled(libevent) = 1.4.15 @@ -62,6 +66,7 @@ Provides: bundled(libsrtp) = 2.2.0~git94ac00d Provides: bundled(libvpx) = 1.8.2~git%{shortcommit1} Provides: bundled(libwebm) = 0~git Provides: bundled(libyuv) = 0~git%{shortcommit2} +Provides: bundled(ooura) = 0~git Provides: bundled(openh264) = 1.10.0~git6f26bce Provides: bundled(pffft) = 0~git483453d Provides: bundled(portaudio) = 0~git @@ -89,6 +94,8 @@ Requires: pkgconfig(libpulse) Requires: pkgconfig(libswscale) Requires: pkgconfig(openssl) Requires: pkgconfig(opus) +Requires: pkgconfig(x11) +Requires: pkgconfig(xtst) %description devel %{summary}. @@ -122,8 +129,8 @@ cp -f -p src/third_party/libvpx/source/libvpx/third_party/libwebm/PATENTS.TXT le cp -f -p src/third_party/libvpx/source/libvpx/third_party/libwebm/README.libvpx legal/README.libwebm cp -f -p src/base/third_party/libevent/LICENSE legal/LICENSE.libevent cp -f -p src/base/third_party/libevent/README.chromium legal/README.libevent -cp -f -p src/common_audio/third_party/fft4g/LICENSE legal/LICENSE.fft4g -cp -f -p src/common_audio/third_party/fft4g/README.chromium legal/README.fft4g +cp -f -p src/common_audio/third_party/ooura/LICENSE legal/LICENSE.ooura +cp -f -p src/common_audio/third_party/ooura/README.chromium legal/README.ooura cp -f -p src/common_audio/third_party/spl_sqrt_floor/LICENSE legal/LICENSE.spl_sqrt_floor cp -f -p src/common_audio/third_party/spl_sqrt_floor/README.chromium legal/README.spl_sqrt_floor cp -f -p src/modules/third_party/fft/LICENSE legal/LICENSE.fft @@ -162,14 +169,11 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot %{_libdir}/lib%{name}.so %changelog -* Wed Dec 23 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-4.20201218git6eaebec +* Mon Feb 01 2021 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-5.20210124gitbe23804 - Updated to latest Git snapshot. -* Fri Nov 20 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-3.20201112git10b988a +* Wed Dec 23 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-4.20201218git6eaebec - Updated to latest Git snapshot. -* Thu Nov 12 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-2.20201105git12f4a27 +* Fri Nov 20 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-3.20201112git10b988a - Updated to latest Git snapshot. - -* Mon Nov 02 2020 Vitaly Zaitsev <vitaly(a)easycoding.org&gt; - 0-2.20201102gite8fcae7 -- Initial SPEC release.