Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/
Date: Wed, 30 Jun 2021 20:16:25
Message-Id: 1625084099.6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5.polynomial-c@gentoo
1 commit: 6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 30 20:14:59 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 20:14:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8dc9b2
7
8 media-video/pipewire: Fixed openaptx revert patch again
9
10 Closes: https://bugs.gentoo.org/799353
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 ...pewire-0.3.31-revert-openaptx-restriction.patch | 30 ++++++++++++++++++++++
14 media-video/pipewire/pipewire-9999.ebuild | 2 +-
15 2 files changed, 31 insertions(+), 1 deletion(-)
16
17 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
18 new file mode 100644
19 index 00000000000..d8496bc5a69
20 --- /dev/null
21 +++ b/media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch
22 @@ -0,0 +1,30 @@
23 +From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001
24 +From: Thomas Deutschmann <whissi@g.o>
25 +Date: Fri, 21 May 2021 10:32:52 +0200
26 +Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change"
27 +
28 +This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe.
29 +
30 +Doesn't apply to us.
31 +
32 +Bug: https://bugs.gentoo.org/785634
33 +---
34 + spa/meson.build | 2 +-
35 + 1 file changed, 1 insertion(+), 1 deletion(-)
36 +
37 +diff --git a/spa/meson.build b/spa/meson.build
38 +index e13802e94..885b25405 100644
39 +--- a/spa/meson.build
40 ++++ b/spa/meson.build
41 +@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled()
42 + summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
43 + ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac'))
44 + summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
45 +- aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx'))
46 ++ aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx'))
47 + summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
48 + fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac'))
49 + summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
50 +--
51 +2.32.0
52 +
53
54 diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
55 index d2c5423d5e5..acb7e554b78 100644
56 --- a/media-video/pipewire/pipewire-9999.ebuild
57 +++ b/media-video/pipewire/pipewire-9999.ebuild
58 @@ -101,7 +101,7 @@ DOCS=( {README,INSTALL}.md NEWS )
59
60 PATCHES=(
61 "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
62 - "${FILESDIR}"/${PN}-0.3.29-revert-openaptx-restriction.patch
63 + "${FILESDIR}"/${PN}-0.3.31-revert-openaptx-restriction.patch
64 )
65
66 # limitsdfile related code taken from =sys-auth/realtime-base-0.1