commit 7b7105ac628887aa81423f813646f0e854092aa6
Author: Gergely Gombos <gombosg(a)disroot.org>
Date: Mon Feb 7 11:03:00 2022 +0100
fix: ffmpeg 5
ffmpeg5_libavutil.patch | 10 ++++++++++
pulseaudio-module-bluetooth-freeworld.spec | 12 ++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg5_libavutil.patch b/ffmpeg5_libavutil.patch
new file mode 100644
index 0000000..f420981
--- /dev/null
+++ b/ffmpeg5_libavutil.patch
@@ -0,0 +1,10 @@
+--- ./src/modules/bluetooth/a2dp/a2dp_aptx.c 2022-02-07 10:26:58.804788966 +0100
++++ ./src/modules/bluetooth/a2dp/a2dp_aptx.c 2022-02-07 10:27:56.430759427 +0100
+@@ -23,6 +23,7 @@
+
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/samplefmt.h>
++#include <libavutil/channel_layout.h>
+
+ #include <pulse/xmalloc.h>
+
diff --git a/pulseaudio-module-bluetooth-freeworld.spec
b/pulseaudio-module-bluetooth-freeworld.spec
index f13e3e0..fd3a7af 100644
--- a/pulseaudio-module-bluetooth-freeworld.spec
+++ b/pulseaudio-module-bluetooth-freeworld.spec
@@ -7,7 +7,7 @@
Name: pulseaudio-module-bluetooth-freeworld
Summary: Bluetooth support for the PulseAudio sound server, supports aptX, LDAC
codecs
Version: 1.4
-Release: 8%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 9%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: GPLv3
URL:
https://github.com/EHfive/pulseaudio-modules-bt/
@@ -30,6 +30,8 @@ Source0: %{url}/archive/v%{version}/%{bt_archivename}.tar.gz
%endif
Source1:
http://freedesktop.org/software/pulseaudio/releases/%{pa_archivename}.tar.xz
+Patch0: ffmpeg5_libavutil.patch
+
Provides: pulseaudio-module-bluetooth = %{pa_version}-100
Conflicts: pulseaudio-module-bluetooth < %{pa_version}-100
@@ -69,8 +71,11 @@ Includes support for LDAC, aptX, aptX-HD and AAC codecs.
rm -rf pa
mv %{pa_archivename} pa
+ls
+%patch0 -p1 -b .ffmpeg5
+
%build
-%cmake3
+%cmake3 -DCMAKE_SKIP_RPATH=ON
%cmake3_build
%install
@@ -84,6 +89,9 @@ mv %{pa_archivename} pa
%{_libdir}/pulse-%{pa_major}/modules/module-bluetooth-policy.so
%changelog
+* Mon Feb 07 2022 Gergely Gombos <gombosg(a)disroot.org> - 1.4-9
+- FFMpeg 5 patch, disable rpath
+
* Wed Oct 06 2021 Gergely Gombos <gombosg(a)disroot.org> - 1.4-8
- Updated to PA 15.0