From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4D47313933E for ; Wed, 30 Jun 2021 20:16:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AB7DE07FA; Wed, 30 Jun 2021 20:16:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C78DE07FA for ; Wed, 30 Jun 2021 20:16:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8513E33BDE4 for ; Wed, 30 Jun 2021 20:16:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F14BD744 for ; Wed, 30 Jun 2021 20:16:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1625084099.6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/ media-video/pipewire/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5 X-VCS-Branch: master Date: Wed, 30 Jun 2021 20:16:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e4fca01a-b519-4e2b-b0ff-d2dbccf369c1 X-Archives-Hash: feea4f38c4f5b9de414f82be601e7d76 commit: 6b8dc9b2ecd430c571f9d0a7bbde7e43b90f0ed5 Author: Lars Wendler gentoo org> AuthorDate: Wed Jun 30 20:14:59 2021 +0000 Commit: Lars Wendler gentoo 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 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 +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