audio/abcde: Updated for version 2.9.1.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

7 files changed, 66 insertions, 35 deletions

diff --git a/audio/abcde/README b/audio/abcde/README
index 79f25fd2add8..748c0e4ccc65 100644
--- a/audio/abcde/README
+++ b/audio/abcde/README
@@ -1,13 +1,11 @@
 abcde is a frontend command-line utility (actually, a shell script)
 that grabs tracks off an audio CD, encodes them to Ogg Vorbis, MP3,
-MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, M4A/AAC, MKA,
+MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, AIFF, M4A/AAC, MKA,
 Monkey's Audio and/or True Audio formats, and tags them all in one go.
 
-On Slackware systems without third party packages Ogg Vorbis, FLAC
-and WavPack are supported. There are many additional features that
-abcde supports by installing one or more of these dependencies:
+There are many additional features that abcde supports by installing one
+or more of these dependencies:
 
-* lame            for creating MP3 files
 * eyeD3           for tagging MP3 files (default)
 * id3v2           for tagging MP3 files (with ID3TAGV=id3v2.3)
 * id3             for tagging MP3 files (with ID3TAGV=id3v1)
@@ -16,17 +14,10 @@ abcde supports by installing one or more of these dependencies:
 * mutagen         for tagging MP2 and MP3 files (with ID3TAGV=id3v2.3
                   and ID3V2=mid3v2)
 
-* opus-tools      for creating Opus files
-
-* speex           for creating Speex files
-
 * musepack-tools  for creating Musepack files
 
-* faac            for creating M4A/AAC files (default)
 * fdkaac          for creating M4A/AAC files
-* ffmpeg          for creating M4A/AAC, MKA, MP2 and WavPack files (if
-                  built with support for these formats)
-* wine            for running neroAacEnc, qaac and fhgaacenc
+* wine            for running qaac and fhgaacenc
 
 * mac             for creating Monkey's Audio files
 * apetag          for tagging Monkey's Audio files
@@ -38,9 +29,5 @@ abcde supports by installing one or more of these dependencies:
 * mkcue           for generating cue sheets for one-album files
 * vorbisgain      for adjusting the volume of Ogg Vorbis files
 
-Install perl-MusicBrainz-DiscID and perl-WebService-MusicBrainz and set
-CDDBMETHOD to "musicbrainz" if you would like to retrieve music
-metadata and album art from MusicBrainz instead of freedb.
-
-Try running abcde as root (sudo or whatever) if abcde/cd-discid thinks
-your favorite audio cd is a data cd.
+Set CDDBMETHOD to "cddb" if you would like to retrieve music metadata and
+album art from freedb instead of MusicBrainz.
diff --git a/audio/abcde/abcde.SlackBuild b/audio/abcde/abcde.SlackBuild
index f4e15c6b371d..25947808ef04 100644
--- a/audio/abcde/abcde.SlackBuild
+++ b/audio/abcde/abcde.SlackBuild
@@ -28,7 +28,7 @@
 # Modified by Andreas Voegele
 
 PRGNAM=abcde
-VERSION=${VERSION:-2.7.2}
+VERSION=${VERSION:-2.9.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -61,6 +61,8 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/id3-genre.diff
+patch -p1 < $CWD/padding.diff
+patch -p1 < $CWD/glyrc-locale.diff
 
 make install DESTDIR=$PKG \
   prefix=/usr \
diff --git a/audio/abcde/abcde.info b/audio/abcde/abcde.info
index e5c3fda2f3fe..b27806ceb0ff 100644
--- a/audio/abcde/abcde.info
+++ b/audio/abcde/abcde.info
@@ -1,10 +1,10 @@
 PRGNAM="abcde"
-VERSION="2.7.2"
-HOMEPAGE="http://abcde.einval.com"
-DOWNLOAD="http://abcde.einval.com/download/abcde-2.7.2.tar.gz"
-MD5SUM="f9455231436d80329eacedf32441d9be"
+VERSION="2.9.1"
+HOMEPAGE="https://abcde.einval.com/wiki/"
+DOWNLOAD="https://abcde.einval.com/download/abcde-2.9.1.tar.gz"
+MD5SUM="e5f17e20d01e6c616bbf24bf4352cb9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cd-discid"
+REQUIRES="cd-discid perl-MusicBrainz-DiscID perl-WebService-MusicBrainz"
 MAINTAINER="Andreas Voegele"
 EMAIL="andreas@andreasvoegele.com"
diff --git a/audio/abcde/glyrc-locale.diff b/audio/abcde/glyrc-locale.diff
new file mode 100644
index 000000000000..3234ffa19b6b
--- /dev/null
+++ b/audio/abcde/glyrc-locale.diff
@@ -0,0 +1,14 @@
+glyrc may fail to find covers if the locale isn't English. Reported under
+https://abcde.einval.com/bugzilla/show_bug.cgi?id=83.
+
+--- abcde-2.9.1.orig/abcde	2018-03-10 00:03:50.000000000 +0100
++++ abcde-2.9.1/abcde	2018-05-21 15:13:59.789577384 +0200
+@@ -3244,7 +3244,7 @@
+ 		# use glyrc
+ 		if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
+ 			vecho "trying to get cover with glyrc for $ARTISTFILE / $ALBUMFILE" >&2
+-			$GLYRC cover --artist "$ARTISTFILE" --album "$ALBUMFILE" --write "${ABCDETEMPDIR}/$ALBUMARTFILE" $GLYRCOPTS
++			env LC_ALL=C $GLYRC cover --artist "$ARTISTFILE" --album "$ALBUMFILE" --write "${ABCDETEMPDIR}/$ALBUMARTFILE" $GLYRCOPTS
+ 			if [ $? -ne 0 ]; then
+ 				vecho "could not download cover with glyrc" >&2
+ 			else
diff --git a/audio/abcde/id3-genre.diff b/audio/abcde/id3-genre.diff
index e3dd55d26206..56eec833153e 100644
--- a/audio/abcde/id3-genre.diff
+++ b/audio/abcde/id3-genre.diff
@@ -1,18 +1,14 @@
 Pass the genre name instead of the identifier to the id3 command as the
 numbers are offset by one.
 
---- abcde-2.7.1/abcde.orig	2015-10-04 11:30:28.000000000 +0200
-+++ abcde-2.7.1/abcde	2016-01-09 15:49:12.249326957 +0100
-@@ -822,11 +822,11 @@
- 			case "$ID3SYNTAX" in
- 				id3)
- 					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+--- abcde-2.9.1.orig/abcde	2018-03-10 00:03:50.000000000 +0100
++++ abcde-2.9.1/abcde	2018-05-21 12:32:49.972288507 +0200
+@@ -864,7 +864,7 @@
+ 					run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE \
  						$TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
  						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
 -						-y "$CDYEAR" -g "$GENREID" \
 +						-y "$CDYEAR" -g "$CDGENRE" \
  						-T "${TRACKNUM:-$1}" \
