Commit 585ab3b1 authored by abveritas's avatar abveritas

kid3 rebuild for libmp4v2

parent 566ae2be
......@@ -4,39 +4,31 @@
# maintainer abveritas@chakra-project.org
pkgname=kid3
pkgver=2.1
pkgver=2.2.1
pkgrel=2
pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://kid3.sourceforge.net/"
license=('GPL')
depends=('id3lib' 'kdelibs' 'libmp4v2' 'chromaprint')
makedepends=('automoc4' 'cmake' 'taglib' 'docbook-xsl' 'ffmpeg')
makedepends=('automoc4' 'cmake' 'taglib' 'docbook-xsl')
categories=('multimedia')
screenshot=('http://pkgs.org/images/linux-software/kid3/kid3-screenshot.png')
install=${pkgname}.install
source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
"ffmpeg-0.11.diff")
sha1sums=('bdfad021123d41cdbe38dc02f92869786d9cdff6'
'80855ee0099964fa52b816797a9fe2eceeec8b5c')
source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
md5sums=('79a4e1e4d18672337539a15256cc52f4')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i "${srcdir}/ffmpeg-0.11.diff"
cd "${srcdir}"
cd ${srcdir}
mkdir build
cd build
cmake "../${pkgname}-${pkgver}" \
cmake ../${pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_TUNEPIMP=OFF
-DCMAKE_BUILD_TYPE=Release
make
}
package() {
cd "${srcdir}/build"
make DESTDIR="${pkgdir}" install
cd ${srcdir}/build
make DESTDIR=${pkgdir} install
}
commit 2a91bff2810281e58948f478e9396c73e5c6154a
Author: Urs Fleisch <ufleisch@users.sourceforge.net>
Date: Mon Jun 4 15:23:36 2012 +0200
Support building with ffmpeg-0.11.
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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment