diff --git a/0001-build-and-link-a2dp-codecs.c-as-well.patch b/0001-build-and-link-a2dp-codecs.c-as-well.patch new file mode 100644 index 0000000..245ea61 --- /dev/null +++ b/0001-build-and-link-a2dp-codecs.c-as-well.patch @@ -0,0 +1,51 @@ +From a62e41eae2e94868558f2621d3e90381fa646efa Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 7 Feb 2020 17:05:17 +0100 +Subject: [PATCH] build and link a2dp-codecs.c as well + +--- + spa/plugins/bluez5/a2dp-codecs.h | 8 ++++---- + spa/plugins/bluez5/meson.build | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/spa/plugins/bluez5/a2dp-codecs.h b/spa/plugins/bluez5/a2dp-codecs.h +index 9c061d6a..969cd141 100644 +--- a/spa/plugins/bluez5/a2dp-codecs.h ++++ b/spa/plugins/bluez5/a2dp-codecs.h +@@ -284,15 +284,15 @@ static inline int a2dp_sbc_get_frequency(a2dp_sbc_t *config) + } + } + +-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 +diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build +index 15890238..1eab8632 100644 +--- 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, +-- +2.24.1 + diff --git a/pipewire0.2.spec b/pipewire0.2.spec index 3046ea9..5bd9c12 100644 --- a/pipewire0.2.spec +++ b/pipewire0.2.spec @@ -27,6 +27,7 @@ Source0: https://github.com/PipeWire/pipewire/archive/%{version}/pipewire-%{vers %endif ## upstream patches +Patch1: 0001-build-and-link-a2dp-codecs.c-as-well.patch ## upstreamable patches @@ -80,6 +81,8 @@ to interface with a PipeWire media server. %prep %setup -q -T -b0 -n pipewire-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}} +%patch1 -p1 -b .0001 + %build %meson -D docs=false -D man=false -D gstreamer=disabled -D systemd=false %meson_build @@ -109,3 +112,4 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* %changelog * Wed Jan 29 2020 Wim Taymans - 0.2.7-1 - First version +- Fix bluez5 plugins build