gentoo resync : 14.08.2021

3 files changed, 14 insertions, 27 deletions

diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index f0afc4557592..8bda56f78f25 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -1,8 +1,7 @@
 AUX tg_owt-0_pre20210626-allow-disabling-X11.patch 3969 BLAKE2B fb0cb1f04762ec0ccb6e5f1057a413d380356cccbe394679bb6168a15961e906cf6a6fa025b87ee78d98902314656e0973932c5c952fc6edf8650dc4dd40a6bb SHA512 ca74fb15ad43e6933ccc5d014c9219045fd0be4a0bc5a18e8c8c244455fa1dd72268cd14fa203df66acd411b8d1315339c7f29930da898d80c40e74c6e326fc4
 AUX tg_owt-0_pre20210626-allow-disabling-pipewire.patch 1030 BLAKE2B e81b7fa348a1cfb148f0f64524a18ea48fb5cd01104137edb33e85a86c190418c0b8230564026527bea414c27b1a535415ad31279b705ea777241874ae3c1802 SHA512 8b16e49dad06aa71becb535600d411160e1cbef2c2cdc2258aebc282b4b64d87a0011b4c1ade4209116176965be3c2ee8ab2bf0ad5a33c451f184b32d0a7e77a
 AUX tg_owt-0_pre20210626-allow-disabling-pulseaudio.patch 3322 BLAKE2B 61f04506af251a52f77a5b1289471e6519bc00aab1f0e2b0b703deec094109537506297dac55d6ece747beab889a2509a71ae862683c87e6f0c006573b3dffab SHA512 7c5a4851cfe982b069c1ce752414a7771805ab1edf00a88d16e46b11cda8a85692cc2534e04a562aba1519638e2c128b66b11f24ac93f7b8e3b2b9be6d031d55
-AUX tg_owt-0_pre20210626-expose-set_allow_pipewire.patch 720 BLAKE2B 22c1aacf44dfc9b814c2d7f3dbe186ef9b86473a6cd967357d9a786cbef2734f356e04487a3225e04fcee2282fea61e679787280682dbd339bdc68fcfade8261 SHA512 d163a8c27231ddbf930259c8dd52c1bd304a228cdba1d76bcc77efacae097f1c743de5ab79066d0d4367a783c530fa62169a9d3e09ff5e4498d5d8f3790ed563
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
 DIST tg_owt-0_pre20210626.tar.gz 16264716 BLAKE2B de500e02789516527c814d0aba87cf1d0e772747f06acff7ac9295508c6e6bce1915cd3a703df618ff17ba8e04dc194538a6ef859fa85b301bb63eceab2c339a SHA512 a5d10011c427d8685bcf0743c356ff8c58c3cad6c59ac2409298b30b15cb04233889a5ed0a18107ac5b3477eee96741fdc85176d4330c866e8e3329753be7d73
-EBUILD tg_owt-0_pre20210626.ebuild 2958 BLAKE2B 7a965b4ced599c5b06d9b09b8cfd49c9a9a622e9a9d3f2fd9ed4c6900022c9f5028534125b2dcbb036662a1dafcf80c2ec3c1dbda2adfdf67d2d59a476ec76e9 SHA512 69323de9376e97de06506ccc815e71babb04ae8c898f58859e5ee78b203394476b27a0274a55c93bdedb09908baae47a274933e23c6dda3c7be4843e15619dbb
+EBUILD tg_owt-0_pre20210626-r1.ebuild 3089 BLAKE2B 62fd8a5d4112b7a2cabdfcc2e9972f3c8588383d651829b74b02ef391ecf7c905e36c0a42114867b0f80aa78702eff0722ae34be081706d619a859cc97f65263 SHA512 d380f9af2d570a201869552dd988ea453ae04e4a19c5d0f98589d4a8f87299ae73a2aa7dcc5b179100efc5f16b48839eae8ff6d1945bda92a507d94482ec2ec1
 MISC metadata.xml 545 BLAKE2B 43a53f1c6c985be6e22cf2cd686a20637871b0351b4e5698d4a84abb78ad1e78080d32b295b87de7bc00a59bb49a749dcca562ddeeef8c54f315f26752c3f9d0 SHA512 24d6883333db2468df9529211f984c20a049d728794d43dc9608eb61f8154a7d15a92a4aba0bfcabc309c073947e3fb5fe22d258882c89adb5a1dcfb9889aecc
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 ef93ea24101c..000000000000
--- 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
index 6fd83cb3e00f..6b1f91230c17 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
 }