head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.54 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.52 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.50 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.48 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.46 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.36 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.34 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.32 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.30 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.28 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.26 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.24 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.22 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.20 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.18 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.16 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.14 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.12 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.10 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.8 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.6 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2003.06.10.06.29.07; author wiz; state dead; branches; next 1.7; 1.7 date 2003.01.01.19.06.02; author kim; state Exp; branches; next 1.6; 1.6 date 2002.12.16.05.14.30; author lukem; state Exp; branches; next 1.5; 1.5 date 2002.11.29.02.58.47; author kim; state Exp; branches; next 1.4; 1.4 date 2002.11.29.02.37.22; author kim; state Exp; branches; next 1.3; 1.3 date 2002.09.20.00.33.12; author hubertf; state Exp; branches; next 1.2; 1.2 date 2001.10.03.21.58.28; author abs; state Exp; branches; next 1.1; 1.1 date 2001.08.16.06.02.45; author lukem; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.08.16.06.02.45; author lukem; state Exp; branches; next ; desc @@ 1.8 log @Update to 2.1.4, from Juan RP in PR 21671: abcde 2.1.4: * Small bug fixes: + COMMENT should work now. + Aesthetic padding on the total amount of tracks. + CDROM typo + CDROM is now checked after reading the user defined entries. * Remove trailing args from $EDITOR when checking -x: Closes #179222. abcde 2.1.3 * Makefile was missing cddb-tool.1. * Introduced dagrab as CD ripping utility. * cddb-tool seq calls converted to functions. No more distro dependencies. * WGET* variables converted to HTTPGET* variables. FreeBSD can safelly use fetch. * More FreeBSD specific bits: CDROM and EJECT changes. * Typo in abcde.conf * Added CDDBPROTO for specifying the protocol level of the cddb query. * CDDB protocol upgraded to 5. CDYEAR and CDGENRE are now used for CD tagging. * COMMENT is now used for inline tagging with oggenc (my mistake it was missing): Closes: #191475. abcde 2.1.2 * Documentation updates: Closes: #186230. * Usual set of bug fixes and corrections. * Default behaviour of VAOUTPUTFORMAT output changed to avoid multiple directories for a same album. I think the format is more logical, and you can always split the files once they are created. * Padding track wavs with 0 so if you want to burn those wavs just cdrecord *.wav will do it. Use "-p" to force it when encoding a small (<9) number of files (Closes: #111627). * Added "KEEPWAVS" as a variable to keep those wavs. Default is "no". Can use also "-k" in the command line. (Closes: #160372). This probably should be changed with an option to move the wav files to another directory instead of just keep de abcde. directory. * Added documentation comments about OUTPUTTYPE (Closes: #184963). * abcde.conf cleanup: (Closes: #186230, #187400). abcde 2.1.0-3 * Since abcde does not depend on eject, an execution test ([-x]) was added, but that means abcde needs a test for eject in the patch if -x is passed: Closes: #184151. * Merged some more bits from Marc 'HE' Brockschmidt: Closes: #126289. * A bit of more info in abcde.conf: Closes: #184963. * cddb-tool version updated to 0.4.2 abcde 2.1.0-2 * Old version string left behind. Updated. * Few more doc update bits. * Patches from Marc 'HE' Brockschmidt: Closes: #149499. * Small patch from Norbert Preining to support multiple output in the output directory. * cddb-tool parses CDYEAR with the help of awk: Closes: #114848. * cddb-tool does not globe "*" characters anymore: Closes: #157448. abcde 2.1.0 * The infamous "Works for me(TM)" and "Time to release" release. + We preppend track number now: Closes: #128966. + Itegrate flac: Closes: #126311. + Multi-format encode: Closes: #148934. + Gapless lame encoding: Closes: #172696. + CDROM documented: Closes: #182403. * Applied OpenBSD patches to make the script more portable. Thanks to Han Boetes. * Documentation fixes: closes: #100844, #136741. * NetBSD patches applied: - EXPERIMENTAL Normalize and Batch support. - EXPERIMENTAL FLAC support. * EXPERIMENTAL multiple output support: + multiple output and error checking + multiple lists support * Default output file changed to have the $track_number in the begining. * abcde takeover. @ text @$NetBSD: patch-aa,v 1.7 2003/01/01 19:06:02 kim Exp $ --- abcde.1.orig Mon Aug 20 21:22:33 2001 +++ abcde.1 Wed Jan 1 14:00:54 2003 @@@@ -1,6 +1,6 @@@@ .TH ABCDE 1 .SH NAME -abcde \- Grab an entire CD and compress it to Ogg or MP3 format. +abcde \- Grab an entire CD and compress it to Ogg, MP3 or FLAC format. .SH SYNOPSIS .B abcde .I [options] [tracks] @@@@ -19,7 +19,7 @@@@ Grab a track from your CD .TP .B * -Compress it to Ogg or MP3 format +Compress it to Ogg, MP3 or FLAC format .TP .B * Comment or ID3 tag it @@@@ -36,13 +36,17 @@@@ .TP .B \-a [actions] Comma-delimited list of actions to perform. Can be one or more of: -cddb, read, encode, tag, move, playlist, clean. Encode implies read. Tag implies -cddb, read, encode. Move implies cddb, read, encode, tag. Playlist implies -cddb. The default is to do all actions except playlist. +cddb, read, normalize, encode, tag, move, playlist, clean. Normalize +and encode imply read. Tag implies cddb, read, encode. Move implies +cddb, read, encode, tag. Playlist implies cddb. The default is to +do all actions except normalize and playlist. +.TP +.B \-b +Enable batch mode normalization. See the BATCH configuration variable. .TP .B \-c [filename] Specifies an additional configuration file to parse. Configuration options -in this file override those in /etc/abcde.conf or $HOME/.abcde.conf. +in this file override those in @@PKG_SYSCONFDIR@@/abcde.conf or $HOME/.abcde.conf. .TP .B \-C [discid] Allows you to resume a session for @@@@ -66,7 +70,7 @@@@ Use the low-diskspace algorithm. See the LOWDISK configuration variable. .TP .B \-o [filetype] -Select output type. Can be either "ogg" or "mp3". See the OUTPUTTYPE +Select output type. Can be "ogg", "mp3" or "flac". See the OUTPUTTYPE configuration variable. .TP .B \-r [hosts...] @@@@ -87,11 +91,12 @@@@ .SH OUTPUT Each track is, by default, placed in a separate file named after the track in a subdirectory named after the artist under the current directory. Each -file is given an extension identifying its compression format, '.ogg' -or '.mp3'. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT +file is given an extension identifying its compression format, '.ogg', +'.mp3', or '.flac'. +This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT variables in your abcde.conf. .SH CONFIGURATION -abcde sources two configuration files on startup - /etc/abcde.conf and +abcde sources two configuration files on startup - @@PKG_SYSCONFDIR@@/abcde.conf and $HOME/.abcde.conf, in that order. Here is a list of options abcde recognizes: .TP .B CDDBURL @@@@ -100,10 +105,15 @@@@ .B ENCODERSYNTAX Specifies the style of encoder to use. Valid options are \'oggenc\' (default for Ogg Vorbis), \'vorbize\', \'lame\' (default for MP3), \'gogo\', \'bladeenc\', -\'l3enc\', and \'mp3enc\'. This affects the default location of the binary, +\'l3enc\', \'mp3enc\' and \'flac\' (default for FLAC). +This affects the default location of the binary, the variable to pick encoder command-line options from, and where the options are given. .TP +.B NORMALIZERSYNTAX +Specifies the style of normalizer to use. Valid options are \'default\' +and \'normalize'\ (and both run \'normalize\'). +.TP .B HELLOINFO Specifies the Hello information to send to the CDDB server. The CDDB protocol requires you to send a valid username and hostname each time you @@@@ -118,7 +128,8 @@@@ over 100MB for a machine that can encode music as fast as it can read it). .TP .B OUTPUTFORMAT -Specifies the format for completed Ogg or MP3 filenames. Variables are included +Specifies the format for completed Ogg, MP3 or FLAC filenames. +Variables are included using standard shell syntax. Allowed variables are ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM. Default is \'${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}\'. @@@@ -127,8 +138,8 @@@@ .TP .B OUTPUTTYPE Specifies the encoding format to output as well as the default extension and -encoder. Defaults to "ogg". Valid settings are "ogg" (Ogg Vorbis) and "mp3" -(MPEG-1 Audio Layer 3). +encoder. Defaults to "ogg". Valid settings are "ogg" (Ogg Vorbis), "mp3" +(MPEG-1 Audio Layer 3) and "flac" (FLAC). .TP .B VAOUTPUTFORMAT Just like OUTPUTFORMAT but for Various Artists discs. Default is whatever @@@@ -137,15 +148,15 @@@@ .B PATHNAMES The following configuration file options specify the pathnames of their respective utilities: LAME, GOGO, BLADEENC, L3ENC, XINGMP3ENC, MP3ENC, -VORBIZE, OGGENC, ID3, ID3V2, CDPARANOIA, CDDA2WAV, WGET, CDDISCID, -CDDBTOOL, EJECT, DISTMP3, and VORBISCOMMENT. +VORBIZE, OGGENC, FLAC, ID3, ID3V2, CDPARANOIA, CDDA2WAV, WGET, CDDISCID, +CDDBTOOL, EJECT, NORMALIZE, DISTMP3, and VORBISCOMMENT. .TP .B COMMAND-LINE OPTIONS If you wish to specify command-line options to any of the programs abcde uses, set the following configuration file options: LAMEOPTS, GOGOOPTS, BLADEENCOPTS, L3ENCOPTS, XINGMP3ENCOPTS, MP3ENCOPTS, VORBIZEOPTS, -OGGENCOPTS, ID3OPTS, ID3V2OPTS, CDPARANOIAOPTS, CDDA2WAVOPTS, WGETOPTS, -CDDBTOOLOPTS, EJECTOPTS, and DISTMP3OPTS. +OGGENCOPTS, FLACOPTS, ID3OPTS, ID3V2OPTS, CDPARANOIAOPTS, CDDA2WAVOPTS, WGETOPTS, +CDDBTOOLOPTS, EJECTOPTS, NORMALIZEOPTS, and DISTMP3OPTS. .TP .B MAXPROCS Defines how many encoders to run at once. This makes for huge speedups @@@@ -159,6 +170,11 @@@@ entire CD. Use only if your system is low on space and cannot encode as quickly as it can read. .TP +.B BATCH +If set to y, enables batch mode normalization, which preserves relative +volume differences between tracks of an album. Also enables nogap encoding +when using the \'lame\' encoder. +.TP .B PLAYLISTFORMAT Specifies the format for completed playlist filenames. Works like the OUTPUTFORMAT configuration variable. Default is @@@@ -197,7 +213,7 @@@@ abcde requires the following backend tools to work: .TP .B * -An Ogg or MP3 Encoder (oggenc, vorbize, lame, gogo, bladeenc, l3enc, mp3enc) +An Ogg, MP3 or FLAC Encoder (oggenc, vorbize, lame, gogo, bladeenc, l3enc, mp3enc, flac) .TP .B * An audio CD reading utility (cdparanoia, cdda2wav) @@@@ -213,11 +229,16 @@@@ .TP .B * (optional) distmp3, a client/server for distributed mp3 encoding. +.TP +.B * +(optional) normalize, a WAV file volume normalizer .SH "SEE ALSO" .BR cdparanoia (1), .BR cdda2wav (1), +.BR normalize (1), .BR oggenc (1), .BR vorbize (1), +.BR flac (1), .BR id3 (1), .BR wget (1), .BR cd-discid (1), @ 1.7 log @Add support for per-track and per-album (batch) normalizing. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Add support for encoding to FLAC. Initially based on http://www.bagu.dhs.org/abcde-2.0.3-flac-patch but with some serious improvements by me (including documentation updates, and in-line addition of vorbis comments with flac -T ...). Bump PKGREVISION. @ text @d3 2 a4 2 --- abcde.1.orig Tue Aug 21 11:22:33 2001 +++ abcde.1 d13 1 a13 1 @@@@ -19,7 +19,7 @@@@ Do a CDDB query over the Internet to loo d22 14 a35 1 @@@@ -42,7 +42,7 @@@@ cddb. The default is to do all actions e d44 1 a44 1 @@@@ -66,7 +66,7 @@@@ the MAXPROCS configuration variable. d53 1 a53 1 @@@@ -87,11 +87,12 @@@@ will process the entire CD. Accepts rang d69 1 a69 1 @@@@ -100,7 +101,8 @@@@ Specifies a server to use for CDDB looku d79 8 a86 1 @@@@ -118,7 +120,8 @@@@ to 700MB of temporary space for each ses d96 1 a96 1 @@@@ -127,8 +130,8 @@@@ automatically zero-padded. d107 1 a107 1 @@@@ -137,14 +140,14 @@@@ OUTPUTFORMAT is set to. d112 1 d114 1 a114 1 CDDBTOOL, EJECT, DISTMP3, and VORBISCOMMENT. d121 1 d123 1 a123 1 CDDBTOOLOPTS, EJECTOPTS, and DISTMP3OPTS. d126 14 a139 1 @@@@ -197,7 +200,7 @@@@ after all tracks have been read. d148 9 a156 1 @@@@ -218,6 +221,7 @@@@ wget, an HTTP retrieval program. d158 1 @ 1.5 log @Should have used PKG_SYSCONFDIR instead of PKG_SYSCONFBASE. @ text @d3 20 a22 3 --- abcde.1.orig Mon Aug 20 21:22:33 2001 +++ abcde.1 Thu Nov 28 21:55:24 2002 @@@@ -42,7 +42,7 @@@@ d31 18 a48 2 @@@@ -91,7 +91,7 @@@@ or '.mp3'. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT d56 65 @ 1.4 log @Preserve pkgsrc and distribution defaults better: - use ${PKG_SYSCONFBASE} instead of hardcoded /usr/pkg/etc - keep the ID3v2 default as distributed, and depend on audio/id3v2 - don't depend on vorbis-tools: just inform the user about the need to install at least one of the supported encoders - sample config only has commented out entries, so install it only in the examples directory @ text @d4 1 a4 1 +++ abcde.1 Thu Nov 28 20:57:01 2002 d10 1 a10 1 +in this file override those in @@PKG_SYSCONFBASE@@/abcde.conf or $HOME/.abcde.conf. d19 1 a19 1 +abcde sources two configuration files on startup - @@PKG_SYSCONFBASE@@/abcde.conf and @ 1.3 log @Update abcde to 2.0.3. Changes: abcde 2.0.3 * The Fixed-Yet?-How-About-Now?-What-About-Now?-Now? Release * SMP fixed, mad props to Steve Madsen, closes: #69828, #111806 * Minor code cleanups thanks to Adam Heath * Multiple inexact match results are generated in a safe manner thanks to Nick Martin, closes: #126025 * Removed cddb-tool template generation bashism, thanks to Greg Norris, closes: #126327 * Windows can't handle double quotes in filenames either. The default mungefilename now removes them, closes: #127643 * Using -C with WAVOUTPUTDIR fixed, closes: #127728 * Resuming various artists discs fixed, closes: #127731 -- Robert Woodcock Sun, 27 Jan 2002 abcde 2.0.2 * The One-More-Time-With-Feeling Release * Bladeenc really works this time. Honest. closes: #121988 -- Robert Woodcock Mon, 3 Dec 2001 abcde 2.0.1 * The I-Don't-Listen-To-Sssca Release * Example abcde.conf fixes, closes: #111580 * So much for bladeenc's l3enc compatibility, closes: #110863 * CDDB submit fixes (to enable CDDB submitting, put UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE=y in your abcde.conf), closes: #111478, #111500 * Minor mungefilename() cleanup * Small manpage fix * Works with oggenc when POSIXLY_CORRECT is defined, thanks to Juhapekka Tolvanen * Quote remote locations when calling distmp3 * Allow remote encoding of oggs * Only remove wav files if the encoding succeeded * No-local-encoding via -j 0 fixed, thanks to Hans-Joachim Baader * CD read errors are trapped/resumed cleanly now thanks to Pete, closes: #111618 * devfs device check fix, thanks to Clint Adams * Check for seq command - some BSD's have jot instead and abcde can't use that yet * Various Artists playlist generation fixed, thanks to William Lash -- Robert Woodcock Tue, 6 Nov 2001 @ text @d3 2 a4 2 --- abcde.1.orig Tue Aug 21 03:22:33 2001 +++ abcde.1 d10 1 a10 1 +in this file override those in /usr/pkg/etc/abcde.conf or $HOME/.abcde.conf. d19 1 a19 1 +abcde sources two configuration files on startup - /usr/pkg/etc/abcde.conf and @ 1.2 log @The first raw cd device is _not_ rcd0d. Use sysctl kern.rawpartition. @ text @d3 1 a3 1 --- abcde.1.orig Wed Aug 15 23:12:25 2001 d15 1 a15 1 '.mp3'. This can be modified using the OUTPUTFORMAT and VAOUTPUTFORMAT @ 1.1 log @Initial revision @ text @d3 20 a22 27 --- cddb-tool.orig Thu Aug 16 07:48:11 2001 +++ cddb-tool Thu Aug 16 15:45:59 2001 @@@@ -121,7 +121,7 @@@@ echo '#' echo '# Track frame offsets:' NUMTRACKS=$2 - for x in $(seq 3 $(expr $NUMTRACKS + 2)) + for x in $(jot $NUMTRACKS 3) do echo -e "#\t$(echo "$DISCID" | cut -f$x -d' ')" done @@@@ -137,13 +137,13 @@@@ echo DISCID="$DISCNUM" echo "DTITLE=Unknown Artist / Unknown Album" # TTITLE0 -- TTITLEn - for x in $(seq 1 $NUMTRACKS) + for x in $(jot $NUMTRACKS) do echo "TTITLE$(expr $x - 1)=Track $x" done echo "EXTD=" # EXTT0 -- EXTTn - for x in $(seq 1 $NUMTRACKS) + for x in $(jot $NUMTRACKS) do echo "EXTT$(expr $x - 1)=" done @ 1.1.1.1 log @abcde - Command-line utility to rip and encode an audio CD @ text @@