[chromaprint-tools] patch for ffmpeg-3

commit 33b8dff8b2d0593682135d8d1bcd5fe12a02ff60 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Jul 19 18:24:40 2016 +0100 patch for ffmpeg-3 chromaprint-tools.spec | 7 ++++++- ffmpeg.patch | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) --- diff --git a/chromaprint-tools.spec b/chromaprint-tools.spec index 8b420ac..63c9ad1 100644 --- a/chromaprint-tools.spec +++ b/chromaprint-tools.spec @@ -1,11 +1,12 @@ Name: chromaprint-tools Version: 1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Chromaprint audio fingerprinting tools Group: Applications/Multimedia License: LGPLv2+ URL: http://www.acoustid.org/chromaprint/ Source: https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-%{versio... +Patch0: ffmpeg.patch BuildRequires: cmake BuildRequires: fftw-devel >= 3 @@ -26,6 +27,7 @@ featuring fpcalc an standalone AcoustID tool used by Picard. %prep %setup -q -n chromaprint-%{version} +%patch0 -p1 -b .ffmpeg %build @@ -47,6 +49,9 @@ rm -f %{buildroot}%{_libdir}/lib*.so* %{_bindir}/fpcalc %changelog +* Tue Jul 19 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.2-2 +- patch for ffmpeg-3 + * Tue Feb 23 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2-1 - Update to 1.2 - Fix rfbz #2746 diff --git a/ffmpeg.patch b/ffmpeg.patch new file mode 100644 index 0000000..a262508 --- /dev/null +++ b/ffmpeg.patch @@ -0,0 +1,16 @@ +--- a/examples/fpcalc.c ++++ b/examples/fpcalc.c +@@ -17,8 +17,10 @@ + #define MAX(a, b) ((a) > (b) ? (a) : (b)) + #define MIN(a, b) ((a) < (b) ? (a) : (b)) + +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) +-#define avcodec_free_frame av_freep ++#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(56, 41, 100) ++#define avcodec_free_frame av_frame_free ++#define avcodec_alloc_frame av_frame_alloc ++#define avcodec_get_frame_defaults av_frame_unref + #endif + + int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration) +mock -r fedora-23-i386-rpmfusion_free --no-clean rebuild