Date: Wednesday, March 6, 2013 @ 14:51:08
Author: bisson
Revision: 179542
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
chromaprint/repos/extra-i686/PKGBUILD
(from rev 179541, chromaprint/trunk/PKGBUILD)
chromaprint/repos/extra-i686/ffmpeg.patch
(from rev 179541, chromaprint/trunk/ffmpeg.patch)
chromaprint/repos/extra-x86_64/PKGBUILD
(from rev 179541, chromaprint/trunk/PKGBUILD)
chromaprint/repos/extra-x86_64/ffmpeg.patch
(from rev 179541, chromaprint/trunk/ffmpeg.patch)
Deleted:
chromaprint/repos/extra-i686/PKGBUILD
chromaprint/repos/extra-x86_64/PKGBUILD
---------------------------+
extra-i686/PKGBUILD | 65 +++++++++++++++++++++++---------------------
extra-i686/ffmpeg.patch | 21 ++++++++++++++
extra-x86_64/PKGBUILD | 65 +++++++++++++++++++++++---------------------
extra-x86_64/ffmpeg.patch | 21 ++++++++++++++
4 files changed, 112 insertions(+), 60 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-03-06 13:50:25 UTC (rev 179541)
+++ extra-i686/PKGBUILD 2013-03-06 13:51:08 UTC (rev 179542)
@@ -1,30 +0,0 @@
-# $Id$
-# Contributor: Wieland Hoffmann <[email protected]>
-# Maintainer: Gaetan Bisson <[email protected]>
-
-pkgname=chromaprint
-pkgver=0.7
-pkgrel=3
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_EXAMPLES=ON \
- .
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: chromaprint/repos/extra-i686/PKGBUILD (from rev 179541,
chromaprint/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-03-06 13:51:08 UTC (rev 179542)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Wieland Hoffmann <[email protected]>
+# Maintainer: Gaetan Bisson <[email protected]>
+
+pkgname=chromaprint
+pkgver=0.7
+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";
+ 'ffmpeg.patch')
+sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2'
+ '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../ffmpeg.patch
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_EXAMPLES=ON \
+ .
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: chromaprint/repos/extra-i686/ffmpeg.patch (from rev 179541,
chromaprint/trunk/ffmpeg.patch)
===================================================================
--- extra-i686/ffmpeg.patch (rev 0)
+++ extra-i686/ffmpeg.patch 2013-03-06 13:51:08 UTC (rev 179542)
@@ -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;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-03-06 13:50:25 UTC (rev 179541)
+++ extra-x86_64/PKGBUILD 2013-03-06 13:51:08 UTC (rev 179542)
@@ -1,30 +0,0 @@
-# $Id$
-# Contributor: Wieland Hoffmann <[email protected]>
-# Maintainer: Gaetan Bisson <[email protected]>
-
-pkgname=chromaprint
-pkgver=0.7
-pkgrel=3
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_EXAMPLES=ON \
- .
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: chromaprint/repos/extra-x86_64/PKGBUILD (from rev 179541,
chromaprint/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-03-06 13:51:08 UTC (rev 179542)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Wieland Hoffmann <[email protected]>
+# Maintainer: Gaetan Bisson <[email protected]>
+
+pkgname=chromaprint
+pkgver=0.7
+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";
+ 'ffmpeg.patch')
+sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2'
+ '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../ffmpeg.patch
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_EXAMPLES=ON \
+ .
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: chromaprint/repos/extra-x86_64/ffmpeg.patch (from rev 179541,
chromaprint/trunk/ffmpeg.patch)
===================================================================
--- extra-x86_64/ffmpeg.patch (rev 0)
+++ extra-x86_64/ffmpeg.patch 2013-03-06 13:51:08 UTC (rev 179542)
@@ -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;
