commit: 870706df4a5750b79dcae976373d8fe5f6ac749d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 28 14:54:28 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <plevine457 <AT> gmail.com> Closes: https://bugs.gentoo.org/710796 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> 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
