[arch-commits] Commit in chromaprint/trunk (PKGBUILD ffmpeg.patch)

[Jan Steffens]

    Date: Tuesday, May 14, 2013 @ 21:16:09
  Author: heftig
Revision: 185531

Fix issues with recent FFMPEG

Modified:
  chromaprint/trunk/PKGBUILD
Deleted:
  chromaprint/trunk/ffmpeg.patch

--------------+
 PKGBUILD     |   16 ++++++----------
 ffmpeg.patch |   21 ---------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-14 19:12:24 UTC (rev 185530)
+++ PKGBUILD	2013-05-14 19:16:09 UTC (rev 185531)
@@ -4,23 +4,19 @@
 
 pkgname=chromaprint
 pkgver=0.7
-pkgrel=4
+pkgrel=5
 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')
+makedepends=('cmake' 'git')
+source=('git+https://bitbucket.org/acoustid/chromaprint.git#commit=dd51f8e')
+sha1sums=('SKIP')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}"
 
-	patch -p1 -i ../ffmpeg.patch
-
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -30,6 +26,6 @@
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}"
 	make DESTDIR="${pkgdir}" install
 }

Deleted: ffmpeg.patch
===================================================================
--- ffmpeg.patch	2013-05-14 19:12:24 UTC (rev 185530)
+++ ffmpeg.patch	2013-05-14 19:16:09 UTC (rev 185531)
@@ -1,21 +0,0 @@
-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;