diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
commit | e0981df8c5fce1353e1499a5085e27f92afddcea (patch) | |
tree | 06de6ad8de74d4b7b040d67f050c1fd43fe83a33 /extra/taglib | |
parent | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (diff) | |
parent | 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/curlftpfs/PKGBUILD
core/libcap/PKGBUILD
core/libsasl/PKGBUILD
core/udev/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dbus/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/mercurial/PKGBUILD
extra/redland/PKGBUILD
extra/soprano/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/taglib')
-rw-r--r-- | extra/taglib/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/taglib/ape-idev2.patch | 12 |
2 files changed, 25 insertions, 8 deletions
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index 834365150..aaa8f869e 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 118894 2011-04-09 10:13:00Z andrea $ +# $Id: PKGBUILD 134613 2011-08-06 13:04:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib pkgver=1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64' 'mips64el') url="http://developer.kde.org/~wheeler/taglib.html" license=('GPL2') depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkgconfig') -source=(http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz) +source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" + 'ape-idev2.patch') options=('!libtool') -md5sums=('6a7e312668f153fa905a81714aebc257') +md5sums=('6a7e312668f153fa905a81714aebc257' + 'c7c165d99acf01456351ba39ff7056cb') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/ape-idev2.patch + + cd "${srcdir}" mkdir build cd build - cmake ../$pkgname-$pkgver \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_MP4=ON \ @@ -28,6 +33,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/taglib/ape-idev2.patch b/extra/taglib/ape-idev2.patch new file mode 100644 index 000000000..9c58da420 --- /dev/null +++ b/extra/taglib/ape-idev2.patch @@ -0,0 +1,12 @@ +diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp +--- taglib-1.7.orig/taglib/ape/apeproperties.cpp 2011-03-12 00:15:38.000000000 +1100 ++++ taglib-1.7/taglib/ape/apeproperties.cpp 2011-07-29 21:19:45.984345060 +1000 +@@ -137,7 +137,7 @@ + long ID3v2OriginalSize = 0; + bool hasID3v2 = false; + if(ID3v2Location >= 0) { +- ID3v2::Tag tag(d->file, ID3v2Location, 0); ++ ID3v2::Tag tag(d->file, ID3v2Location); + ID3v2OriginalSize = tag.header()->completeTagSize(); + if(tag.header()->tagSize() > 0) + hasID3v2 = true; |