ports/89421: [maintainer update]: audio/abcde patch to fix -o output bug
Jean Milanez Melo
jmelo at freebsdbrasil.com.br
Tue Nov 22 15:33:31 UTC 2005
>Number: 89421
>Category: ports
>Synopsis: [maintainer update]: audio/abcde patch to fix -o output bug
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 22 15:30:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jean Milanez Melo
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD capeta.freebsdbrasil.com.br 5.3-STABLE FreeBSD 5.3-STABLE #5: Wed Mar 2 15:03:19 BRT 2005 eksffa at capeta.freebsdbrasil.com.br:/usr/obj/usr/src/sys/CAPETA i386
>Description:
- Patch to fix -o output bug.
- PORTVERSION was increased.
>How-To-Repeat:
>Fix:
--- abcde.diff begins here ---
diff -ruN abcde.old/Makefile abcde/Makefile
--- abcde.old/Makefile Wed Oct 19 15:51:12 2005
+++ abcde/Makefile Tue Nov 22 13:16:58 2005
@@ -7,6 +7,7 @@
PORTNAME= abcde
PORTVERSION= 2.3.3
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.hispalinux.es/~data/files/ \
http://www.soulwax.net/freebsd/
diff -ruN abcde.old/files/patch-aa abcde/files/patch-aa
--- abcde.old/files/patch-aa Wed Aug 20 08:02:42 2003
+++ abcde/files/patch-aa Wed Dec 31 21:00:00 1969
@@ -1,24 +0,0 @@
---- abcde.conf.orig Wed Aug 20 02:43:58 2003
-+++ abcde.conf Wed Aug 20 02:57:42 2003
-@@ -92,7 +92,7 @@
-
- # Ogg:
- #VORBIZEOPTS=
--#OGGENCOPTS=
-+OGGENCOPTS="-q 5"
-
- # FLAC:
- #FLACOPTS=
-@@ -154,10 +154,10 @@
- # Since multiple-output was integrated we always append the file type
- # to the files. Remove it from your user defined string if you are getting
- # files like ".ogg.ogg".
--#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
-
- # Like OUTPUTFORMAT but for Various Artists discs.
--#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
-+VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
-
- # Define how many encoders to run at once. This makes for huge speedups
- # on SMP systems. Defaults to 1. Equivalent to -j.
diff -ruN abcde.old/files/patch-abcde abcde/files/patch-abcde
--- abcde.old/files/patch-abcde Wed Dec 31 21:00:00 1969
+++ abcde/files/patch-abcde Tue Nov 22 13:13:41 2005
@@ -0,0 +1,30 @@
+--- abcde.old Tue Nov 22 13:12:14 2005
++++ abcde Tue Nov 22 13:12:51 2005
+@@ -2453,17 +2453,18 @@
+
+ # Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation
+ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
+- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+- case "$OUTPUT" in
+- vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+- mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+- flac:*) FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+- spx:*) SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+- mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
++ for OUTPUT in $(echo $OUTPUTTYPE | tr \ \| | tr , \ ); do
++ TOUTPUT=$(echo $OUTPUT | tr \| \ )
++ case "$TOUTPUT" in
++ vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++ mp3:*) MP3ENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++ flac:*) FLACENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++ spx:*) SPEEXENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++ mpc:*) MPPENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
+ esac
+ done
+- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+- TEMPOUTPUT=$( echo "$OUTPUT" | cut -d: -f1 )
++ for OUTPUT in $(echo $OUTPUTTYPE | tr \ \| | tr , \ ); do
++ TEMPOUTPUT=$( echo "$OUTPUT" | tr \| \ | cut -d: -f1 )
+ TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
+ done
+ OUTPUTTYPE="$TEMPOUTPUTTYPE"
diff -ruN abcde.old/files/patch-abcde.conf abcde/files/patch-abcde.conf
--- abcde.old/files/patch-abcde.conf Wed Dec 31 21:00:00 1969
+++ abcde/files/patch-abcde.conf Wed Aug 20 08:02:42 2003
@@ -0,0 +1,24 @@
+--- abcde.conf.orig Wed Aug 20 02:43:58 2003
++++ abcde.conf Wed Aug 20 02:57:42 2003
+@@ -92,7 +92,7 @@
+
+ # Ogg:
+ #VORBIZEOPTS=
+-#OGGENCOPTS=
++OGGENCOPTS="-q 5"
+
+ # FLAC:
+ #FLACOPTS=
+@@ -154,10 +154,10 @@
+ # Since multiple-output was integrated we always append the file type
+ # to the files. Remove it from your user defined string if you are getting
+ # files like ".ogg.ogg".
+-#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
++OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
+
+ # Like OUTPUTFORMAT but for Various Artists discs.
+-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
++VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
+
+ # Define how many encoders to run at once. This makes for huge speedups
+ # on SMP systems. Defaults to 1. Equivalent to -j.
--- abcde.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list