[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     3e5e2c5e7337086a3aba193bfe11dabb687760f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 23:04:22 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri May 21 23:05:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5e2c5e

media-video/pipewire: allow >openaptx-0.2

Closes: https://bugs.gentoo.org/791259
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...pipewire-0.3.28-revert-openaptx-restriction.patch | 20 ++++++++++++++++++++
 media-video/pipewire/pipewire-0.3.28.ebuild          |  1 +
 media-video/pipewire/pipewire-9999.ebuild            |  1 +
 3 files changed, 22 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch
new file mode 100644
index 00000000000..f624191b442
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch
@@ -0,0 +1,20 @@
+Revert "openaptx: Blacklist >= 0.2.1 due to license change"
+
+This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
+
+Doesn't apply to us.
+
+Bug: https://bugs.gentoo.org/785634
+
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -22,7 +22,7 @@ if not get_option('spa-plugins').disabled()
+   sbc_dep = dependency('sbc', required: get_option('bluez5'))
+   ldac_dep = dependency('ldacBT-enc', required : get_option('bluez5-codec-ldac'))
+   ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
+-  aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
++  aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
+   fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
+   avcodec_dep = dependency('libavcodec', required: get_option('ffmpeg'))
+   jack_dep = dependency('jack', version : '>= 1.9.10', required: get_option('jack'))
+ 

diff --git a/media-video/pipewire/pipewire-0.3.28.ebuild b/media-video/pipewire/pipewire-0.3.28.ebuild
index 5504603123f..9568402650e 100644
--- a/media-video/pipewire/pipewire-0.3.28.ebuild
+++ b/media-video/pipewire/pipewire-0.3.28.ebuild
@@ -97,6 +97,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.28-revert-openaptx-restriction.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 5504603123f..9568402650e 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -97,6 +97,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${PN}-0.3.28-revert-openaptx-restriction.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1