commit: 6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Jun 30 20:14:59 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Jun 30 20:14:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8dc9b2
media-video/pipewire: Fixed openaptx revert patch again Closes: https://bugs.gentoo.org/799353 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> ...pewire-0.3.31-revert-openaptx-restriction.patch | 30 ++++++++++++++++++++++ media-video/pipewire/pipewire-9999.ebuild | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch new file mode 100644 index 00000000000..d8496bc5a69 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch @@ -0,0 +1,30 @@ +From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <[email protected]> +Date: Fri, 21 May 2021 10:32:52 +0200 +Subject: [PATCH] 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 +--- + spa/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spa/meson.build b/spa/meson.build +index e13802e94..885b25405 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled() + summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') + ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac')) + summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') +- aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx')) ++ aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx')) + summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') + fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac')) + summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') +-- +2.32.0 + diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index d2c5423d5e5..acb7e554b78 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -101,7 +101,7 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - "${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch + "${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1
