[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: ebae77081a4108b7c8d719970a4a94920f16e320
Author: Esteve Varela Colominas gmail com>
AuthorDate: Sun Dec 10 22:33:00 2023 +
Commit: Yixun Lan gentoo org>
CommitDate: Mon Dec 11 13:23:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebae7708
media-libs/tg_owt: Drop stable
Refer to commit 85e366ba519d3a36e0e69c5ce8bc20fcf63cf038
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Yixun Lan gentoo.org>
media-libs/tg_owt/Manifest | 2 -
.../tg_owt-0_pre20230105-gcc-13-cstdint.patch | 22
media-libs/tg_owt/tg_owt-0_pre20230428.ebuild | 131 -
3 files changed, 155 deletions(-)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index b51802b5a4be..5807307f49bd 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,5 +1,3 @@
DIST libsrtp-a566a9cfcd619e8327784aa7cff4a1276dc1e895.tar.gz 636836 BLAKE2B
496afcb80f67a8f76104e338408d4930475daadaf3f7cd2d673336aef938986876995e475a4d932424d7f99f6a339bad360f566d6fd3719316eaf8241970cf8d
SHA512
930e665434e80e8a26d81b785563c915619b546a9a0af0455a14278816997074add852fae107027f4899415cb0ab47ffbf9492bea76b94b10f558b52098bbf92
-DIST libyuv-00950840d1c9bcbb3eb6ebc5aac5793e71166c8b.tar.bz2 426626 BLAKE2B
efae062f124e3711bab9db232e5f956f09683d6743f54407bf89eeda1bb6ffbc9b82fc250bd709f06b94c28bc8bbb239a28262a002e7b7a2044f31c1432304bb
SHA512
bfe2ad76c911986727d0c8b6ee85028fea382fad1eaebbff77a116f848388417719acaea11506936e8160d8dfa46f27a9a3d544b3db356e4c58aa81f493a6912
DIST libyuv-04821d1e7d60845525e8db55c7bcd41ef5be9406.tar.bz2 418856 BLAKE2B
a72e1f75491785b272b0ded46368a67aadb643278e5764d16dcd902ab7e4139d8664ffbacd940f30113ce3171e0b0846fe0d6111ced17c5b08f326cd61b2af14
SHA512
ff9cfbb61a1361e959740d00c741dc6fbe71ca7c61770abc35f70aada402df3884d7d5992ae79472dfe3d7641154d4f13065593fee41bf8eae924e26cc654117
-DIST tg_owt-0_pre20230428.tar.gz 13725816 BLAKE2B
c854de42696e397ea7101b7536f940c5424ebeae4105b84c9d3ef39242409b450e3cf38b7319ede7eb185667b78f4d4fb72c046880495f300205dff4d553be3a
SHA512
883be1ba54db10462dadf0ef0e03270535972eed37d7fec745bd660faa67eabc539bfa88122a9c64a895cba97fb1d1a67ff6ee590ad002480ad327736f07284e
DIST tg_owt-0_pre20230921.tar.gz 13726037 BLAKE2B
635342dd2127330542374e2f0f9acee91844c3c825fe4610dabe2996c541d9b3dc168110e5b591752f7e8f65a089c16b43216dd0c0b84f1a0e913e5a0213
SHA512
538d713e9ac91e9f676cdf301d11d7b5be0d67bda6283537e03b6322f3cca5c0234ff2f2b0b23e9046709f77ed282fc4d3526d3b21ee93478c50380be410372f
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20230105-gcc-13-cstdint.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20230105-gcc-13-cstdint.patch
deleted file mode 100644
index f4ea2dec9555..
--- a/media-libs/tg_owt/files/tg_owt-0_pre20230105-gcc-13-cstdint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix cstdint include for gcc 13
-
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a.orig/src/modules/audio_processing/transient/file_utils.h
-+++
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a/src/modules/audio_processing/transient/file_utils.h
-@@ -11,6 +11,7 @@
- #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
- #define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
-
-+#include
- #include
-
- #include "rtc_base/system/file_wrapper.h"
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a.orig/src/rtc_base/third_party/base64/base64.h
-+++
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a/src/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
-
-+#include
- #include
- #include
-
diff --git a/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild
b/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild
deleted file mode 100644
index aa2f3437b3fc..
--- a/media-libs/tg_owt/tg_owt-0_pre20230428.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="WebRTC build for Telegram"
-HOMEPAGE="https://github.com/desktop-app/tg_owt;
-
-TG_OWT_COMMIT="9d120195334db4f232c925529aa7601656dc59d7"
-LIBYUV_COMMIT="00950840d1c9bcbb3eb6ebc5aac5793e71166c8b"
-LIBSRTP_COMMIT="a566a9cfcd619e8327784aa7cff4a1276dc1e895"
-SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz
-> ${P}.tar.gz
-
https://gitlab.com/chromiumsrc/libyuv/-/archive/${LIBYUV_COMMIT}/libyuv-${LIBYUV_COMMIT}.tar.bz2
- https://github.com/cisco/libsrtp/archive/${LIBSRTP_COMMIT}.tar.gz ->
libsrtp-${LIBSRTP_COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
-# Upstream libyuv: https://chromium.googlesource.com/libyuv/libyuv
-
-LICENSE="BSD"
-SLOT="0/${PV##*pre}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="screencast +X"
-
-# This package's USE flags may change the ABI and require a rebuild of
-# dependent pacakges. As
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: c37f4475d696ec22a3cbb148c4697c5fb8a5422a
Author: Esteve Varela Colominas gmail com>
AuthorDate: Mon Apr 10 23:28:51 2023 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Mon Apr 17 20:15:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37f4475
media-libs/tg_owt: Fix gcc 13 support
Closes: https://bugs.gentoo.org/895384
Thanks-to: Toralf Förster gentoo.org>
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
.../tg_owt-0_pre20230105-gcc-13-cstdint.patch | 22 ++
media-libs/tg_owt/tg_owt-0_pre20230105.ebuild | 4
2 files changed, 26 insertions(+)
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20230105-gcc-13-cstdint.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20230105-gcc-13-cstdint.patch
new file mode 100644
index ..f4ea2dec9555
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20230105-gcc-13-cstdint.patch
@@ -0,0 +1,22 @@
+Fix cstdint include for gcc 13
+
+---
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a.orig/src/modules/audio_processing/transient/file_utils.h
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a/src/modules/audio_processing/transient/file_utils.h
+@@ -11,6 +11,7 @@
+ #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
+ #define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_
+
++#include
+ #include
+
+ #include "rtc_base/system/file_wrapper.h"
+---
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a.orig/src/rtc_base/third_party/base64/base64.h
tg_owt-5098730b9eb6173f0b52068fe2555b7c1015123a/src/rtc_base/third_party/base64/base64.h
+@@ -12,6 +12,7 @@
+ #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
+ #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
+
++#include
+ #include
+ #include
+
diff --git a/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild
b/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild
index 2ae5b33250ff..33ea8cfeff34 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20230105.ebuild
@@ -64,6 +64,10 @@ DEPEND="${RDEPEND}
"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/tg_owt-0_pre20230105-gcc-13-cstdint.patch"
+)
+
src_unpack() {
unpack "${P}.tar.gz"
unpack "libyuv-${LIBYUV_COMMIT}.tar.bz2"
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: eb9294bd4c3269a98a9573ed2f832001b668a5f4
Author: Sam James gentoo org>
AuthorDate: Fri Jun 10 03:31:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 10 03:31:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9294bd
media-libs/tg_owt: fix build with GCC 12
Closes: https://bugs.gentoo.org/840526
Signed-off-by: Sam James gentoo.org>
.../files/tg_owt-0_pre20220209-gcc-12-cstddef.patch | 20
.../files/tg_owt-0_pre20220209-gcc-12-cstdint.patch | 19 +++
media-libs/tg_owt/tg_owt-0_pre20220209.ebuild| 2 ++
3 files changed, 41 insertions(+)
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch
new file mode 100644
index ..c79d6068945e
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/840526
+--- a/src/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc
b/src/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc
+@@ -10,6 +10,7 @@
+
+ #include "modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.h"
+
++#include
+ #include
+
+ #include
+@@ -42,7 +43,7 @@ std::vector
BuildAv1Frame(std::initializer_list obus) {
+ }
+ if (obu.header_ & kAv1ObuSizePresentBit) {
+ // write size in leb128 format.
+- size_t payload_size = obu.payload_.size();
++ std::size_t payload_size = obu.payload_.size();
+ while (payload_size >= 0x80) {
+ raw.push_back(0x80 | (payload_size & 0x7F));
+ payload_size >>= 7;
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
new file mode 100644
index ..f5fdbd58a574
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstdint.patch
@@ -0,0 +1,19 @@
+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;
+
diff --git a/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
index c67d2f3d5870..c9458830e3d7 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
@@ -60,6 +60,8 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/tg_owt-0_pre20220209-allow-disabling-X11.patch"
"${FILESDIR}/tg_owt-0_pre20211207-fix-dcsctp-references.patch"
+ "${FILESDIR}/tg_owt-0_pre20220209-gcc-12-cstdint.patch"
+ "${FILESDIR}/tg_owt-0_pre20220209-gcc-12-cstddef.patch"
)
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: 2a35e73282b24f791464e8392340e5af0e408617
Author: Esteve Varela Colominas gmail com>
AuthorDate: Fri Feb 11 07:35:22 2022 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Wed Feb 16 19:43:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a35e732
media-libs/tg_owt: Bump to 0_pre20220209
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
media-libs/tg_owt/Manifest | 1 +
.../tg_owt-0_pre20220209-allow-disabling-X11.patch | 117 +
media-libs/tg_owt/tg_owt-0_pre20220209.ebuild | 116
3 files changed, 234 insertions(+)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 01088f5e5cb8..9a9281181db6 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,3 +1,4 @@
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
+DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B
fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9
SHA512
0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
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
new file mode 100644
index ..3d4acfd0d941
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220209-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-4cba1acdd718b700bb33945c0258283689d4eac7.orig/CMakeLists.txt
tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7/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)
+@@ -188,10 +194,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})
+@@ -2258,6 +2260,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/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
++
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: 8efed90532e17c49268812541da97567f3f13e01
Author: Esteve Varela Colominas gmail com>
AuthorDate: Fri Feb 11 08:06:41 2022 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Wed Feb 16 19:43:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efed905
media-libs/tg_owt: Drop old
Signed-off-by: Esteve Varela Colominas gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24157
Signed-off-by: Georgy Yakovlev gentoo.org>
media-libs/tg_owt/Manifest | 1 -
.../tg_owt-0_pre20210626-allow-disabling-X11.patch | 108 ---
media-libs/tg_owt/tg_owt-0_pre20210914.ebuild | 116 -
3 files changed, 225 deletions(-)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 9a9281181db6..ea5cf3b09d6a 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,4 +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
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-X11.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
deleted file mode 100644
index c6abf9660468..
--- a/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
+++ /dev/null
@@ -1,108 +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-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
-+++ tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/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()
-
-@@ -87,6 +89,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)
-@@ -169,7 +175,6 @@
- target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
-
- if (UNIX AND NOT APPLE)
--link_x11(tg_owt)
- endif()
-
- function(add_sublibrary postfix)
-@@ -2161,6 +2166,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
-+
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: 006b6e378c1b40875808dd363fb2281ca13b396c
Author: Esteve Varela Colominas gmail com>
AuthorDate: Thu Aug 12 09:00:03 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Thu Aug 12 17:39:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006b6e37
media-libs/tg_owt: Don't build audio backends
Recent bug regarding ABI compatibility of different USE flags of this
library makes me aware that this package should have as few USE flags as
possible...
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
...t-0_pre20210626-expose-set_allow_pipewire.patch | 16
...10626.ebuild => tg_owt-0_pre20210626-r1.ebuild} | 22 +-
2 files changed, 13 insertions(+), 25 deletions(-)
diff --git
a/media-libs/tg_owt/files/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch
deleted file mode 100644
index ef93ea24101..000
---
a/media-libs/tg_owt/files/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Exposes a dummy version of set_allow_pipewire in case the library is built
-without WEBRTC_USE_PIPEWIRE. This function is expected to be used by
-applications, and removing it completely breaks the ABI.
-
tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/src/modules/desktop_capture/desktop_capture_options.h
-+++
tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/src/modules/desktop_capture/desktop_capture_options.h
-@@ -131,6 +131,9 @@
- #if defined(WEBRTC_USE_PIPEWIRE)
- bool allow_pipewire() const { return allow_pipewire_; }
- void set_allow_pipewire(bool allow) { allow_pipewire_ = allow; }
-+#else
-+ bool allow_pipewire() const { return false; }
-+ void set_allow_pipewire(bool allow) { }
- #endif
-
- private:
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
b/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
similarity index 82%
rename from media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
rename to media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
index 6fd83cb3e00..6b1f91230c1 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210626.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210626-r1.ebuild
@@ -18,8 +18,11 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
LICENSE="BSD"
SLOT="0/${PV##*pre}"
KEYWORDS="amd64 ~ppc64"
-IUSE="+alsa pulseaudio screencast +X"
-REQUIRED_USE="pulseaudio? ( alsa )"
+IUSE="screencast +X"
+
+# This package's USE flags may change the ABI and require a rebuild of
+# dependent pacakges. As such, one should make sure to depend on
+# media-libs/tg_owt[x=,y=,z=] for any package that uses this.
# Bundled libs:
# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx
bundle it)
@@ -37,8 +40,6 @@ DEPEND="
media-libs/opus
media-video/ffmpeg:=
net-libs/usrsctp
- alsa? ( media-libs/alsa-lib )
- pulseaudio? ( media-sound/pulseaudio )
screencast? (
dev-libs/glib:2
media-video/pipewire:=
@@ -61,7 +62,6 @@ PATCHES=(
"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pipewire.patch"
"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-X11.patch"
"${FILESDIR}/tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch"
- "${FILESDIR}/tg_owt-0_pre20210626-expose-set_allow_pipewire.patch"
)
src_unpack() {
@@ -83,10 +83,14 @@ src_configure() {
append-cppflags '-DNDEBUG'
local mycmakeargs=(
- -DTG_OWT_USE_X11=$(usex X ON OFF)
- -DTG_OWT_USE_PIPEWIRE=$(usex screencast ON OFF)
- -DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa ON OFF)
- -DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio ON OFF)
+ -DTG_OWT_USE_X11=$(usex X)
+ -DTG_OWT_USE_PIPEWIRE=$(usex screencast)
+
+ # Not required by net-im/telegram-desktop right now, I'd rather
avoid
+ # the (ABI compatibility) headache.
+ -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF
+ #-DTG_OWT_BUILD_AUDIO_BACKENDS=$(usex alsa)
+ #-DTG_OWT_BUILD_PULSE_BACKEND=$(usex pulseaudio)
)
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: ee7cf00bca12059bb992ea9a97a8e73943b2cfff
Author: Esteve Varela Colominas gmail com>
AuthorDate: Sun Jun 27 21:57:04 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Mon Jun 28 08:38:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7cf00b
media-libs/tg_owt: Bump to 0_pre20210626
Adds desktop capture and makes a return of several use flags including
alsa and pulseaudio, patched around to make sure they work.
Added a subslot, since the ABI of this package has broken, and requires
the rebuild of media-libs/libtgvoip before net-im/telegram-desktop can
be built...
Signed-off-by: Esteve Varela Colominas gmail.com>
Signed-off-by: Georgy Yakovlev gentoo.org>
media-libs/tg_owt/Manifest | 1 +
.../tg_owt-0_pre20210626-allow-disabling-X11.patch | 108 +
...wt-0_pre20210626-allow-disabling-pipewire.patch | 36 +++
...-0_pre20210626-allow-disabling-pulseaudio.patch | 90 +
...t-0_pre20210626-expose-set_allow_pipewire.patch | 16 +++
media-libs/tg_owt/metadata.xml | 3 +
media-libs/tg_owt/tg_owt-0_pre20210626.ebuild | 104
7 files changed, 358 insertions(+)
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index cb642761504..65e17f6b8a8 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -2,3 +2,4 @@ DIST libvpx-5b63f0f821e94f8072eb483014cfc33b05978bb9.tar.gz
5337558 BLAKE2B 795f
DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B
664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f
SHA512
f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
DIST tg_owt-0_pre20210309.tar.gz 16159542 BLAKE2B
354992fca17f6217daa7294a8b60aa96f16b1198a07c79599ce676770cde068bf3ebf83c3935613ab181d4f7f23abbf2e4dd3ba41988b7505f27f537ada87fc2
SHA512
eca2c249d4837f8564218ea969390579b7f07c40879a80249310d978ba6d8865b85ec12e324fdba92af2d0b9bd501f2328fad5475028211013239dc35f508bb0
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/tg_owt-0_pre20210626-allow-disabling-X11.patch
b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
new file mode 100644
index 000..c6abf966046
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20210626-allow-disabling-X11.patch
@@ -0,0 +1,108 @@
+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-91d836dc84a16584c6ac52b36c04c0de504d9c34.orig/CMakeLists.txt
tg_owt-91d836dc84a16584c6ac52b36c04c0de504d9c34/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()
+
+@@ -87,6 +89,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)
+@@ -169,7 +175,6 @@
+ target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
+
+ if (UNIX AND NOT APPLE)
+-link_x11(tg_owt)
+ endif()
+
+ function(add_sublibrary postfix)
+@@ -2161,6 +2166,37 @@
+ )
+ endif()
+
++if (NOT TG_OWT_USE_X11)
++remove_target_sources(tg_owt ${webrtc_loc}
++
[gentoo-commits] repo/gentoo:master commit in: media-libs/tg_owt/files/, media-libs/tg_owt/
commit: d7a76276b75d8de39cb710ce55772d4600074042 Author: Esteve Varela Colominas gmail com> AuthorDate: Tue Apr 27 23:22:51 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon May 3 17:01:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a76276 media-libs/tg_owt: bump to 0_pre20210422, unbundle libs This allows us to clean up the ebuild a bit Also removed now-defunct alsa/pulseaudio dependencies. Telegram uses openal these days. 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 | 83 3 files changed, 571 insertions(+) diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest index 024105bd32d..cb642761504 100644 --- a/media-libs/tg_owt/Manifest +++ b/media-libs/tg_owt/Manifest @@ -1,3 +1,4 @@ DIST libvpx-5b63f0f821e94f8072eb483014cfc33b05978bb9.tar.gz 5337558 BLAKE2B 795f613cee5efc4f6382b09063978b772ebb283fb1f5f621f5fbac018a6aca4721319de89dba02cf66202fe92bf9df681c27b94657a67acea66293b9cf3e1b0c SHA512 ad151972dc6077ddc520d7b6aa14d64e3183e010ceddd5acc6e2d9407f3476006a92461f61662b826feab623a65e748df60d5478af56bd657fbacbdb71dddec6 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc DIST tg_owt-0_pre20210309.tar.gz 16159542 BLAKE2B 354992fca17f6217daa7294a8b60aa96f16b1198a07c79599ce676770cde068bf3ebf83c3935613ab181d4f7f23abbf2e4dd3ba41988b7505f27f537ada87fc2 SHA512 eca2c249d4837f8564218ea969390579b7f07c40879a80249310d978ba6d8865b85ec12e324fdba92af2d0b9bd501f2328fad5475028211013239dc35f508bb0 +DIST tg_owt-0_pre20210422.tar.gz 16156802 BLAKE2B 823248e31d7abc91402c32aa0f062f1a77a3d8c4ebf63b4e73a8f290a5691e002a6ec09a5b7ffed1087565b9a419646924030dfb3eb3d0d6aec8cfc51cf1bf73 SHA512 24b66840a54d102b96bc32636dc8b85d31f74b344244985be929db4e14b13ee60f1fbc43269526352064cee8066839c886fae1aff95276089ab60d0a14de9ec6 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 new file mode 100644 index 000..17025826a48 --- /dev/null +++ b/media-libs/tg_owt/files/Allow-using-packaged-third_party.patch @@ -0,0 +1,487 @@ +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 ++
