From 0615a909b089a81d068ae10517ceff31dabfece1 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 10 Jul 2012 00:01:37 +0000
Subject: Tue Jul 10 00:01:37 UTC 2012

---
 community/kid3/PKGBUILD         | 26 ++++++++++++++++++++------
 community/kid3/ffmpeg-0.11.diff | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 community/kid3/ffmpeg-0.11.diff

(limited to 'community/kid3')

diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index b97e91920..241e8acae 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71118 2012-05-24 14:06:52Z tomegun $
+# $Id: PKGBUILD 73475 2012-07-08 09:30:25Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3
 pkgver=2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('i686' 'x86_64')
 url="http://kid3.sourceforge.net/"
@@ -14,19 +14,33 @@ makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
 options=('!makeflags')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'ffmpeg-0.11.diff')
+sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225'
+            '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54')
 
 build() {
+  cd ${pkgname}-${pkgver}
+
+  # fix error building with latest ffmpeg
+  # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a
+  patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff
+
   cd ${srcdir}
 
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+
+  cmake \
+    ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+
   make
 }
 
 package() {
-  cd ${srcdir}/build
+  cd build
+
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/kid3/ffmpeg-0.11.diff b/community/kid3/ffmpeg-0.11.diff
new file mode 100644
index 000000000..349ca4b3d
--- /dev/null
+++ b/community/kid3/ffmpeg-0.11.diff
@@ -0,0 +1,34 @@
+From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001
+From: Urs Fleisch <ufleisch@users.sourceforge.net>
+Date: Mon, 4 Jun 2012 15:23:36 +0200
+Subject: [PATCH 1/1] Support building with ffmpeg-0.11.
+
+---
+ src/core/import/fingerprintcalculator.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp
+index 05158ae..6ac632c 100644
+--- a/src/core/import/fingerprintcalculator.cpp
++++ b/src/core/import/fingerprintcalculator.cpp
+@@ -218,7 +218,7 @@ public:
+   }
+ 
+   bool createForCodec(const Codec& codecCtx) {
+-    m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(),
++    m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(),
+                  codecCtx.sampleFormat(), codecCtx.channels(), 0, 0);
+     return m_ptr != 0;
+   }
+@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile(
+     return Result::NoCodecFound;
+ 
+   Converter converter;
+-  if (codec.sampleFormat() != SAMPLE_FMT_S16) {
++  if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) {
+     if (!converter.createForCodec(codec))
+       return Result::NoConverterFound;
+   }
+-- 
+1.7.4.1
+
-- 
cgit v1.2.3-54-g00ecf