[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/, media-libs/tg_owt/files/
commit: 9e485686023f5fe77316e295ecafc612aa626495
Author: Esteve Varela Colominas gmail com>
AuthorDate: Mon Apr 10 23:29:49 2023 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Mon Apr 17 20:15:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e485686
media-libs/tg_owt: Drop old
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
media-libs/tg_owt/Manifest | 2 -
.../tg_owt-0_pre20220209-gcc-12-cstdint.patch | 44
.../tg_owt-0_pre20220507-allow-disabling-X11.patch | 117
.../tg_owt-0_pre20220507-unbundle-crc32c.patch | 72
media-libs/tg_owt/tg_owt-0_pre20220507.ebuild | 121 -
5 files changed, 356 deletions(-)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index ef6eaa354cc6..888e31f0a89e 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,4 +1,2 @@
DIST libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2 426626 BLAKE2B
efae062f124e3711bab9db232e5f956f09683d6743f54407bf89eeda1bb6ffbc9b82fc250bd709f06b94c28bc8bbb239a28262a002e7b7a2044f31c1432304bb
SHA512
bfe2ad76c911986727d0c8b6ee85028fea382fad1eaebbff77a116f848388417719acaea11506936e8160d8dfa46f27a9a3d544b3db356e4c58aa81f493a6912
-DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B
664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f
SHA512
f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20220507.tar.gz 15799740 BLAKE2B
f12f3ecdfb0c7cfdae12af4734ddf22da4d95fd991b8a8ba17515f9d5c22a2f12b81967c0af15ac150c99129701c50c9384ea0e0240bf2366e176c833b14f7db
SHA512
6902c65a1be0bcf300f08c274109ed53cdf92b7aff35915045c3989899fc2584cce3fe9df0e8ac29e708fcc575453fe5a6affaea85787f9c4fcc3bcde3b85711
DIST tg_owt-0_pre20230105.tar.gz 13822416 BLAKE2B
05004dafaefd748d836f3508d3800bcb15d0bc9894b83340746e85763bff4b77d3dd1fb732eeaf86324b9afbec69be49b172ae7f70d959a7a65ce01b64fb6205
SHA512
70b4ada620cf19acf981abcefcbac1609fe04c51deef0332e288d59c4e7efe98625817c641b92967b4f37217f94e49aa0fc296fcfbb214c08cb63030b1427f54
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstdint.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstdint.patch
deleted file mode 100644
index 9feea500f164..
--- a/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstdint.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/840526
-https://github.com/desktop-app/tg_owt/pull/101
-
-From 86d2bcd7afb8706663d29e30f65863de5a626142 Mon Sep 17 00:00:00 2001
-From: Xiretza
-Date: Sun, 15 May 2022 12:47:41 +0200
-Subject: [PATCH] fix(h265_pps_parser): fix missing cstdint include
-
a/src/common_video/h265/h265_pps_parser.h
-+++ b/src/common_video/h265/h265_pps_parser.h
-@@ -12,6 +12,7 @@
- #define COMMON_VIDEO_H265_PPS_PARSER_H_
-
- #include "absl/types/optional.h"
-+#include
-
- namespace rtc {
- class BitBuffer;
-
-From c358917ff8deac2015586356113dae75d076d1e3 Mon Sep 17 00:00:00 2001
-From: peeweep
-Date: Mon, 27 Jun 2022 15:07:04 +
-Subject: [PATCH] fix(module_common_types_public): fix missing cstdint include
-
-Signed-off-by: peeweep
- src/modules/include/module_common_types_public.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/modules/include/module_common_types_public.h
b/src/modules/include/module_common_types_public.h
-index 345e45ce..8338a514 100644
a/src/modules/include/module_common_types_public.h
-+++ b/src/modules/include/module_common_types_public.h
-@@ -11,6 +11,7 @@
- #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
- #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
-
-+#include
- #include
-
- #include "absl/types/optional.h"
---
-2.35.1
-
diff --git
a/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
deleted file mode 100644
index 71b587f471bb..
--- a/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Add -DTG_OWT_USE_X11
-
-Allows disabling X11 desktop capturing independently of pipewire support, for
-the few people that run wayland without any X11 support whatsoever.
-
-This setup is untested, but supported by the GNI build system, see:
-* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
-
-Toggling the WEBRTC_USE_X11 define also affects some files under
-src/modules/audio_device, but that falls under "X11 support", regardless...
-
tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/CMakeLists.txt
-+++ tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/CMakeLists.txt
-@@ -21,11 +21,13 @@
-
- option(BUILD_SHARED_LIBS "Builds shared libraries instead of
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/, media-libs/tg_owt/files/
commit: 8292c38ccb30db696aea8f60a41090b090ff808d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 24 21:32:33 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 1 19:26:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8292c38c media-libs/tg_owt: drop 0_pre20220209 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/tg_owt/Manifest | 1 - ...g_owt-0_pre20211207-fix-dcsctp-references.patch | 17 --- .../tg_owt-0_pre20220209-allow-disabling-X11.patch | 117 .../tg_owt-0_pre20220209-gcc-12-cstddef.patch | 20 media-libs/tg_owt/tg_owt-0_pre20220209.ebuild | 118 - 5 files changed, 273 deletions(-) diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest index 3ae8c7c46969..ef6eaa354cc6 100644 --- a/media-libs/tg_owt/Manifest +++ b/media-libs/tg_owt/Manifest @@ -1,5 +1,4 @@ DIST libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2 426626 BLAKE2B efae062f124e3711bab9db232e5f956f09683d6743f54407bf89eeda1bb6ffbc9b82fc250bd709f06b94c28bc8bbb239a28262a002e7b7a2044f31c1432304bb SHA512 bfe2ad76c911986727d0c8b6ee85028fea382fad1eaebbff77a116f848388417719acaea11506936e8160d8dfa46f27a9a3d544b3db356e4c58aa81f493a6912 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc -DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3 DIST tg_owt-0_pre20220507.tar.gz 15799740 BLAKE2B f12f3ecdfb0c7cfdae12af4734ddf22da4d95fd991b8a8ba17515f9d5c22a2f12b81967c0af15ac150c99129701c50c9384ea0e0240bf2366e176c833b14f7db SHA512 6902c65a1be0bcf300f08c274109ed53cdf92b7aff35915045c3989899fc2584cce3fe9df0e8ac29e708fcc575453fe5a6affaea85787f9c4fcc3bcde3b85711 DIST tg_owt-0_pre20230105.tar.gz 13822416 BLAKE2B 05004dafaefd748d836f3508d3800bcb15d0bc9894b83340746e85763bff4b77d3dd1fb732eeaf86324b9afbec69be49b172ae7f70d959a7a65ce01b64fb6205 SHA512 70b4ada620cf19acf981abcefcbac1609fe04c51deef0332e288d59c4e7efe98625817c641b92967b4f37217f94e49aa0fc296fcfbb214c08cb63030b1427f54 diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20211207-fix-dcsctp-references.patch b/media-libs/tg_owt/files/tg_owt-0_pre20211207-fix-dcsctp-references.patch deleted file mode 100644 index 7b3380dd55de.. --- a/media-libs/tg_owt/files/tg_owt-0_pre20211207-fix-dcsctp-references.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix undefined references to dcsctp when linking this library - -/usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libtg_owt.so.0.0.0: undefined reference to `dcsctp::TaskQueueTimeoutFactory::TaskQueueTimeout::TaskQueueTimeout(dcsctp::TaskQueueTimeoutFactory&)' -/usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libtg_owt.so.0.0.0: undefined reference to `dcsctp::DcSctpSocketFactory::Create(std::basic_string_view >, dcsctp::DcSctpSocketCallbacks&, std::unique_ptr >, dcsctp::DcSctpOptions const&)' -/usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libtg_owt.so.0.0.0: undefined reference to `vtable for dcsctp::TextPcapPacketObserver' - tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/CMakeLists.txt -+++ tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/CMakeLists.txt -@@ -808,8 +808,6 @@ - media/engine/webrtc_media_engine_defaults.cc - media/engine/webrtc_video_engine.cc - media/engine/webrtc_voice_engine.cc --media/sctp/dcsctp_transport.cc --media/sctp/dcsctp_transport.h - media/sctp/sctp_transport_factory.cc - media/sctp/sctp_transport_factory.h - media/sctp/usrsctp_transport.cc diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch deleted file mode 100644 index 3d4acfd0d941.. --- a/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch +++ /dev/null @@ -1,117 +0,0 @@ -Add -DTG_OWT_USE_X11 - -Allows disabling X11 desktop capturing independently of pipewire support, for -the few people that run wayland without any X11 support whatsoever. - -This setup is untested, but supported by the GNI build system, see: -* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions) - -Toggling the WEBRTC_USE_X11 define also affects some files under -src/modules/audio_device, but that falls under "X11 support", regardless... -
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/, media-libs/tg_owt/files/
commit: 795a0a5e0f5f2053b3fada3ba1f40deb31d16965
Author: Esteve Varela Colominas gmail com>
AuthorDate: Fri Jul 29 11:10:57 2022 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Tue Aug 2 22:06:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795a0a5e
media-libs/tg_owt: Bump to 0_pre20220507
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
media-libs/tg_owt/Manifest | 1 +
.../tg_owt-0_pre20220507-allow-disabling-X11.patch | 117
.../tg_owt-0_pre20220507-unbundle-crc32c.patch | 72 +
media-libs/tg_owt/tg_owt-0_pre20220507.ebuild | 118 +
4 files changed, 308 insertions(+)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 342b3ec53144..c9992c75fd83 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,2 +1,3 @@
DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B
664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f
SHA512
f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B
fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9
SHA512
0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
+DIST tg_owt-0_pre20220507.tar.gz 15799740 BLAKE2B
f12f3ecdfb0c7cfdae12af4734ddf22da4d95fd991b8a8ba17515f9d5c22a2f12b81967c0af15ac150c99129701c50c9384ea0e0240bf2366e176c833b14f7db
SHA512
6902c65a1be0bcf300f08c274109ed53cdf92b7aff35915045c3989899fc2584cce3fe9df0e8ac29e708fcc575453fe5a6affaea85787f9c4fcc3bcde3b85711
diff --git
a/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
new file mode 100644
index ..71b587f471bb
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
@@ -0,0 +1,117 @@
+Add -DTG_OWT_USE_X11
+
+Allows disabling X11 desktop capturing independently of pipewire support, for
+the few people that run wayland without any X11 support whatsoever.
+
+This setup is untested, but supported by the GNI build system, see:
+* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
+
+Toggling the WEBRTC_USE_X11 define also affects some files under
+src/modules/audio_device, but that falls under "X11 support", regardless...
+
+--- tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/CMakeLists.txt
tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/CMakeLists.txt
+@@ -21,11 +21,13 @@
+
+ option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF)
+ option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers.
Useful for packaged build." ${BUILD_SHARED_LIBS})
++option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple
Unix." ON)
+ option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on
non-Apple Unix." ${not_packaged_build})
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF)
+
+ if (NOT UNIX OR APPLE)
++set(TG_OWT_USE_X11 OFF)
+ set(TG_OWT_USE_PIPEWIRE OFF)
+ endif()
+
+@@ -97,6 +99,10 @@
+ add_library(tg_owt)
+ init_target(tg_owt)
+
++if (TG_OWT_USE_X11)
++link_x11(tg_owt)
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+ if (TG_OWT_DLOPEN_PIPEWIRE)
+ include(cmake/generate_stubs.cmake)
+@@ -189,10 +195,6 @@
+ include(cmake/libwebrtcbuild.cmake)
+ target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
+
+-if (UNIX AND NOT APPLE)
+-link_x11(tg_owt)
+-endif()
+-
+ function(add_sublibrary postfix)
+ add_library(tg_owt_${postfix} OBJECT)
+ init_feature_target(tg_owt_${postfix} ${postfix})
+@@ -2370,6 +2372,39 @@
+ )
+ endif()
+
++if (NOT TG_OWT_USE_X11)
++remove_target_sources(tg_owt ${webrtc_loc}
++# src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions)
++modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc
++modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.h
++modules/desktop_capture/linux/x11/screen_capturer_x11.cc
++modules/desktop_capture/linux/x11/screen_capturer_x11.h
++modules/desktop_capture/linux/x11/shared_x_display.cc
++modules/desktop_capture/linux/x11/shared_x_display.h
++modules/desktop_capture/linux/x11/window_capturer_x11.cc
++modules/desktop_capture/linux/x11/window_capturer_x11.h
++modules/desktop_capture/linux/x11/window_finder_x11.cc
++modules/desktop_capture/linux/x11/window_finder_x11.h
++
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/, media-libs/tg_owt/files/
commit: 44a4a0436c3e9fc27e1d2dbfa1d1a63207da9ba8
Author: Esteve Varela Colominas gmail com>
AuthorDate: Mon Apr 11 22:22:04 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 15 06:04:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a4a043
media-libs/tg_owt: Drop old
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Sam James gentoo.org>
media-libs/tg_owt/Manifest | 1 -
...wt-0_pre20210626-allow-disabling-pipewire.patch | 36 --
...-0_pre20210626-allow-disabling-pulseaudio.patch | 90 ---
.../tg_owt-0_pre20211207-allow-disabling-X11.patch | 115 ---
media-libs/tg_owt/tg_owt-0_pre20211207.ebuild | 125 -
5 files changed, 367 deletions(-)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index ea5cf3b09d6a..342b3ec53144 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,3 +1,2 @@
DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B
664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f
SHA512
f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
-DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B
bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e
SHA512
7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B
fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9
SHA512
0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
diff --git
a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
deleted file mode 100644
index 9cc55585a561..
---
a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pipewire.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix an issue with -DTG_OWT_USE_PIPEWIRE=OFF
-
-Some files were erroneously being included despite the option being turned off
-
tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
-@@ -88,6 +88,7 @@
- init_target(tg_owt)
-
- if (TG_OWT_USE_PIPEWIRE)
-+link_glib(tg_owt)
- if (TG_OWT_DLOPEN_PIPEWIRE)
- include(cmake/generate_stubs.cmake)
- set(stubs_loc ${webrtc_loc}/modules/desktop_capture/linux)
-@@ -169,7 +170,6 @@
-
- if (UNIX AND NOT APPLE)
- link_x11(tg_owt)
--link_glib(tg_owt)
- endif()
-
- function(add_sublibrary postfix)
-@@ -2161,6 +2161,13 @@
- )
- endif()
-
-+if (NOT TG_OWT_USE_PIPEWIRE)
-+remove_target_sources(tg_owt ${webrtc_loc}
-+modules/desktop_capture/linux/base_capturer_pipewire.cc
-+modules/desktop_capture/linux/base_capturer_pipewire.h
-+)
-+endif()
-+
- if (NOT TG_OWT_BUILD_AUDIO_BACKENDS)
- remove_target_sources(tg_owt ${webrtc_loc}
- rtc_base/win/windows_version.cc
diff --git
a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
deleted file mode 100644
index 0bddb5fd00f6..
---
a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Add support for -DTG_OWT_BUILD_PULSE_BACKEND
-
-This is based off of the rtc_include_pulse_audio option in:
-* src/modules/audio_device/BUILD.gn
-
-ALSA must be enabled unless audio support is removed as a whole, see:
-* src/modules/audio_device/audio_device_impl.cc
-
tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/CMakeLists.txt
-@@ -25,12 +25,17 @@
- option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple
Unix." ON)
- option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on
non-Apple Unix." ${not_packaged_build})
- option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
-+option(TG_OWT_BUILD_PULSE_BACKEND "Build pulseaudio audio backend on
non-Apple Unix." ON)
-
- if (NOT UNIX OR APPLE)
- set(TG_OWT_USE_X11 OFF)
- set(TG_OWT_USE_PIPEWIRE OFF)
- endif()
-
-+if (NOT TG_OWT_BUILD_AUDIO_BACKENDS)
-+set(TG_OWT_BUILD_PULSE_BACKEND OFF)
-+endif()
-+
- if (BUILD_SHARED_LIBS)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- endif()
-@@ -162,9 +167,11 @@
- link_libvpx(tg_owt)
-
- if (TG_OWT_BUILD_AUDIO_BACKENDS AND (UNIX AND NOT APPLE))
--link_libalsa(tg_owt)
--link_libpulse(tg_owt)
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/, media-libs/tg_owt/files/
commit: a1b825fb223fb6ba135082e0ac83f776dab3e63a
Author: Esteve Varela Colominas gmail com>
AuthorDate: Fri Dec 10 15:16:20 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Fri Dec 10 21:29:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b825fb
media-libs/tg_owt: Bump to 0_pre20211207
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
media-libs/tg_owt/Manifest | 1 +
.../tg_owt-0_pre20211207-allow-disabling-X11.patch | 115 +++
...g_owt-0_pre20211207-fix-dcsctp-references.patch | 17 +++
media-libs/tg_owt/tg_owt-0_pre20211207.ebuild | 125 +
4 files changed, 258 insertions(+)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 70bfd2264067..01088f5e5cb8 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,2 +1,3 @@
DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B
664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f
SHA512
f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
DIST tg_owt-0_pre20210914.tar.gz 16266351 BLAKE2B
048d6a77046b10af63f4e5c1530b6aeb9d423702a6e34e6e0082a10b06262e19c30aa766cc9ea38549605d8d2cc08bfcd5a4e715ab53c46031c23938f94af27e
SHA512
bd46393d9a85fa38fcd560af4f68a4868b25528b134731070e8578217cb0b9bb8b5cf7b3990f619d321ba373e5630a52e467e14d93f71b24de3a5b3e591b8866
+DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B
bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e
SHA512
7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
diff --git
a/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch
new file mode 100644
index ..0abb3cfb4a37
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20211207-allow-disabling-X11.patch
@@ -0,0 +1,115 @@
+Add -DTG_OWT_USE_X11
+
+Allows disabling X11 desktop capturing independently of pipewire support, for
+the few people that run wayland without any X11 support whatsoever.
+
+This setup is untested, but supported by the GNI build system, see:
+* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
+
+Toggling the WEBRTC_USE_X11 define also affects some files under
+src/modules/audio_device, but that falls under "X11 support", regardless...
+
+--- tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/CMakeLists.txt
tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/CMakeLists.txt
+@@ -21,11 +21,13 @@
+
+ option(BUILD_SHARED_LIBS "Builds shared libraries instead of static."
${TG_OWT_PACKAGED_BUILD})
+ option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers.
Useful for packaged build." ${BUILD_SHARED_LIBS})
++option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple
Unix." ON)
+ option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on
non-Apple Unix." ${not_packaged_build})
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." ON)
+
+ if (NOT UNIX OR APPLE)
++set(TG_OWT_USE_X11 OFF)
+ set(TG_OWT_USE_PIPEWIRE OFF)
+ endif()
+
+@@ -84,6 +86,10 @@
+ add_library(tg_owt)
+ init_target(tg_owt)
+
++if (TG_OWT_USE_X11)
++link_x11(tg_owt)
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+ link_glib(tg_owt)
+ if (TG_OWT_DLOPEN_PIPEWIRE)
+@@ -161,10 +167,6 @@
+ include(cmake/libwebrtcbuild.cmake)
+ target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
+
+-if (UNIX AND NOT APPLE)
+-link_x11(tg_owt)
+-endif()
+-
+ function(add_sublibrary postfix)
+ add_library(tg_owt_${postfix} OBJECT)
+ init_feature_target(tg_owt_${postfix} ${postfix})
+@@ -2204,6 +2206,37 @@
+ )
+ endif()
+
++if (NOT TG_OWT_USE_X11)
++remove_target_sources(tg_owt ${webrtc_loc}
++modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc
++modules/desktop_capture/linux/mouse_cursor_monitor_x11.h
++modules/desktop_capture/linux/screen_capturer_x11.cc
++modules/desktop_capture/linux/screen_capturer_x11.h
++modules/desktop_capture/linux/shared_x_display.cc
++modules/desktop_capture/linux/shared_x_display.h
++modules/desktop_capture/linux/window_capturer_x11.cc
++modules/desktop_capture/linux/window_capturer_x11.h
++modules/desktop_capture/linux/window_finder_x11.cc
++modules/desktop_capture/linux/window_finder_x11.h
++modules/desktop_capture/linux/window_list_utils.cc
++modules/desktop_capture/linux/window_list_utils.h
++
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/, media-libs/tg_owt/files/
commit: d4aca08a2ddefe856dd2341da21e30b64319eba7 Author: Esteve Varela Colominas gmail com> AuthorDate: Thu Aug 5 10:31:06 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Aug 5 16:42:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4aca08a media-libs/tg_owt: Drop old Signed-off-by: Esteve Varela Colominas gmail.com> Signed-off-by: Georgy Yakovlev gentoo.org> media-libs/tg_owt/Manifest | 1 - .../files/Allow-using-packaged-third_party.patch | 487 - media-libs/tg_owt/tg_owt-0_pre20210422.ebuild | 88 3 files changed, 576 deletions(-) diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest index bbbe5598d59..e5610fd04b7 100644 --- a/media-libs/tg_owt/Manifest +++ b/media-libs/tg_owt/Manifest @@ -1,3 +1,2 @@ DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc -DIST tg_owt-0_pre20210422.tar.gz 16156802 BLAKE2B 823248e31d7abc91402c32aa0f062f1a77a3d8c4ebf63b4e73a8f290a5691e002a6ec09a5b7ffed1087565b9a419646924030dfb3eb3d0d6aec8cfc51cf1bf73 SHA512 24b66840a54d102b96bc32636dc8b85d31f74b344244985be929db4e14b13ee60f1fbc43269526352064cee8066839c886fae1aff95276089ab60d0a14de9ec6 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73 diff --git a/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch b/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch deleted file mode 100644 index 17025826a48..000 --- a/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch +++ /dev/null @@ -1,487 +0,0 @@ -From dbfceeea4280412358202d511e02e95a040d0297 Mon Sep 17 00:00:00 2001 -From: mid-kid -Date: Sun, 7 Mar 2021 17:12:34 +0100 -Subject: [PATCH] Allow using packaged third_party - -This patch adds support for building tg_owt using system libraries -instead of bundled third_party modules. - -Some libraries haven't been converted for the following reasons: -- pffft: No stable ABI, patched, and not available in major distributions. -- rnnoise: All of the remaining files are custom. -- libsrtp: This project uses private APIs. -- libyuv: No stable ABI, frequent breaking updates, and not available in major distributions. - -Note that: This still installs the system headers for the third_party -modules (albeit in a convenient sub-directory). I haven't figured out a -method to avoid this. - CMakeLists.txt| 78 +++- - cmake/external.cmake | 91 +++ - cmake/libabsl.cmake | 2 +- - cmake/libevent.cmake | 5 +- - cmake/libopenh264.cmake | 17 +++- - cmake/libpffft.cmake | 2 +- - cmake/librnnoise.cmake| 2 +- - cmake/libsrtp.cmake | 2 +- - cmake/libusrsctp.cmake| 2 +- - cmake/libvpx.cmake| 2 +- - cmake/libwebrtcbuild.cmake| 4 +- - cmake/libyuv.cmake| 2 +- - cmake/tg_owtConfig.cmake | 5 + - .../codecs/h264/h264_encoder_impl.cc | 8 +- - .../codecs/h264/h264_encoder_impl.h | 2 +- - src/rtc_base/task_queue_libevent.cc | 2 +- - 16 files changed, 166 insertions(+), 60 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f8e3bd..3462351 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,6 @@ include(cmake/librnnoise.cmake) - include(cmake/libsrtp.cmake) - include(cmake/libusrsctp.cmake) - include(cmake/libvpx.cmake) --include(cmake/libwebrtcbuild.cmake) - include(cmake/libyuv.cmake) - if (NOT WIN32 AND NOT APPLE) - include(cmake/libevent.cmake) -@@ -80,41 +79,19 @@ init_target(tg_owt) - - set_target_properties(tg_owt PROPERTIES SOVERSION 0 VERSION 0.0.0) - -+target_link_libraries(tg_owt -+PRIVATE -+tg_owt::libpffft -+tg_owt::librnnoise -+tg_owt::libsrtp -+tg_owt::libyuv -+) -+ - if (is_x86 OR is_x64) - target_link_libraries(tg_owt --PUBLIC --tg_owt::libwebrtcbuild - PRIVATE - tg_owt::tg_owt_avx2 - tg_owt::tg_owt_sse2 --tg_owt::libabsl --tg_owt::libopenh264 --tg_owt::libpffft --tg_owt::librnnoise --tg_owt::libsrtp --tg_owt::libusrsctp --tg_owt::libvpx --tg_owt::libvpx_mmx --
