summaryrefslogtreecommitdiff
path: root/extra/chromaprint
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-03-07 00:04:11 -0800
committerroot <root@rshg054.dnsready.net>2013-03-07 00:04:11 -0800
commitd8d675cb1e75787b0db061756e4cbebe3c5a03fa (patch)
tree0bdf0ea7325f69ad98bf6c2aac2169a810d5a0ba /extra/chromaprint
parent3af1ee89ded5209697eec4e2ecb77cf1f3f19803 (diff)
Thu Mar 7 00:04:11 PST 2013
Diffstat (limited to 'extra/chromaprint')
-rw-r--r--extra/chromaprint/PKGBUILD13
-rw-r--r--extra/chromaprint/ffmpeg.patch21
2 files changed, 30 insertions, 4 deletions
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
index 6b4fd53e4..b783485f8 100644
--- a/extra/chromaprint/PKGBUILD
+++ b/extra/chromaprint/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 178127 2013-02-16 22:48:46Z ioni $
+# $Id: PKGBUILD 179542 2013-03-06 13:51:08Z bisson $
# Contributor: Wieland Hoffmann <the_mineo@web.de>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
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 \
diff --git a/extra/chromaprint/ffmpeg.patch b/extra/chromaprint/ffmpeg.patch
new file mode 100644
index 000000000..4c41ca664
--- /dev/null
+++ b/extra/chromaprint/ffmpeg.patch
@@ -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;