rpms/abcde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Update to 2.3.99.8 (#516886).

Browse source
This commit is contained in:
Ville Skyttä 2009-08-11 22:01:31 +00:00
commit b27bfbcac3
5 changed files with 20 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cvsignore
View file

@ -1 +1 @@
abcde_2.3.99.7.orig.tar.gz
abcde_2.3.99.8.orig.tar.gz

35
abcde-2.3.99.7-config.patch → abcde-2.3.99.8-config.patch
View file

@ -1,7 +1,7 @@
diff -up abcde-2.3.99.7/abcde~ abcde-2.3.99.7/abcde
--- abcde-2.3.99.7/abcde~ 2008-06-10 13:39:05.000000000 +0300
+++ abcde-2.3.99.7/abcde 2009-07-27 23:46:34.000000000 +0300
@@ -2998,7 +2998,7 @@ MUSICBRAINZ=musicbrainz-get-tracks
diff -up abcde-2.3.99.8/abcde~ abcde-2.3.99.8/abcde
--- abcde-2.3.99.8/abcde~ 2009-07-26 20:28:29.000000000 +0300
+++ abcde-2.3.99.8/abcde 2009-08-12 00:47:00.000000000 +0300
@@ -3008,7 +3008,7 @@ MUSICBRAINZ=musicbrainz-get-tracks
EJECT=eject
MD5SUM=md5sum
DISTMP3=distmp3
@ -10,9 +10,9 @@ diff -up abcde-2.3.99.7/abcde~ abcde-2.3.99.7/abcde
CDSPEED=eject
VORBISGAIN=vorbisgain
MP3GAIN=mp3gain
diff -up abcde-2.3.99.7/abcde.1~ abcde-2.3.99.7/abcde.1
--- abcde-2.3.99.7/abcde.1~ 2007-06-07 10:31:34.000000000 +0300
+++ abcde-2.3.99.7/abcde.1 2009-07-27 23:46:34.000000000 +0300
diff -up abcde-2.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1
--- abcde-2.3.99.8/abcde.1~ 2009-07-26 14:36:02.000000000 +0300
+++ abcde-2.3.99.8/abcde.1 2009-08-12 00:47:02.000000000 +0300
@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po
.TP
.B NORMALIZERSYNTAX
@ -40,9 +40,9 @@ diff -up abcde-2.3.99.7/abcde.1~ abcde-2.3.99.7/abcde.1
.BR oggenc (1),
.BR vorbize (1),
.BR flac (1),
diff -up abcde-2.3.99.7/abcde.conf~ abcde-2.3.99.7/abcde.conf
--- abcde-2.3.99.7/abcde.conf~ 2008-06-10 13:32:24.000000000 +0300
+++ abcde-2.3.99.7/abcde.conf 2009-07-27 23:46:45.000000000 +0300
diff -up abcde-2.3.99.8/abcde.conf~ abcde-2.3.99.8/abcde.conf
--- abcde-2.3.99.8/abcde.conf~ 2009-07-26 14:46:44.000000000 +0300
+++ abcde-2.3.99.8/abcde.conf 2009-08-12 00:47:04.000000000 +0300
@@ -139,7 +139,7 @@
#DISTMP3=distmp3
#VORBISCOMMENT=vorbiscomment
@ -52,18 +52,9 @@ diff -up abcde-2.3.99.7/abcde.conf~ abcde-2.3.99.7/abcde.conf
#CDSPEED=eject
#VORBISGAIN=vorbisgain
#MKCUE=mkcue
@@ -271,7 +271,7 @@
#BATCHNORM=n
# Enables nogap encoding when using the 'lame' encoder.
-#NOGAP=n
+#NOGAP=y
# Set the playlist file location format. Uses the same variables and format
# as OUTPUTFORMAT. If the playlist is specified to be in a subdirectory, it
diff -up abcde-2.3.99.7/README~ abcde-2.3.99.7/README
--- abcde-2.3.99.7/README~ 2006-08-05 05:23:25.000000000 +0300
+++ abcde-2.3.99.7/README 2009-07-27 23:46:34.000000000 +0300
diff -up abcde-2.3.99.8/README~ abcde-2.3.99.8/README
--- abcde-2.3.99.8/README~ 2009-07-26 14:46:44.000000000 +0300
+++ abcde-2.3.99.8/README 2009-08-12 00:46:53.000000000 +0300
@@ -152,7 +152,7 @@ Options added/modified from 2.1.1 to 2.1
Options added/modified from 2.0.3 to 2.1.x:

7
abcde.spec
View file

@ -1,5 +1,5 @@
Name: abcde
Version: 2.3.99.7
Version: 2.3.99.8
Release: 1%{?dist}
Summary: A Better CD Encoder
@ -10,7 +10,7 @@ Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/abcde/
Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
Patch0: %{name}-2.3.99.7-config.patch
Patch0: %{name}-2.3.99.8-config.patch
# http://code.google.com/p/abcde/issues/detail?id=17
Patch1: %{name}-2.1.19-inst.patch
# Cherry-picked bits from Ubuntu's 2.3.99.7-1ubuntu1
@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Aug 12 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.3.99.8-1
- Update to 2.3.99.8 (#516886).
* Mon Jul 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.3.99.7-1
- Update to 2.3.99.7 (#513795); wget and usage patches applied upstream.
- Patch to improve CDDB track info handling.

32
abcde_2.3.99.7-1ubuntu1.diff
View file

@ -25,35 +25,3 @@
$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"
else
@@ -3291,14 +3292,17 @@
else
while [ $# -gt 0 ]; do
# Range parsing code courtesy of Vincent Ho
- RSTART=$(echo $1 | cut -f1 -d-)
- REND=$(echo $1 | cut -f2 -d-)
- if [ "$RSTART" = "$REND" ]; then
- NEWTRACKS="$RSTART"
+ # Cleaned up to use shell built-ins by Charles Steinkuehler
+ if [ "${1#*[^0-9-]}" != "$1" ]; then
+ log error "syntax error while processing track numbers"
else
- NEWTRACKS=$(f_seq_line $RSTART $REND)
+ RSTART=${1%%-*}
+ REND=${1##*-}
+ while [ ${RSTART:=1} -le ${REND:=0} ] ; do
+ TRACKQUEUE="$TRACKQUEUE $RSTART"
+ RSTART=$(( $RSTART + 1 ))
+ done
fi
- TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
shift
done
fi
@@ -3594,6 +3598,7 @@
FLACENCODER="$FLAC"
if [ "$DOREPLAYGAIN" = "y" ]; then
FLACENCODEROPTS="${FLACENCODEROPTS} --replay-gain"
+ fi
# FLAC streams can be encapsulated on a Ogg transport layer
if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then
log error "FLAC on an Ogg container is not yet supported"

2
sources
View file

@ -1 +1 @@
a0baa57edecf40c8423eac7e36d06882 abcde_2.3.99.7.orig.tar.gz
981fd4bfd6938bb6a1130f6193bffb00 abcde_2.3.99.8.orig.tar.gz