commit: 006b6e378c1b40875808dd363fb2281ca13b396c Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Aug 12 09:00:03 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Aug 12 17:39:07 2021 +0000 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 <esteve.varela <AT> gmail.com> Signed-off-by: Georgy Yakovlev <gyakovlev <AT> 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..00000000000 --- 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 }