Hello community, here is the log from the commit of package chromaprint for openSUSE:Factory checked in at 2016-04-07 13:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromaprint (Old) and /work/SRC/openSUSE:Factory/.chromaprint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromaprint" Changes: -------- --- /work/SRC/openSUSE:Factory/chromaprint/chromaprint.changes 2016-02-25 21:43:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chromaprint.new/chromaprint.changes 2016-04-07 13:35:30.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 1 17:06:25 UTC 2016 - [email protected] + +- Restore support for libswresample/libavresample (bsc#973555) +- Remove usage of deprecated API + chromaprint-ffmpeg-API.patch + +------------------------------------------------------------------- New: ---- chromaprint-ffmpeg-API.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromaprint.spec ++++++ --- /var/tmp/diff_new_pack.N6AKLv/_old 2016-04-07 13:35:31.000000000 +0200 +++ /var/tmp/diff_new_pack.N6AKLv/_new 2016-04-07 13:35:31.000000000 +0200 @@ -29,6 +29,7 @@ Source0: https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-%{version}.tar.gz Source1: baselibs.conf Patch0: chromaprint-ffmpeg-pkgconfig.patch +Patch1: chromaprint-ffmpeg-API.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: fftw3-devel @@ -40,7 +41,9 @@ BuildRequires: boost-devel BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libswresample) %endif %description @@ -96,6 +99,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake \ ++++++ chromaprint-ffmpeg-API.patch ++++++ --- examples/fpcalc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: chromaprint-1.3.1/examples/fpcalc.c =================================================================== --- chromaprint-1.3.1.orig/examples/fpcalc.c +++ chromaprint-1.3.1/examples/fpcalc.c @@ -205,7 +205,7 @@ int decode_audio_file(ChromaprintContext } } } - av_free_packet(&packet); + av_packet_unref(&packet); } finish: ++++++ chromaprint-ffmpeg-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.N6AKLv/_old 2016-04-07 13:35:31.000000000 +0200 +++ /var/tmp/diff_new_pack.N6AKLv/_new 2016-04-07 13:35:31.000000000 +0200 @@ -1,11 +1,11 @@ --- - cmake/modules/FindFFmpeg.cmake | 73 ++++------------------------------------- - 1 file changed, 8 insertions(+), 65 deletions(-) + cmake/modules/FindFFmpeg.cmake | 71 ++++------------------------------------- + 1 file changed, 8 insertions(+), 63 deletions(-) -Index: chromaprint-1.2/cmake/modules/FindFFmpeg.cmake +Index: chromaprint-1.3.1/cmake/modules/FindFFmpeg.cmake =================================================================== ---- chromaprint-1.2.orig/cmake/modules/FindFFmpeg.cmake -+++ chromaprint-1.2/cmake/modules/FindFFmpeg.cmake +--- chromaprint-1.3.1.orig/cmake/modules/FindFFmpeg.cmake ++++ chromaprint-1.3.1/cmake/modules/FindFFmpeg.cmake @@ -25,50 +25,15 @@ # example: FFMPEG_FIND(AVFORMAT avformat avformat.h) MACRO(FFMPEG_FIND varname shortname headername) @@ -63,7 +63,7 @@ ) IF (FFMPEG_${varname}_LIBRARIES AND FFMPEG_${varname}_INCLUDE_DIRS) -@@ -77,38 +42,16 @@ MACRO(FFMPEG_FIND varname shortname head +@@ -77,38 +42,18 @@ MACRO(FFMPEG_FIND varname shortname head ENDMACRO(FFMPEG_FIND) @@ -94,8 +94,8 @@ FFMPEG_FIND(LIBAVCODEC_FFT avcodec avfft.h) FFMPEG_FIND(LIBAVUTIL avutil avutil.h) -FFMPEG_FIND(LIBSWSCALE swscale swscale.h) # not sure about the header to look for here. --FFMPEG_FIND(LIBSWRESAMPLE swresample swresample.h) # not sure about the header to look for here. --FFMPEG_FIND(LIBAVRESAMPLE avresample avresample.h) + FFMPEG_FIND(LIBSWRESAMPLE swresample swresample.h) # not sure about the header to look for here. + FFMPEG_FIND(LIBAVRESAMPLE avresample avresample.h) SET(FFMPEG_FOUND "NO") # Note we don't check FFMPEG_LIBSWSCALE_FOUND here, it's optional.