- 						"$ABCDETEMPDIR/track$1.$OUTPUT"
+ 						"${ABCDETEMPDIR}/track$1.$OUTPUT"
  					;;
- 				id3v2)
- 					# FIXME # track numbers in mp3 come with 1/10, so we cannot
diff --git a/audio/abcde/padding.diff b/audio/abcde/padding.diff
new file mode 100644
index 000000000000..545834f7bd89
--- /dev/null
+++ b/audio/abcde/padding.diff
@@ -0,0 +1,32 @@
+Fix wrong track padding caused by trailing space. Reported under
+https://abcde.einval.com/bugzilla/show_bug.cgi?id=82.
+
+--- abcde-2.9.1.orig/abcde	2018-03-10 00:03:50.000000000 +0100
++++ abcde-2.9.1/abcde	2018-05-21 14:56:20.999531963 +0200
+@@ -2103,7 +2103,7 @@
+ 					log warning "something went wrong while querying the CD... Maybe a DATA CD or the CD is not loaded?"
+ 				fi
+ 
+-				TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
++				TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d '.\n')"
+ 				CDPARANOIAAUDIOTRACKS="$TRACKS"
+ 
+ 				LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
+@@ -2178,7 +2178,7 @@
+ 						if [ ! "$RET" = "0" ];then
+ 							log warning "something went wrong while querying the CD... Maybe a DATA CD?"
+ 						fi
+-						TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
++						TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d '.\n')"
+ 						CDPARANOIAAUDIOTRACKS="$TRACKS"
+ 					else
+ 						# Previous versions of abcde would store the tracks on a file, instead of the status record.
+@@ -5547,7 +5547,7 @@
+ fi
+ # Check if we have moved all the formats we had previously encoded, if we are not using the FORCE.
+ if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then
+-	ENCODED_FORMATS=$(grep -E "^encodetrack-(.{3,6})-(.{1,2})$" "${ABCDETEMPDIR}/status" | cut -d"-" -f2 | sort -u | tr '\n' '|')
++	ENCODED_FORMATS=$(grep -E "^encodetrack-(.{3,6})-(.{1,3})$" "${ABCDETEMPDIR}/status" | cut -d"-" -f2 | sort -u | tr '\n' '|')
+ 	MOVED_FORMATS=$(grep -E "^movetrack-output-(.{3,6})$" "${ABCDETEMPDIR}/status" | cut -d"-" -f3 | sort -u | tr '\n' '|')
+ 	if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then
+ 		log warning "The encoded formats does not match with the moved ones"
diff --git a/audio/abcde/slack-desc b/audio/abcde/slack-desc
index 197e15314fba..4bf00429b6bd 100644
--- a/audio/abcde/slack-desc
+++ b/audio/abcde/slack-desc
@@ -13,7 +13,7 @@ abcde: that grabs tracks off an audio CD, encodes them to Ogg Vorbis, MP3,
 abcde: MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, M4A/AAC, MKA,
 abcde: Monkey's Audio and/or True Audio formats and tags them all in one go.
 abcde:
-abcde: Homepage: http://abcde.einval.com
+abcde: Homepage: https://abcde.einval.com/wiki/
 abcde:
 abcde:
 abcde: