Date: Wednesday, March 6, 2013 @ 14:50:25 Author: bisson Revision: 179541
fix FS#34172 Added: chromaprint/trunk/ffmpeg.patch Modified: chromaprint/trunk/PKGBUILD --------------+ PKGBUILD | 11 ++++++++--- ffmpeg.patch | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-06 10:50:29 UTC (rev 179540) +++ PKGBUILD 2013-03-06 13:50:25 UTC (rev 179541) @@ -4,18 +4,23 @@ pkgname=chromaprint pkgver=0.7 -pkgrel=3 +pkgrel=4 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64') license=('LGPL') depends=('ffmpeg') makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2' + '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../ffmpeg.patch + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ Added: ffmpeg.patch =================================================================== --- ffmpeg.patch (rev 0) +++ ffmpeg.patch 2013-03-06 13:50:25 UTC (rev 179541) @@ -0,0 +1,21 @@ +diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c +--- old/examples/fpcalc.c 2012-09-06 04:05:36.000000000 +1000 ++++ new/examples/fpcalc.c 2013-03-07 00:43:11.950928188 +1100 +@@ -65,6 +65,9 @@ + goto done; + } + ++ /* request regular signed 16-bit packed format */ ++ codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; ++ + if (avcodec_open(codec_ctx, codec) < 0) { + fprintf(stderr, "ERROR: couldn't open the codec\n"); + goto done; +@@ -146,6 +149,7 @@ + int ostride[6] = { 2 }; + int len = buffer_size / istride[0]; + if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { ++ fprintf(stderr, "WARNING: unable to convert %d samples\n", buffer_size); + break; + } + buffer = buffer2;