summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-28 16:54:28 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-28 17:34:03 +0200
commit870706df4a5750b79dcae976373d8fe5f6ac749d (patch)
tree54c5e9370c20147177385d048487253a00355424
parentdev-perl/Context-Preserve: Bump to version 0.30.0 (diff)
downloadgentoo-870706df.tar.gz
gentoo-870706df.tar.bz2
gentoo-870706df.zip
media-video/pipewire: Fix build with -fno-common
Thanks-to: Peter Levine <plevine457@gmail.com> Closes: https://bugs.gentoo.org/710796 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--media-video/pipewire/files/pipewire-0.2.7-fno-common.patch47
-rw-r--r--media-video/pipewire/pipewire-0.2.7.ebuild2
2 files changed, 49 insertions, 0 deletions
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 000000000000..f4f82ba96c08
--- /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 f8111e7a7281..92f7f268808c 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