- upstream fix for ffmpeg 6, rel 6

diff --git a/aubio.spec b/aubio.spec
index 5a5912f545027edee3c182b3dbdb09b601021b94..806888104723745e440f144a738acf326145ffb2 100644 (file)
--- a/aubio.spec
+++ b/aubio.spec
@@ -12,11 +12,12 @@ Summary:    aubio - library for audio labelling
 Summary(pl.UTF-8):     aubio - biblioteka do oznaczania dźwięku
 Name:          aubio
 Version:       0.4.9
-Release:       5
+Release:       6
 License:       GPL v3+
 Group:         Libraries
 Source0:       https://aubio.org/pub/%{name}-%{version}.tar.bz2
 # Source0-md5: 50c9c63b15a2692378af5d602892f16a
+Patch0:                ffmpeg6.patch
 URL:           https://aubio.org/
 # libavcodec >= 54.35.0, libavformat >= 52.3.0, libavutil >= 52.3.0, libswresample >= 1.2.0 || libavresample >= 1.0.1
 BuildRequires: ffmpeg-devel >= 1.1
@@ -154,6 +155,7 @@ Wiązania Pythona 3 do biblioteki aubio.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CC="%{__cc}"

diff --git a/ffmpeg6.patch b/ffmpeg6.patch
new file mode 100644 (file)
index 0000000..5036413
--- /dev/null
+++ b/ffmpeg6.patch
@@ -0,0 +1,28 @@
+From 8a05420e5dd8c7b8b2447f82dc919765876511b3 Mon Sep 17 00:00:00 2001
+From: Paul Brossier <piem@piem.org>
+Date: Tue, 25 Jan 2022 18:30:27 +0100
+Subject: [PATCH] [source_avcodec] define FF_API_LAVF_AVCTX for libavcodec >
+ 59, thx @berolinux (closes gh-353)
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
+index e0ae93b5..1421bd9a 100644
+--- a/src/io/source_avcodec.c
++++ b/src/io/source_avcodec.c
+@@ -68,6 +68,10 @@
+ #define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+ #endif
+ 
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++#define FF_API_LAVF_AVCTX 1
++#endif
++
+ struct _aubio_source_avcodec_t {
+   uint_t hop_size;
+   uint_t samplerate;
+-- 
+2.11.0
+