Hello community, here is the log from the commit of package abcde for openSUSE:Factory checked in at 2016-04-30 23:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/abcde (Old) and /work/SRC/openSUSE:Factory/.abcde.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "abcde" Changes: -------- --- /work/SRC/openSUSE:Factory/abcde/abcde.changes 2016-01-05 21:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.abcde.new/abcde.changes 2016-04-30 23:31:02.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Apr 25 11:43:45 UTC 2016 - p.drouand@gmail.com + +- Update to version 2.7.2 + * When using musicbrainz, don't assume that there will be release + events attached to a particular CD release. Bug fix for the addition + of year information support in 2.7.1. + * Support for output to the Matroska container (mka). Encoder + is FFmpeg (or avconv). Typical conf file syntax would be: + + MKAENCODERSYNTAX=ffmpeg + FFMPEG=ffmpeg + FFMPEGENCOPTS="-c:a ac3 -b:a 448k" + OUTPUTTYPE="mka" + * Add id3tag mp3 tagger as this is the tagger available to + OpenBSD users. + * Allow for cddb response 500. This closes Issue 26: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=26 + * Fix for 'expansion of $REDIR' bug on MacOSX. This closes Issue 22: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=22 + * Makefile adjusted to allow the sample abcde.conf file to be + installed by default to /etc rather than $(prefix)/etc. + https://bugs.archlinux.org/task/46671 + * Allow getalbumart to correctly place cover image when single + track is selected. This closes Issue 25: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=25 +- Update abcde-quote.patch +- Set BuildArch as noarch; the package doesn't contain any binary + +------------------------------------------------------------------- Old: ---- abcde-2.7.1.tar.gz New: ---- abcde-2.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abcde.spec ++++++ --- /var/tmp/diff_new_pack.g799XN/_old 2016-04-30 23:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.g799XN/_new 2016-04-30 23:31:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: abcde -Version: 2.7.1 +Version: 2.7.2 Release: 0 Summary: A Better CD Encoder License: GPL-2.0+ @@ -26,7 +26,6 @@ Source0: http://abcde.einval.com/download/%{name}-%{version}.tar.gz # bug 419800 Patch0: abcde-quote.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: cd-discid Requires: cdparanoia Requires: wget @@ -35,6 +34,7 @@ Recommends: vorbis-tools # lame is often used for mp3 encoding Suggests: lame +BuildArch: noarch %description A front-end program to cdparanoia, wget, cd-discid, id3, and your ++++++ abcde-2.7.1.tar.gz -> abcde-2.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/FAQ new/abcde-2.7.2/FAQ --- old/abcde-2.7.1/FAQ 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/FAQ 2016-04-06 10:47:56.000000000 +0200 @@ -451,7 +451,18 @@ OUTPUTTYPE="mp2" So currently FFmpeg supports: alac, wavpack and mp2. FFmpeg native aac support will - be added when it comes out of 'experimental'. + be added when it comes out of 'experimental'. FFmpeg is also used as the default + encoder for the Matroska or mka container. A typical example, using the FFmpeg + native ac3 encoder, is: + + MKAENCODERSYNTAX=ffmpeg + FFMPEG=ffmpeg + FFMPEGENCOPTS="-c:a ac3 -b:a 448k" + OUTPUTTYPE="mka" + + Other suitable codecs for this usage are Vorbis, MP2, MP3, LC-AAC, HE-AAC, WMAv1, + WMAv2, eAC3 and Opus. There is much more to come in the future for abcde and FFmpeg! + 5. USEPIPES ======== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/Makefile new/abcde-2.7.2/Makefile --- old/abcde-2.7.1/Makefile 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/Makefile 2016-04-06 10:47:56.000000000 +0200 @@ -1,10 +1,10 @@ -abcde_version = abcde-2.7.1 +abcde_version = abcde-2.7.2 INSTALL = /usr/bin/install -c prefix = /usr/local exec_prefix = $(prefix) bindir = $(exec_prefix)/bin -sysconfdir = $(prefix)/etc +sysconfdir = /etc datarootdir = $(prefix)/share docdir = $(datarootdir)/doc/$(abcde_version) mandir = $(datarootdir)/man diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/README new/abcde-2.7.2/README --- old/abcde-2.7.1/README 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/README 2016-04-06 10:47:56.000000000 +0200 @@ -22,6 +22,12 @@ MAJOR CHANGES ============= +Changes in 2.7.2 +* Support for output to the Matroska container (mka). +* Add id3tag mp3 tagger as this is the tagger available to + OpenBSD users. +* Several bug fixes. See the changelog for more details. + Changes in 2.7.1 * Rewrite and improvement of the abcde Makefile. * Support added for True Audio encoding. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde new/abcde-2.7.2/abcde --- old/abcde-2.7.1/abcde 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde 2016-04-06 10:47:56.000000000 +0200 @@ -11,7 +11,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -VERSION='2.7.1' +VERSION='2.7.2' usage () { @@ -47,7 +47,7 @@ echo "-n No lookup. Don't query CDDB, just create and use template" echo "-N Noninteractive. Never prompt for anything" echo "-o <type1[,type2]...>" -echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,wv,ape,mp2,tta). Defaults to vorbis" +echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,mka,wv,ape,mp2,tta). Defaults to vorbis" echo "-p Pad track numbers with 0's (if less than 10 tracks)" echo "-P Use UNIX pipes to read+encode without wav files" echo "-r <host1[,host2]...>" @@ -839,6 +839,16 @@ ${TPE2:+--TPE2 "$TPE2"} \ "$ABCDETEMPDIR/track$1.$OUTPUT" ;; + id3tag) + # FIXME # track numbers in mp3 come with 1/10, so we cannot + # happily substitute them with $TRACKNUM + run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \ + $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \ + -A "$DALBUM" -a "$TRACKARTIST" -s "$TRACKNAME" \ + -y "$CDYEAR" -g "$GENREID" \ + -t "${TRACKNUM:-$1}" ${TRACKNUM:+-T "$TRACKS"} \ + "$ABCDETEMPDIR/track$1.$OUTPUT" + ;; eyed3*) # FIXME # track numbers in mp3 come with 1/10, so we cannot # happily substitute them with $TRACKNUM @@ -926,6 +936,9 @@ opus) run_command tagtrack-$OUTPUT-$1 true ;; + mka) + run_command tagtrack-$OUTPUT-$1 true + ;; flac) ( echo ARTIST="$TRACKARTIST" @@ -1096,6 +1109,9 @@ opus) TEMPARG="PIPE_$OPUSENCODERSYNTAX" ;; + mka) + TEMPARG="PIPE_$MKAENCODERSYNTAX" + ;; flac) TEMPARG="PIPE_$FLACENCODERSYNTAX" ;; @@ -1133,6 +1149,9 @@ opus) OUTPUT=$OPUSOUTPUTCONTAINER ;; + mka) + OUTPUT=$MKAOUTPUTCONTAINER + ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; @@ -1208,6 +1227,19 @@ ;; esac ;; + mka) + case "$MKAENCODERSYNTAX" in + ffmpeg) + if [ "$DOTAG" = "y" ]; then + $RUN_COMMAND nice $EFFECTIVE_NICE $MKAENCODER -i "$IN" $MKAENCODEROPTS -metadata artist="$TRACKARTIST" \ + -metadata album="$DALBUM" -metadata title="$TRACKNAME" -metadata track=${TRACKNUM:-$1} -metadata date="$CDYEAR" \ + -metadata genre="$CDGENRE" -metadata comment="$COMMENT" "$OUT" + else + $RUN_COMMAND nice $EFFECTIVE_NICE $MKAENCODER -i "$IN" $MKAENCODEROPTS "$OUT" + fi + ;; + esac + ;; flac) case "$2" in %local*%) @@ -1575,6 +1607,9 @@ opus) OUTPUT=$OPUSOUTPUTCONTAINER ;; + mka) + OUTPUT=$MKAOUTPUTCONTAINER + ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; @@ -1659,6 +1694,9 @@ opus) OUTPUT=$OPUSOUTPUTCONTAINER ;; + mka) + OUTPUT=$MKAOUTPUTCONTAINER + ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; @@ -2261,13 +2299,13 @@ fi echo "---- $(grep DTITLE "${CDDBPARSEFILE}" | cut '-d=' -f2- | tr -d \\r\\n ) ----" if [ X"$SHOWCDDBYEAR" = "Xy" ]; then - PARSEDYEAR=$(grep DYEAR "${CDDBPARSEFILE}" | cut '-d=' -f2-) + PARSEDYEAR=$(grep -a DYEAR "${CDDBPARSEFILE}" | cut '-d=' -f2-) if [ ! X"$PARSEDYEAR" = "X" ]; then echo "Year: $PARSEDYEAR" fi fi if [ X"$SHOWCDDBGENRE" = "Xy" ]; then - PARSEDGENRE=$(grep DGENRE "${CDDBPARSEFILE}" | cut '-d=' -f2-) + PARSEDGENRE=$(grep -a DGENRE "${CDDBPARSEFILE}" | cut '-d=' -f2-) if [ ! X"$PARSEDGENRE" = "X" ]; then echo "Genre: $PARSEDGENRE" fi @@ -2275,7 +2313,7 @@ if [ ! "$ONETRACK" = "y" ]; then for TRACK in $(f_seq_row 1 $TRACKS) do - echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "${CDDBPARSEFILE}" | cut -f2- -d= | tr -d \\r\\n)" + echo $TRACK: "$(grep -a ^TTITLE$(expr $TRACK - 1)= "${CDDBPARSEFILE}" | cut -f2- -d= | tr -d \\r\\n)" done fi } @@ -2456,20 +2494,21 @@ echo "done." >> "$ABCDETEMPDIR/cddbchoices" echo cddb-read-1-complete >> "$ABCDETEMPDIR/status" echo cddb-choice=1 >> "$ABCDETEMPDIR/status" - ATITLE=$(grep -e '^Album title:' "${ABCDETEMPDIR}/cd-text" | cut -c14- ) + ATITLE=$(grep -ae '^Album title:' "${ABCDETEMPDIR}/cd-text" | cut -c14- ) echo "200 none ${ATITLE}" >> "$ABCDETEMPDIR/cddbquery" # List out disc title/author and contents echo ---- ${ATITLE} ---- >> "$ABCDETEMPDIR/cddbchoices" for TRACK in $(f_seq_row 1 $TRACKS) do TRACKM1=$(($TRACK - 1)) - TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")" + TITLE="$(grep -aE ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")" echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices" - sed "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" - mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" + sed "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" && \ + mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" done - sed "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" - mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" + sed "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" && \ + mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1" + rm -f "$ABCDETEMPDIR/cddbread.new" # In case a sed error occurred echo >> "$ABCDETEMPDIR/cddbchoices" echo "cdtext-readcomplete" >> "$ABCDETEMPDIR/status" } @@ -2669,12 +2708,14 @@ done echo >> "$ABCDETEMPDIR/cddbchoices" ;; - 202|403|409|503) - # No match + 202|403|409|500|503) + # TODO: Explain these error codes a little more accurately: + # http://ftp.freedb.org/pub/freedb/misc/freedb_CDDB_protcoldoc.zip + # No match response: case "$RESPONSECODE" in 202) echo "No CDDB match." >> "$ABCDETEMPDIR/cddbchoices" ;; 403|409) echo "CDDB entry is corrupt, or the handshake failed." >> "$ABCDETEMPDIR/cddbchoices" ;; - 503) echo "CDDB unavailable." >> "$ABCDETEMPDIR/cddbchoices" ;; + 500|503) echo "CDDB unavailable." >> "$ABCDETEMPDIR/cddbchoices" ;; esac $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.0" # List out disc title/author and contents of template @@ -3180,11 +3221,19 @@ for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do # put cover in the same place as the album + if [ "$ONETRACK" = "y" ] ; then + if [ "$VARIOUSARTISTS" = "y" ] ; then + ALBUMARTDIR="$(eval echo "$VAONETRACKOUTPUTFORMAT")" + else + ALBUMARTDIR="$(eval echo "$ONETRACKOUTPUTFORMAT")" + fi + else if [ "$VARIOUSARTISTS" = "y" ] ; then ALBUMARTDIR="$(eval echo "$VAOUTPUTFORMAT")" else ALBUMARTDIR="$(eval echo "$OUTPUTFORMAT")" fi + fi FINALALBUMARTDIR="$(dirname "$OUTPUTDIR/$ALBUMARTDIR")" vecho "copying cover to target directory $FINALALBUMARTDIR" >&2 mkdir -p "$FINALALBUMARTDIR" @@ -3231,7 +3280,6 @@ if [ "$USEPIPES" = "y" ]; then TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX" FILEARG="$( eval echo "\$$TEMPARG" )" - REDIR="" PIPE_MESSAGE="and encoding " else WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav" @@ -3244,7 +3292,6 @@ FILEARG="$WAVDATA" ;; esac - REDIR=">&2" fi if [ "$1" = "onetrack" ]; then echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2 @@ -3264,8 +3311,13 @@ STRIPTRACKNUM=$(expr $UTRACKNUM + 0) nice $READNICE $FLAC -d -f --cue=${READTRACKNUMS:-$STRIPTRACKNUM.1-$(($STRIPTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;; cdparanoia|libcdio) - nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; - cdda2wav | icedax) + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" + else + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" >&2 + fi + ;; + cdda2wav|icedax) if [ "$OSFLAVOUR" = "OSX" ] ; then # Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX diskutil unmount ${CDROM#/dev/} @@ -3280,17 +3332,25 @@ CDDA2WAVCDROM="$CDROMID" fi fi - nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; - dagrab) nice $READNICE $CDROMREADER -d "$CDROM" -f "$FILEARG" -v $UTRACKNUM >&2 ;; + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" + else + nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" >&2 + fi + ;; + dagrab) + # I cannot get USEPIPES to work with dagrab so just this: + nice $READNICE $CDROMREADER -d "$CDROM" -f "$FILEARG" -v $UTRACKNUM >&2 + ;; pird) if [ "$USEPIPES" = "y" ]; then nice $READNICE $CDROMREADER -j ${READTRACKNUMS:-$UTRACKNUM} "$CDROM" "$FILEARG" else # Write ripped audio data to stdout and redirect to $FILEARG. - # $REDIR can be ignored. Progress is written to stderr by default. + # Progress is written to stderr by default and thus >&2 is not required. nice $READNICE $CDROMREADER -j ${READTRACKNUMS:-$UTRACKNUM} "$CDROM" "$PIPERIPPER_pird" > "$FILEARG" fi - ;; + ;; cddafs) # Find the track's mounted path REALTRACKNUM=$(expr $UTRACKNUM + 0) @@ -3298,11 +3358,21 @@ FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM "); # If the file exists, copy it if [ -e "$FILEPATH" ] ; then - nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" $REDIR + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" + else + nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" >&2 + fi else false fi ;; - debug) nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" $REDIR ;; + debug) + if [ "$USEPIPES" = "y" ]; then + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" + else + nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" >&2 + fi + ;; esac RETURN=$? # If we get some error or we get some missing wav @@ -3448,6 +3518,7 @@ MP3ENCODERSYNTAX=default OGGENCODERSYNTAX=default OPUSENCODERSYNTAX=default +MKAENCODERSYNTAX=default FLACENCODERSYNTAX=default SPEEXENCODERSYNTAX=default MPCENCODERSYNTAX=default @@ -3538,6 +3609,7 @@ ID3V2=id3v2 MID3V2=mid3v2 EYED3=eyeD3 +ID3TAG=id3tag VORBISCOMMENT=vorbiscomment METAFLAC=metaflac NEROAACTAG=neroAacTag @@ -3621,6 +3693,7 @@ FFMPEGENCOPTS= ID3OPTS= +ID3TAGOPTS= EYED3OPTS="" ATOMICPARSLEYOPTS= CDPARANOIAOPTS= @@ -3683,7 +3756,7 @@ # We won't find the eject program in OSX, and doing checkexec will fail further below... unset EJECT elif [ X$(uname) = "XOpenBSD" ] ; then - HTTPGET=wget + HTTPGET=ftp MD5SUM=md5 OSFLAVOUR=OBSD elif [ X$(uname) = "XNetBSD" ] ; then @@ -4115,6 +4188,7 @@ case "$OUTPUT" in vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; opus:*) OPUSENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; + mka:*) MKAENCODEROPTSCLI="$( 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- )" ;; @@ -4154,6 +4228,10 @@ [ "$OPUSENCODERSYNTAX" = "default" ] && OPUSENCODERSYNTAX=opusenc OPUSOUTPUTCONTAINER=opus ;; + mka) + [ "$MKAENCODERSYNTAX" = "default" ] && MKAENCODERSYNTAX=ffmpeg + MKAOUTPUTCONTAINER=mka + ;; mp3) [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame [ "$DOTAG" = "y" ] && NEEDTAGGER=y @@ -4262,6 +4340,12 @@ OPUSENCODER="$OPUSENC" ;; esac +case "$MKAENCODERSYNTAX" in + ffmpeg) + MKAENCODEROPTS="${MKAENCODEROPTSCLI:-$FFMPEGENCOPTS}" + MKAENCODER="$FFMPEG" + ;; +esac case "$FLACENCODERSYNTAX" in flac) FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}" @@ -4407,6 +4491,11 @@ ID3SYNTAX=id3v2 TAGGEROPTS="$ID3V2OPTS" ;; + id3tag) + TAGGER="$ID3TAG" + ID3SYNTAX=id3tag + TAGGEROPTS="$ID3TAGOPTS" + ;; id3v2.4) TAGGER="$EYED3" # Note that eyeD3 is set to tag in utf-16 (below). This causes @@ -4555,6 +4644,8 @@ PIPEENCODERSVARCHECK="PIPE_$OGGENCODERSYNTAX" ;; opus) PIPEENCODERSVARCHECK="PIPE_$OPUSENCODERSYNTAX" ;; + mka) + PIPEENCODERSVARCHECK="PIPE_$MKAENCODERSYNTAX" ;; flac) PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYNTAX" ;; spx) @@ -4588,7 +4679,7 @@ # Make sure a buncha things exist for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \ - $OGGENCODER $OPUSENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \ + $OGGENCODER $OPUSENCODER $MKAENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \ $AACENCODER $WVENCODER $CDDBTOOL $APENCODER $MP2ENCODER $TTAENCODER \ ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \ ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde-musicbrainz-tool new/abcde-2.7.2/abcde-musicbrainz-tool --- old/abcde-2.7.1/abcde-musicbrainz-tool 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde-musicbrainz-tool 2016-04-06 10:47:56.000000000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# Copyright (c) 2012 Steve McIntyre <93sam@debian.org> +# Copyright (c) 2012-2016 Steve McIntyre <93sam@debian.org> # This code is hereby licensed for public consumption under either the # GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice. # @@ -96,7 +96,10 @@ $va = 1; } my @events = @{$release->release_event_list()->events()}; - my $rel_year = substr($events[0]->date(),0,4); + my $rel_year = ""; + if ($release->release_event_list()->count() > 0) { + $rel_year = substr($events[0]->date(),0,4); + } $releasenum++; open (OUT, "> $workdir/cddbread.$releasenum"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde.1 new/abcde-2.7.2/abcde.1 --- old/abcde-2.7.1/abcde.1 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde.1 2016-04-06 10:47:56.000000000 +0200 @@ -147,9 +147,9 @@ .TP .B \-o [filetype][:filetypeoptions] Select output type. Can be "vorbis" (or "ogg"), "mp3", "flac", "spx", "mpc", "m4a", -"wav", "wv", "ape" or "opus". Specify a comma-delimited list of output types to obtain -all specified types. See the OUTPUTTYPE configuration variable. One can pass -options to the encoder for a specific filetype on the command line separating +"wav", "wv", "ape", "opus" or "mka". Specify a comma-delimited list of output types +to obtain all specified types. See the OUTPUTTYPE configuration variable. One can +pass options to the encoder for a specific filetype on the command line separating them with a colon. The options must be escaped with double-quotes. .TP .B \-p @@ -227,7 +227,8 @@ subdirectory named after the artist under the current directory. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT variables in your \fIabcde.conf\fR. Each file is given an extension identifying its compression -format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', '.mpc', '.wav', 'wv', 'ape' or '.opus'. +format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', '.mpc', '.wav', '.wv', +\(aq.ape', '.opus' or '.mka'. .SH CONFIGURATION \fBabcde\fR sources two configuration files on startup - \fI/etc/abcde.conf\fR and \fI$HOME/.abcde.conf\fR, in that order. @@ -355,6 +356,12 @@ Specifies the style of encoder to use for the Opus encoder. At this point only \'opusenc\' is available for Opus encoding. .TP +.B MKAENCODERSYNTAX +Specifies the style of encoder to use for the Matroska or mka container. At this +point only \'ffmpeg\' is available to utilise the mka container. Safe audio codecs +for mka include Vorbis, MP2, MP3, LC-AAC, HE-AAC, WMAv1, WMAv2, AC3, eAC3 and Opus. +See the FAQ document for more information. +.TP .B NORMALIZERSYNTAX Specifies the style of normalizer to use. Valid options are \'default\' and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, @@ -440,16 +447,16 @@ (Ogg/Vorbis), "mp3" (MPEG-1 Audio Layer III), "flac" (Free Lossless Audio Codec), "mp2" (MPEG-1 Audio Layer III), "spx" (Ogg/Speex), "mpc" (MPP/MP+ (Musepack), "m4a" (AAC or ALAC),"wv" (WavPack"), "wav" (Microsoft Waveform), "opus" -(Opus Interactive Audio Codec) or "tta" (True Audio). Values like "vorbis,mp3" -encode the tracks in both Ogg/Vorbis and MP3 formats. For example: +(Opus Interactive Audio Codec), "tta" (True Audio) or "mka" (Matroska). Values like +"vorbis,mp3" encode the tracks in both Ogg/Vorbis and MP3 formats. For example: .br OUTPUTTYPE=vorbis,flac .br For each value in OUTPUTTYPE, \fBabcde\fR expands a different process for encoding, tagging and moving, so you can use the format placeholder, OUTPUT, to create different subdirectories to hold the different types. The variable OUTPUT will -be 'vorbis', 'mp3', 'flac', 'spx', 'mpc', 'm4a', mp2, 'wv', 'ape', 'tta' and/or 'wav', -depending on the OUTPUTTYPE you define. For example +be 'vorbis', 'mp3', 'flac', 'spx', 'mpc', 'm4a', mp2, 'wv', 'ape', 'tta', 'wav' +and/or 'mka' depending on the OUTPUTTYPE you define. For example .br OUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}/${ALBUMFILE}/${TRACKNUM}._${TRACKFILE}' .TP @@ -464,7 +471,7 @@ .TP .B VAOUTPUTFORMAT Just like OUTPUTFORMAT but for Various Artists discs. The default is -'Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' +\(aqVarious-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}' .TP .B ONETRACKOUTPUTFORMAT Just like OUTPUTFORMAT but for single-track rips (see option "\-1"). The default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/abcde.conf new/abcde-2.7.2/abcde.conf --- old/abcde-2.7.1/abcde.conf 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/abcde.conf 2016-04-06 10:47:56.000000000 +0200 @@ -1,4 +1,4 @@ -# System defaults for abcde version 2.7.1 +# System defaults for abcde version 2.7.2 # Nothing in this file is uncommented by default. # # If you wish to override these system-wide settings, create your own @@ -76,6 +76,7 @@ #OGGENCODERSYNTAX=default #FLACENCODERSYNTAX=default #SPEEXENCODERSYNTAX=default +#MKAENCODERSYNTAX=default #MPCENCODERSYNTAX=default #WVENCODERSYNTAX=default #APENCODERSYNTAX=default @@ -296,7 +297,8 @@ # 'twolame --help',a highly recommended setting is "--bitrate 320". #TWOLAMENCOPTS= -# FFmpeg or avconv can be used for several audio codecs: +# FFmpeg or avconv can be used for several audio codecs, as well as being +# the default encoder for the Matroska container mka:: # 1. Encoding to WavPack (FFmpeg only: avconv does not have a native encoder). # Consider setting the following with a compression_level between 0-8: # FFMPEGENCOPTS="-c:a wavpack -compression_level 6" @@ -376,7 +378,7 @@ # OUTPUTTYPE can be any of a number of formats, either a single format # (e.g. "ogg") or a combination of them separated with "," # (e.g. "flac,mp3"). Currently recognised and supported are: -# "flac", "m4a", "mp3, "mpc", "ogg", "opus", "spx", "vorbis", "wav", "wv", "ape" +# "flac", "m4a", "mp3, "mpc", "ogg", "opus", "mka", "spx", "vorbis", "wav", "wv", "ape" #OUTPUTTYPE=ogg # Output filename format - change this to reflect your inner desire to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/changelog new/abcde-2.7.2/changelog --- old/abcde-2.7.1/changelog 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/changelog 2016-04-06 10:47:56.000000000 +0200 @@ -1,3 +1,37 @@ +abcde 2.7.2 + + * When using musicbrainz, don't assume that there will be release + events attached to a particular CD release. Bug fix for the addition + of year information support in 2.7.1. Thanks to Ed Oehler and Alan W. + Kerr for debugging help. + * Support for output to the Matroska container (mka). Encoder + is FFmpeg (or avconv). Typical conf file syntax would be: + + MKAENCODERSYNTAX=ffmpeg + FFMPEG=ffmpeg + FFMPEGENCOPTS="-c:a ac3 -b:a 448k" + OUTPUTTYPE="mka" + + Thanks to Shantiq and Fakeoutdoorsman of the Ubuntu Forums + for the idea. + * Add id3tag mp3 tagger as this is the tagger available to + OpenBSD users. Thanks to Christopher Zimmermann for the + notification and patch. + * Allow for cddb response 500. Thanks again to Von Welch for the + bug report and patch. This closes Issue 26: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=26 + * Fix for 'expansion of $REDIR' bug on MacOSX. Thanks to Von Welch + for the bug report. This closes Issue 22: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=22 + * Makefile adjusted to allow the sample abcde.conf file to be + installed by default to /etc rather than $(prefix)/etc. + Thanks to Volker Schmidt from archlinux for the bug report: + https://bugs.archlinux.org/task/46671 + * Allow getalbumart to correctly place cover image when single + track is selected. Thanks to Nino Burini for the bug report + and also the fix. This closes Issue 25: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=25 + abcde 2.7.1 * Rebuild of the abcde Makefile. Thanks to Reuben Thomas and Steve @@ -32,6 +66,8 @@ Marco Hoppstaedter for the patch. Closes issue 10: http://abcde.einval.com/bugzilla/show_bug.cgi?id=10 + -- Andrew Strong <andrew.david.strong@gmail.com> Sun, 4 Oct 2015 09:31:07 +0000 + abcde 2.7 * Rewrite of abcde's mungefilename function. Thanks to @@ -130,6 +166,8 @@ * Major AAC encoding cleanup, including addition of the fdkaac encoder. Thanks to Doug Mcmahon for assistance with this. + -- Andrew Strong <andrew.david.strong@gmail.com> Thu, 18 Jun 2015 12:27:52 +0000 + abcde 2.6 * Fix finding $CDROM on OS X. Thanks to niederstrasser for the patch. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/changelog new/abcde-2.7.2/debian/changelog --- old/abcde-2.7.1/debian/changelog 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/changelog 2016-04-06 10:47:56.000000000 +0200 @@ -1,4 +1,42 @@ -abcde (2.7-1) UNRELEASED; urgency=medium +abcde (2.7.1-1) unstable; urgency=medium + + * New upstream version, with lots of improvements and bugfixes: + + Rebuild of the abcde Makefile. Thanks to Reuben Thomas and Steve + McIntyre as well as ReaperX7, bobzilla, 55020, GazL and dugan from + the Slackware Forums. This closes Issue 4: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=4 + + Fix incorrect use of 'break'. Thanks to Reuben Thomas for the + bug report and fix which closes Issue 6: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=6 + + Make older versions of id3 happy when 'Genre' field is empty. + Thanks to Martin Husemann for the fix which closes Issue 8: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=8 + + Add YEAR and GENRE variables to do_getalbumart(). Thanks to + Johannes Gernemann for this patch which closes issue 9: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=9 + + Support added for encoding to True Audio using tta while still + supporting the older ttaenc. Tagging is with mid3v2. + + Support added for encoding to MPEG-1 Audio Layer II (mp2) + with either twolame or FFmpeg / avconv. Tagging with mid3v2. + + Encoding to WavPack with FFmpeg. Some slight changes to WavPack + syntax with backward compatibility built in for abcde 2.7. + + Encoding to m4a container with FFmpeg or avconv. This allows + for alac encoding with FFmpeg's reverse engineered alac encoder. + + AAC encoding with fhgaacenc via Wine. Tagging is provided + by AtomicParsley which has been added back to abcde :). This + allows encoding with HE-AAC v2, unavailable with qaac. + + Support added for AAC encoding with qaac via Wine. This + also allows for Apple Lossless Audio Coding (alac) using + either qaac or refalac. This closes Issue 142, thanks to + Bernd Fischer-Krellenberg for the enhancement request. + + Grab year information too when using musicbrainz. Thanks to + Marco Hoppstaedter for the patch. Closes issue 10: + http://abcde.einval.com/bugzilla/show_bug.cgi?id=10 + * Update debian/watch to match tne new upstream home. + + -- Steve McIntyre <93sam@debian.org> Mon, 02 Nov 2015 18:29:19 +0000 + +abcde (2.7-1) unstable; urgency=medium * Remove Jesus and Colin from Maintainer and Uploaders fields, as they've moved on. Thanks to both for their efforts! @@ -103,7 +141,7 @@ + Major AAC encoding cleanup, including addition of the fdkaac encoder. Thanks to Doug Mcmahon for assistance with this. - -- Steve McIntyre <93sam@debian.org> Tue, 16 Jun 2015 21:20:11 +0100 + -- Steve McIntyre <93sam@debian.org> Fri, 19 Jun 2015 13:18:14 +0200 abcde (2.6-2) unstable; urgency=medium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/control new/abcde-2.7.2/debian/control --- old/abcde-2.7.1/debian/control 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/control 2016-04-06 10:47:56.000000000 +0200 @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Steve McIntyre <93sam@debian.org> -Homepage: http://code.google.com/p/abcde/ +Homepage: http://abcde.einval.com/ Standards-Version: 3.9.6 Build-Depends: debhelper (>= 8) Vcs-Browser: http://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/rules new/abcde-2.7.2/debian/rules --- old/abcde-2.7.1/debian/rules 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/rules 2016-04-06 10:47:56.000000000 +0200 @@ -12,7 +12,6 @@ build-stamp: dh_testdir - # Add here commands to compile the package. $(MAKE) @@ -36,7 +35,8 @@ dh_installdirs # Add here commands to install the package into debian/abcde. - $(MAKE) install DESTDIR=`pwd`/debian/abcde + $(MAKE) install DESTDIR=`pwd`/debian/abcde prefix=/usr sysconfdir=/etc docdir=/usr/share/doc/abcde + rm -f `pwd`/debian/abcde/usr/share/doc/abcde/COPYING* install -d `pwd`/debian/abcde/usr/share/doc/abcde/examples install -m 644 examples/* `pwd`/debian/abcde/usr/share/doc/abcde/examples diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/abcde-2.7.1/debian/watch new/abcde-2.7.2/debian/watch --- old/abcde-2.7.1/debian/watch 2015-10-04 11:30:28.000000000 +0200 +++ new/abcde-2.7.2/debian/watch 2016-04-06 10:47:56.000000000 +0200 @@ -1,5 +1,2 @@ version=3 -opts=\ -downloadurlmangle=s|.*[?]name=(.*?)&.*|http://abcde.googlecode.com/files/$1|,\ -filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1| \ -http://code.google.com/p/abcde/downloads/detail[?]name=abcde-([0-9.]+).tar.gz&.* +http://abcde.einval.com/download/abcde-([0-9.]+).tar.gz ++++++ abcde-quote.patch ++++++ --- /var/tmp/diff_new_pack.g799XN/_old 2016-04-30 23:31:03.000000000 +0200 +++ /var/tmp/diff_new_pack.g799XN/_new 2016-04-30 23:31:03.000000000 +0200 @@ -66,15 +66,15 @@ "") ERASEPLAYLIST=e ; DONE=y ;; *) ;; esac -@@ -3230,7 +3230,7 @@ +@@ -3279,7 +3279,7 @@ CDDBTRACKNUM=$(expr $UTRACKNUM - 1) if [ "$USEPIPES" = "y" ]; then TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX" - FILEARG="$( eval echo "\$$TEMPARG" )" + FILEARG="$( eval echo \""\$$TEMPARG"\" )" - REDIR="" PIPE_MESSAGE="and encoding " else + WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav" @@ -4571,15 +4571,15 @@ PIPEENCODERSVARCHECK="PIPE_$AACENCODERSYNTAX" ;; esac