summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-05-22 01:04:22 +0200
committerThomas Deutschmann <whissi@gentoo.org>2021-05-22 01:05:16 +0200
commit3e5e2c5e7337086a3aba193bfe11dabb687760f6 (patch)
tree20a522f47a33f4c47d3f612690a1a2055f483f7c /media-video
parentsys-kernel/gentoo-kernel-bin: bump to 5.11.22 for arm64 (diff)
downloadgentoo-3e5e2c5e7337086a3aba193bfe11dabb687760f6.tar.gz
gentoo-3e5e2c5e7337086a3aba193bfe11dabb687760f6.tar.bz2
gentoo-3e5e2c5e7337086a3aba193bfe11dabb687760f6.zip
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@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/pipewire/files/pipewire-0.3.28-revert-openaptx-restriction.patch20
-rw-r--r--media-video/pipewire/pipewire-0.3.28.ebuild1
-rw-r--r--media-video/pipewire/pipewire-9999.ebuild1
3 files changed, 22 insertions, 0 deletions
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 000000000000..f624191b4420
--- /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 5504603123f0..9568402650e6 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 5504603123f0..9568402650e6 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