diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,9 +1,9 @@ -libavcodec.so.57 -libavformat.so.57 -libavutil.so.55 +libavcodec.so.58 +libavformat.so.58 +libavutil.so.56 libc.so.6 libfftw3f.so.3 libm.so.6 libsamplerate.so.0 libsndfile.so.1 -libswresample.so.2 +libswresample.so.3 diff --git a/files/0001-Disable-creation-of-static-library.patch b/files/0001-Disable-creation-of-static-library.patch deleted file mode 100644 --- a/files/0001-Disable-creation-of-static-library.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 70abdc76e38763dfe4d745e0cd562f473e1b176c Mon Sep 17 00:00:00 2001 -From: Michael Meinertzhagen -Date: Wed, 19 Apr 2017 09:34:43 +0200 -Subject: [PATCH 1/1] Disable creation of static library - ---- - src/wscript_build | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/wscript_build b/src/wscript_build -index 0a7d72a..6786ff0 100644 ---- a/src/wscript_build -+++ b/src/wscript_build -@@ -34,11 +34,6 @@ else: - # linux, darwin, android, mingw, ... - build_features = ['cstlib', 'cshlib'] - --# also install static lib --from waflib.Tools.c import cstlib --from waflib.Tools.fc import fcstlib --fcstlib.inst_to = cstlib.inst_to = '${LIBDIR}' -- - for target in build_features: - ctx(features = 'c ' + target, - use = uselib + ['lib_objects'], --- -2.12.2 - diff --git a/files/ffmpeg4.patch b/files/ffmpeg4.patch new file mode 100644 --- /dev/null +++ b/files/ffmpeg4.patch @@ -0,0 +1,28 @@ +From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001 +From: James Cowgill +Date: Sun, 25 Feb 2018 14:23:25 +0000 +Subject: [PATCH] Fix build with FFmpeg 4.0 + +--- + 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 ccdce807..8197445c 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -58,7 +58,11 @@ + #include "fmat.h" + #include "source_avcodec.h" + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) + #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE ++#else ++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++#endif + + struct _aubio_source_avcodec_t { + uint_t hop_size; +-- +2.17.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : aubio version : 0.4.6 -release : 4 +release : 5 source : - https://aubio.org/pub/aubio-0.4.6.tar.bz2 : bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb license : GPL-3.0-or-later @@ -14,6 +14,8 @@ - pkgconfig(samplerate) - pkgconfig(sndfile) setup : | + %patch -p1 < $pkgfiles/ffmpeg4.patch + %waf_configure --enable-fftw3f build : | %waf_build diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ aubio - Joey Riches - josephriches@gmail.com + Pierre-Yves + pyu@riseup.net GPL-3.0-or-later multimedia.library @@ -19,8 +19,14 @@ multimedia.library - /usr/bin - /usr/lib64/lib*.so.* + /usr/bin/aubiomfcc + /usr/bin/aubionotes + /usr/bin/aubioonset + /usr/bin/aubiopitch + /usr/bin/aubioquiet + /usr/bin/aubiotrack + /usr/lib64/libaubio.so.5 + /usr/lib64/libaubio.so.5.3.7 @@ -30,22 +36,73 @@ programming.devel - aubio + aubio - /usr/include/ - /usr/lib64/lib*.a - /usr/lib64/lib*.so - /usr/lib64/pkgconfig/*.pc + /usr/include/aubio/aubio.h + /usr/include/aubio/cvec.h + /usr/include/aubio/fmat.h + /usr/include/aubio/fvec.h + /usr/include/aubio/io/audio_unit.h + /usr/include/aubio/io/ioutils.h + /usr/include/aubio/io/sink.h + /usr/include/aubio/io/sink_apple_audio.h + /usr/include/aubio/io/sink_sndfile.h + /usr/include/aubio/io/sink_wavwrite.h + /usr/include/aubio/io/source.h + /usr/include/aubio/io/source_apple_audio.h + /usr/include/aubio/io/source_avcodec.h + /usr/include/aubio/io/source_sndfile.h + /usr/include/aubio/io/source_wavread.h + /usr/include/aubio/lvec.h + /usr/include/aubio/mathutils.h + /usr/include/aubio/musicutils.h + /usr/include/aubio/notes/notes.h + /usr/include/aubio/onset/onset.h + /usr/include/aubio/onset/peakpicker.h + /usr/include/aubio/pitch/pitch.h + /usr/include/aubio/pitch/pitchfcomb.h + /usr/include/aubio/pitch/pitchmcomb.h + /usr/include/aubio/pitch/pitchschmitt.h + /usr/include/aubio/pitch/pitchspecacf.h + /usr/include/aubio/pitch/pitchyin.h + /usr/include/aubio/pitch/pitchyinfast.h + /usr/include/aubio/pitch/pitchyinfft.h + /usr/include/aubio/spectral/awhitening.h + /usr/include/aubio/spectral/fft.h + /usr/include/aubio/spectral/filterbank.h + /usr/include/aubio/spectral/filterbank_mel.h + /usr/include/aubio/spectral/mfcc.h + /usr/include/aubio/spectral/phasevoc.h + /usr/include/aubio/spectral/specdesc.h + /usr/include/aubio/spectral/tss.h + /usr/include/aubio/synth/sampler.h + /usr/include/aubio/synth/wavetable.h + /usr/include/aubio/tempo/beattracking.h + /usr/include/aubio/tempo/tempo.h + /usr/include/aubio/temporal/a_weighting.h + /usr/include/aubio/temporal/biquad.h + /usr/include/aubio/temporal/c_weighting.h + /usr/include/aubio/temporal/filter.h + /usr/include/aubio/temporal/resampler.h + /usr/include/aubio/types.h + /usr/include/aubio/utils/hist.h + /usr/include/aubio/utils/log.h + /usr/include/aubio/utils/parameter.h + /usr/include/aubio/utils/scale.h + /usr/include/aubio/vecutils.h + /usr/lib64/libaubio.a + /usr/lib64/libaubio.so + /usr/lib64/pkgconfig/aubio.pc - - 2018-04-20 + + 2018-08-10 0.4.6 Packaging update - Joey Riches - josephriches@gmail.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file