[arch-commits] Commit in abcde/trunk (PKGBUILD python2-eyed3-0.7.0.patch)

[Jakob Gruber]

    Date: Monday, January 28, 2013 @ 22:08:27
  Author: schuay
Revision: 83290

abcde 2.5.4-4

Added:
  abcde/trunk/python2-eyed3-0.7.0.patch
Modified:
  abcde/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   35 ++++++++++++++++++-----------------
 python2-eyed3-0.7.0.patch |   20 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-28 21:02:03 UTC (rev 83289)
+++ PKGBUILD	2013-01-28 21:08:27 UTC (rev 83290)
@@ -6,38 +6,39 @@
 
 pkgname=abcde
 pkgver=2.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc='A frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go.'
 arch=('any')
 url='http://code.google.com/p/abcde/'
 license=('GPL')
 depends=('bash' 'cd-discid' 'wget' 'vorbis-tools' 'python2-eyed3')
 optdepends=('eject: Eject support'
-	'cdparanoia: Paranoia ripping support'
-	'cdrkit: icedax ripping support'
-	'lame: MP3 encoding support'
-	'flac: FLAC encoding support'
-	'id3: ID3 v1 tag support')
+            'cdparanoia: Paranoia ripping support'
+            'cdrkit: icedax ripping support'
+            'lame: MP3 encoding support'
+            'flac: FLAC encoding support'
+            'id3: ID3 v1 tag support'
+            'perl-musicbrainz-discid: musicbrainz support'
+            'perl-webservice-musicbrainz: musicbrainz support')
 backup=("etc/${pkgname}.conf")
 source=("http://abcde.googlecode.com/files/abcde-${pkgver}.tar.gz"
-        'fix-mp3-tagging.patch')
+        'fix-mp3-tagging.patch'
+        'python2-eyed3-0.7.0.patch')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${srcdir}/${pkgname}-${pkgver}
 
-	patch -Np0 < ${srcdir}/fix-mp3-tagging.patch
-	sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
+    patch -Np2 < ${srcdir}/python2-eyed3-0.7.0.patch
+    patch -Np0 < ${srcdir}/fix-mp3-tagging.patch
+    sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${srcdir}/${pkgname}-${pkgver}
 
-	install -Dm 0755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-	install -Dm 0755 cddb-tool ${pkgdir}/usr/bin/cddb-tool
-	install -Dm 0644 cddb-tool.1 ${pkgdir}/usr/share/man/man1/cddb-tool.1
-	install -Dm 0644 ${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
-	install -Dm 0644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
+    make DESTDIR="${pkgdir}" install
 }
 
 md5sums=('d761c5a07854ce24748be9aa10100e74'
-         'c3975dc8389ff2edba6684bbc378d97d')
+         'c3975dc8389ff2edba6684bbc378d97d'
+         'a438c9bc47da917884b18255bc1ffe0d')

Added: python2-eyed3-0.7.0.patch
===================================================================
--- python2-eyed3-0.7.0.patch	                        (rev 0)
+++ python2-eyed3-0.7.0.patch	2013-01-28 21:08:27 UTC (rev 83290)
@@ -0,0 +1,20 @@
+--- src/abcde-2.5.4/abcde	2012-09-18 15:09:31.000000000 +0200
++++ src/abcde-2.5.4/abcde	2013-01-28 21:44:55.479715536 +0100
+@@ -829,7 +829,7 @@
+ 						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
+ 						-G "$GENREID" -n "${TRACKNUM:-$1}" \
+ 						${TRACKNUM:+-N "$TRACKS"} \
+-						${ENCODING:+--set-encoding="$ENCODING"} \
++						${ENCODING:+--encoding "$ENCODING"} \
+ 						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+ 						"$ABCDETEMPDIR/track$1.$OUTPUT"
+ 					;;
+@@ -3879,7 +3879,7 @@
+ 	TAGGER="$EYED3"
+ 	TAGGEROPTS="$ID3V2OPTS"
+ 	ID3SYNTAX=eyed3
+-	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
++	TAGGEROPTS="--encoding utf16 $ID3V2OPTS"
+ fi
+ 
+ # NOGAP is specific to lame. Other encoders fail ...