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 32B6C13835A for ; Sun, 28 Jun 2020 15:36:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D15CE0973; Sun, 28 Jun 2020 15:36:45 +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 4D87DE0973 for ; Sun, 28 Jun 2020 15:36:45 +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 21CE134F26B for ; Sun, 28 Jun 2020 15:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 253661AC for ; Sun, 28 Jun 2020 15:36:39 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1593358443.870706df4a5750b79dcae976373d8fe5f6ac749d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/, media-video/pipewire/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/files/pipewire-0.2.7-fno-common.patch media-video/pipewire/pipewire-0.2.7.ebuild X-VCS-Directories: media-video/pipewire/ media-video/pipewire/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 870706df4a5750b79dcae976373d8fe5f6ac749d X-VCS-Branch: master Date: Sun, 28 Jun 2020 15:36:39 +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: 10d0ade1-9523-494d-943d-1703334c09ee X-Archives-Hash: b4f74067bc612f90b8977cdb2cab83fd commit: 870706df4a5750b79dcae976373d8fe5f6ac749d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 28 14:54:28 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 28 15:34:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870706df media-video/pipewire: Fix build with -fno-common Thanks-to: Peter Levine gmail.com> Closes: https://bugs.gentoo.org/710796 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../pipewire/files/pipewire-0.2.7-fno-common.patch | 47 ++++++++++++++++++++++ media-video/pipewire/pipewire-0.2.7.ebuild | 2 + 2 files changed, 49 insertions(+) diff --git a/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch b/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch new file mode 100644 index 00000000000..f4f82ba96c0 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.2.7-fno-common.patch @@ -0,0 +1,47 @@ +Bug: https://bugs.gentoo.org/710796 + +--- a/spa/plugins/bluez5/a2dp-codecs.h ++++ b/spa/plugins/bluez5/a2dp-codecs.h +@@ -284,15 +284,15 @@ + } + } + +-const a2dp_sbc_t bluez_a2dp_sbc; ++extern const a2dp_sbc_t bluez_a2dp_sbc; + #if ENABLE_MP3 +-const a2dp_mpeg_t bluez_a2dp_mpeg; ++extern const a2dp_mpeg_t bluez_a2dp_mpeg; + #endif + #if ENABLE_AAC +-const a2dp_aac_t bluez_a2dp_aac; ++extern const a2dp_aac_t bluez_a2dp_aac; + #endif + #if ENABLE_APTX +-const a2dp_aptx_t bluez_a2dp_aptx; ++extern const a2dp_aptx_t bluez_a2dp_aptx; + #endif + + #endif +--- a/spa/plugins/bluez5/bluez5-monitor.c ++++ b/spa/plugins/bluez5/bluez5-monitor.c +@@ -75,7 +75,7 @@ + struct spa_list transport_list; + }; + +-struct spa_handle_factory spa_a2dp_sink_factory; ++extern struct spa_handle_factory spa_a2dp_sink_factory; + + static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *transport, + struct spa_pod **result, struct spa_pod_builder *builder) +--- a/spa/plugins/bluez5/meson.build ++++ b/spa/plugins/bluez5/meson.build +@@ -1,7 +1,8 @@ + + bluez5_sources = ['plugin.c', + 'a2dp-sink.c', +- 'bluez5-monitor.c'] ++ 'a2dp-codecs.c', ++ 'bluez5-monitor.c'] + + bluez5lib = shared_library('spa-bluez5', + bluez5_sources, diff --git a/media-video/pipewire/pipewire-0.2.7.ebuild b/media-video/pipewire/pipewire-0.2.7.ebuild index f8111e7a728..92f7f268808 100644 --- a/media-video/pipewire/pipewire-0.2.7.ebuild +++ b/media-video/pipewire/pipewire-0.2.7.ebuild @@ -44,6 +44,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-fno-common.patch" ) + src_prepare() { spa_use() { if ! use ${1}; then