debian/0000755000000000000000000000000012143732561007172 5ustar debian/source/0000755000000000000000000000000012143544163010471 5ustar debian/source/format0000644000000000000000000000001412143544163011677 0ustar 3.0 (quilt) debian/control0000644000000000000000000000217712143713065010602 0ustar Source: cdrdao Section: otherosfs Priority: optional Maintainer: Debian QA Group Build-Depends: antlr, debhelper (>= 9), dh-autoreconf, libao-dev, libcam-dev [kfreebsd-any], libgconf2-dev, libvorbis-dev Standards-Version: 3.9.4 Homepage: http://cdrdao.sourceforge.net/ Package: cdrdao Architecture: kfreebsd-any linux-any Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: libperl4-corelibs-perl | perl (<< 5.12.3-7) Description: records CDs in Disk-At-Once (DAO) mode cdrdao records audio or data CD-Rs in disk-at-once (DAO) mode based on a textual description of the CD contents. . Recording in disk-at-once mode writes the complete disc, i.e. lead-in, one or more tracks and lead-out, in a single step. The commonly used track-at-once (TAO) mode writes each track independently which requires link blocks between two tracks. You probably want to use this if you're copying a CD with multiple tracks, like most audio CDs. . cdrdao can also handle the bin/cue format commonly used for VCDs or disks with subchannel data. . If you just want to burn a normal data CD, you probably want wodim instead. debian/compat0000644000000000000000000000000212143544163010367 0ustar 9 debian/cdrdao.docs0000644000000000000000000000003612143544163011276 0ustar CREDITS README README.PlexDAE debian/cdrdao.lintian-overrides0000644000000000000000000000040612143553620014003 0ustar # These examples are not required by cdrdao to function properly. Hence it is # sufficient to lower the dependency on libperl4-corelibs-perl to Recommends. cdrdao: script-uses-perl4-libs-without-dep usr/share/doc/cdrdao/examples/wav2dao/wav2dao.pl:25 getopts.pl debian/cdrdao.install0000644000000000000000000000024712143713065012017 0ustar /usr/bin/cdrdao /usr/bin/toc2cddb /usr/bin/toc2cue /usr/share/cdrdao/drivers /usr/share/man/man1/cdrdao.1 /usr/share/man/man1/toc2cddb.1 /usr/share/man/man1/toc2cue.1 debian/rules0000755000000000000000000000153412143710735010254 0ustar #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --parallel --with autoreconf override_dh_auto_configure: dh_auto_configure -- \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=\$${prefix}/share/man \ --with-ogg-support \ --without-lame \ --without-scglib \ --without-xdao override_dh_auto_install: dh_auto_install --destdir=$(CURDIR)/debian/tmp override_dh_install: rm -f $(CURDIR)/debian/tmp/usr/bin/cue2toc rm -f $(CURDIR)/debian/tmp/usr/share/man/man1/cue2toc.1 dh_install override_dh_compress: dh_compress -Xusr/share/doc/cdrdao/examples override_dh_clean: rm -f scsilib/conf/config.guess scsilib/conf/config.sub rm -rf scsilib/incs rm -rf scsilib/inc/OBJ rm -rf scsilib/librscg/OBJ rm -rf scsilib/libscg/OBJ rm -rf scsilib/libschily/OBJ dh_clean debian/patches/0000755000000000000000000000000012143712750010617 5ustar debian/patches/15-kfreebsd-gnu.patch0000644000000000000000000000307612143544163014446 0ustar From: Christoph Egger Description: 15-kfreebsd-gnu Prevent a FTBFS on kfreebsd. --- a/configure +++ b/configure @@ -10072,7 +10072,7 @@ scsilib_objs="ScsiIf-lib.o" case "$host" in - *-freebsd*) + *-freebsd* | *-kfreebsd*-gnu) scsilib_libs="$scsilib_libs -lcam" ;; esac @@ -10090,7 +10090,7 @@ scsilib_objs="ScsiIf-linux.o sg_err.o" ;; - *-freebsd*) + *-freebsd* | *-kfreebsd*-gnu) scsilib_libs="-lcam" scsilib_objs="ScsiIf-freebsd-cam.o" ;; @@ -10148,7 +10148,7 @@ esac case "$host" in - *-linux* | *-freebsd* | *-solaris*) + *-linux* | *-freebsd* | *-kfreebsd*-gnu | *-solaris*) sound_if_obj=SoundIF-ao.o ;; --- a/configure.ac +++ b/configure.ac @@ -239,7 +239,7 @@ scsilib_objs="ScsiIf-lib.o" case "$host" in - *-freebsd*) + *-freebsd* | *-kfreebsd*-gnu) scsilib_libs="$scsilib_libs -lcam" ;; esac @@ -257,7 +257,7 @@ scsilib_objs="ScsiIf-linux.o sg_err.o" ;; - *-freebsd*) + *-freebsd* | *-kfreebsd*-gnu) scsilib_libs="-lcam" scsilib_objs="ScsiIf-freebsd-cam.o" ;; @@ -313,7 +313,7 @@ dnl Sound device selection for xcdrdao case "$host" in - *-linux* | *-freebsd* | *-solaris*) + *-linux* | *-freebsd* | *-kfreebsd*-gnu | *-solaris*) sound_if_obj=SoundIF-ao.o ;; --- a/dao/ScsiIf-freebsd-cam.cc +++ b/dao/ScsiIf-freebsd-cam.cc @@ -32,6 +32,7 @@ #include "ScsiIf.h" #include "log.h" +#include "util.h" #define DEF_RETRY_COUNT 1 debian/patches/02-conffile.patch0000644000000000000000000000134612143544163013651 0ustar Author: Andrew Suffield Description: Add /etc/default/cdrdao to the set of config files read. Index: cdrdao-1.2.3/dao/main.cc =================================================================== --- cdrdao-1.2.3.orig/dao/main.cc 2009-05-04 17:49:52.000000000 +0200 +++ cdrdao-1.2.3/dao/main.cc 2010-07-04 14:11:32.000000000 +0200 @@ -2338,6 +2338,10 @@ int main(int argc, char **argv) if (settings->read(settingsPath) == 0) log_message(3, "Read settings from \"%s\".", settingsPath); + settingsPath = "/etc/default/cdrdao"; + if (settings->read(settingsPath) == 0) + log_message(3, "Read settings from \"%s\".", settingsPath); + settingsPath = NULL; if ((homeDir = getenv("HOME")) != NULL) { debian/patches/17-cd-text-hldtst.patch0000644000000000000000000000205412143544163014737 0ustar ## cd-text-hldtst.dpatch by Kees Cook ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Add CD-TEXT support to "HL-DT-ST" "DVDRAM GSA-H42L" burner. --- a/dao/CdrDriver.cc +++ b/dao/CdrDriver.cc @@ -177,6 +177,7 @@ { "generic-mmc", "GENERIC", "CRD-BP1600P", 0, NULL }, { "generic-mmc", "GENERIC", "CRD-R800S", 0, NULL }, { "generic-mmc", "GENERIC", "CRD-RW2", 0, NULL }, +{ "generic-mmc", "HL-DT-ST", "DVDRAM GSA-H42L", OPT_MMC_CD_TEXT, NULL }, { "generic-mmc", "HL-DT-ST", "RW/DVD GCC-4120B", OPT_MMC_CD_TEXT, NULL }, { "generic-mmc", "HP", "9510i", OPT_MMC_CD_TEXT, NULL }, { "generic-mmc", "HP", "CD-Writer+ 7570", OPT_MMC_CD_TEXT, NULL }, --- a/dao/cdrdao.drivers +++ b/dao/cdrdao.drivers @@ -104,6 +104,7 @@ W|GENERIC|CRD-BP1600P|generic-mmc W|GENERIC|CRD-R800S|generic-mmc W|GENERIC|CRD-RW2|generic-mmc +W|HL-DT-ST|DVDRAM GSA-H42L|generic-mmc|OPT_MMC_CD_TEXT W|HL-DT-ST|RW/DVD GCC-4120B|generic-mmc|OPT_MMC_CD_TEXT W|HP|9510i|generic-mmc|OPT_MMC_CD_TEXT W|HP|CD-Writer+ 7570|generic-mmc|OPT_MMC_CD_TEXT debian/patches/20-fix-spelling-and-hyphen-used-as-minus.patch0000644000000000000000000000423612143544163021207 0ustar From: Markus Koschany Date: Tue, 29 Jan 2013 15:05:04 +0100 Subject: fix spelling and hyphen used as minus --- dao/cdrdao.man | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dao/cdrdao.man b/dao/cdrdao.man index 2435d75..e1ac157 100644 --- a/dao/cdrdao.man +++ b/dao/cdrdao.man @@ -325,7 +325,7 @@ disks, e.g. to create a CD-EXTRA. .TP .BI \--overburn By default cdrdao will not allow to write more data on a medium than -specified by the current medium. This option allows to ignore this condition. +specified by the current medium. This option allows one to ignore this condition. .TP .BI \--eject Eject the CD-R after writing or write simulation. @@ -463,7 +463,7 @@ mode CD). .IP CD_ROM_XA The disc contains mode 2 form 1 or mode 2 form 2 tracks. Audio tracks are allowed, too. This type must be used if multi session disks are -created (option --multi). +created (option \-\-multi). .IP CD_TEXT\ {\ ...\ } Defines global CD-TEXT data like the album title and the used languages. See the CD-TEXT section below for the syntax of the CD-TEXT block contents. @@ -537,7 +537,7 @@ set to 0 all audio data from until the end of file is used. Audio files may have raw or WAVE format with 16 bits per sample, 44.1 kHz sampling rate, stereo. Raw files must have the layout 'MSBLeft LSBLeft MSBRight LSBRight ...' (big endian byte order). WAVE files are -expected to have little endian byte order. The option --swap reverses +expected to have little endian byte order. The option \-\-swap reverses the expected byte order for all raw and WAVE files. Only filenames with a ".wav" ending are treated as WAVE files, all other names are assumed to be raw audio files. Use tools like sox(1) to convert other @@ -814,9 +814,9 @@ and Corresponding option: .I --driver .IP write_speed -Specifies writing speed. Corresponding option: --speed +Specifies writing speed. Corresponding option: \-\-speed .IP write_buffers -Specifies fifo buffers used for recording. Corresponding option: --buffers +Specifies fifo buffers used for recording. Corresponding option: \-\-buffers .IP read_device Device used for operations .I read-toc, read-cd debian/patches/series0000644000000000000000000000056212143544163012040 0ustar 02-conffile.patch #06-tocparser.patch #08-dlopen-lame.patch #10-rules-armel.patch #11-rules-mips.patch #12-rules-s390.patch #13-rename-functions.patch 14-stat.h.patch 15-kfreebsd-gnu.patch 16-gcdmaster-segfault.patch 17-cd-text-hldtst.patch 18-create-valid-desktop-file.patch 19-fix-format-not-a-string-literal-error.patch 20-fix-spelling-and-hyphen-used-as-minus.patch debian/patches/18-create-valid-desktop-file.patch0000644000000000000000000000122512143544163017013 0ustar From: Markus Koschany Date: Tue, 29 Jan 2013 15:08:08 +0100 Subject: create valid desktop file --- xdao/gcdmaster.desktop | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xdao/gcdmaster.desktop b/xdao/gcdmaster.desktop index 7e46eb4..0a9de3a 100644 --- a/xdao/gcdmaster.desktop +++ b/xdao/gcdmaster.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=Gnome CD Master Comment=Gnome Audio CD editor and burner Exec=gcdmaster %F -Icon=gcdmaster.png +Icon=gcdmaster Terminal=false Type=Application StartupNotify=true -Categories=GNOME;AudioVideo;Application;X-Fedora; +Categories=GNOME;GTK;AudioVideo; debian/patches/13-rename-functions.patch0000644000000000000000000000567312143544163015352 0ustar Index: cdrdao-1.2.2/scsilib/include/schily.h =================================================================== --- cdrdao-1.2.2.orig/scsilib/include/schily.h 2004-03-05 01:30:40.000000000 +0100 +++ cdrdao-1.2.2/scsilib/include/schily.h 2009-10-03 14:34:42.000000000 +0200 @@ -108,7 +108,7 @@ /* 6th arg not const, fexecv forces av[ac] = NULL */ extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int, char **)); -extern int fexecve __PR((const char *, FILE *, FILE *, FILE *, +extern int fexecve_schily __PR((const char *, FILE *, FILE *, FILE *, char * const *, char * const *)); extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *)); extern int fspawnl __PR((FILE *, FILE *, FILE *, @@ -187,7 +187,7 @@ extern char *findbytes __PR((const void *, int, char)); extern int findline __PR((const char *, char, const char *, int, char **, int)); -extern int getline __PR((char *, int)); +extern int getline_schily __PR((char *, int)); extern int getstr __PR((char *, int)); extern int breakline __PR((char *, char, char **, int)); extern int getallargs __PR((int *, char * const**, const char *, ...)); Index: cdrdao-1.2.2/scsilib/libscg/scsitransp.c =================================================================== --- cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c 2009-10-03 14:33:09.000000000 +0200 +++ cdrdao-1.2.2/scsilib/libscg/scsitransp.c 2009-10-03 14:33:09.000000000 +0200 @@ -324,7 +324,7 @@ js_printf("%s", msg); flush(); - if (getline(okbuf, sizeof (okbuf)) == EOF) + if (getline_schily(okbuf, sizeof (okbuf)) == EOF) exit(EX_BAD); if (streql(okbuf, "y") || streql(okbuf, "yes") || streql(okbuf, "Y") || streql(okbuf, "YES")) Index: cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c =================================================================== --- cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c 2004-08-08 13:02:05.000000000 +0200 +++ cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c 2009-10-03 14:33:09.000000000 +0200 @@ -64,7 +64,7 @@ } EXPORT int -getline(buf, len) +getline_schily(buf, len) char *buf; int len; { Index: cdrdao-1.2.2/scsilib/libschily/fexec.c =================================================================== --- cdrdao-1.2.2.orig/scsilib/libschily/fexec.c 2009-10-03 14:35:26.000000000 +0200 +++ cdrdao-1.2.2/scsilib/libschily/fexec.c 2009-10-03 14:35:08.000000000 +0200 @@ -159,7 +159,7 @@ } while (p != NULL); va_end(args); - ret = fexecve(name, in, out, err, av, env); + ret = fexecve_schily(name, in, out, err, av, env); if (av != xav) free(av); return (ret); @@ -173,11 +173,11 @@ char *av[]; { av[ac] = NULL; /* force list to be null terminated */ - return (fexecve(name, in, out, err, av, environ)); + return (fexecve_schily(name, in, out, err, av, environ)); } EXPORT int -fexecve(name, in, out, err, av, env) +fexecve_schily(name, in, out, err, av, env) const char *name; FILE *in, *out, *err; char * const av[], * const env[]; debian/patches/19-fix-format-not-a-string-literal-error.patch0000644000000000000000000000433312143544163021250 0ustar From: Markus Koschany Date: Tue, 29 Jan 2013 13:29:04 +0100 Subject: fix format not a string literal error --- pccts/antlr/fset2.c | 2 +- pccts/antlr/gen.c | 2 +- pccts/antlr/lex.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pccts/antlr/fset2.c b/pccts/antlr/fset2.c index 5393a9e..5e017e5 100644 --- a/pccts/antlr/fset2.c +++ b/pccts/antlr/fset2.c @@ -2210,7 +2210,7 @@ void MR_backTraceReport() if (p->ntype != nToken) continue; tn=(TokNode *)p; if (depth != 0) fprintf(stdout," "); - fprintf(stdout,TerminalString(tn->token)); + fprintf(stdout,"%s",TerminalString(tn->token)); depth++; if (! MR_AmbAidMultiple) { if (set_nil(tn->tset)) { diff --git a/pccts/antlr/gen.c b/pccts/antlr/gen.c index 7940eca..51a42fa 100644 --- a/pccts/antlr/gen.c +++ b/pccts/antlr/gen.c @@ -3866,7 +3866,7 @@ int file; /* MR10 */ _gen(" * "); /* MR10 */ for (i=0 ; i < Save_argc ; i++) { /* MR10 */ _gen(" "); -/* MR10 */ _gen(Save_argv[i]); +/* MR10 */ _gen1("%s",Save_argv[i]); /* MR10 */ }; _gen("\n"); _gen(" *\n"); diff --git a/pccts/antlr/lex.c b/pccts/antlr/lex.c index 21fcc2e..63be01b 100644 --- a/pccts/antlr/lex.c +++ b/pccts/antlr/lex.c @@ -706,7 +706,7 @@ FILE *output; /* MR26 */ if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break; /* MR26 */ } /* MR26 */ } -/* MR26 */ fprintf(output,strBetween(pSymbol, t, pSeparator)); +/* MR26 */ fprintf(output,"%s",strBetween(pSymbol, t, pSeparator)); *q = p; return (*pSeparator == 0); @@ -771,7 +771,7 @@ FILE *f; &pValue, &pSeparator, &nest); - fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); + fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); } /* check to see if string e is a word in string s */ @@ -852,9 +852,9 @@ int i; &pSeparator, &nest); fprintf(f,"\t"); - fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); + fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); fprintf(f," "); - fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator)); + fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator)); fprintf(f,";\n"); } fprintf(f,"};\n"); debian/patches/16-gcdmaster-segfault.patch0000644000000000000000000000150412143544163015646 0ustar From: Adrian Knoth Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590647 Description: Properly initialize format variable According to , ao_sample_format (currently) consists of five entries. Initialize all of them. --- a/xdao/SoundIF-ao.cc +++ b/xdao/SoundIF-ao.cc @@ -22,6 +22,7 @@ #include "SoundIF.h" #include "Sample.h" #include "util.h" +#include class SoundIFImpl { @@ -37,10 +38,12 @@ impl_ = new SoundIFImpl; impl_->driverId = ao_default_driver_id(); + memset(&(impl_->format), 0, sizeof (ao_sample_format)); impl_->format.bits = 16; impl_->format.rate = 44100; impl_->format.channels = 2; impl_->format.byte_format = AO_FMT_NATIVE; + impl_->format.matrix = NULL; } SoundIF::~SoundIF() debian/patches/14-stat.h.patch0000644000000000000000000000122412143544163013263 0ustar Description: This patch fixes the FTBFS by including sys/stat.h. Origin: vendor Bug-Debian: http://bugs.debian.org/625005 Forwarded: no Author: "brian m. carlson" Reviewed-by: gregor herrmann Last-Update: 2011-10-05 diff -ur cdrdao.old/dao/ScsiIf-linux.cc cdrdao-1.2.3/dao/ScsiIf-linux.cc --- cdrdao.old/dao/ScsiIf-linux.cc 2011-05-18 22:00:28.000000000 +0000 +++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2011-05-18 22:05:38.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include debian/patches/12-rules-s390.patch0000644000000000000000000003443212143544163013715 0ustar Author: Daniel Baumann Description: Fixes outdated smake rules (Closes: #250031, #471224). diff -Naurp cdrdao.orig/scsilib/RULES/MKLINKS cdrdao/scsilib/RULES/MKLINKS --- cdrdao.orig/scsilib/RULES/MKLINKS 2009-06-14 08:36:45.000000000 +0000 +++ cdrdao/scsilib/RULES/MKLINKS 2009-07-16 22:51:41.000000000 +0000 @@ -111,6 +111,8 @@ ln -s i586-linux-cc.rul mipsel-linux-cc. ln -s i586-linux-gcc.rul mipsel-linux-gcc.rul ln -s i586-linux-cc.rul s390-linux-cc.rul ln -s i586-linux-gcc.rul s390-linux-gcc.rul +ln -s i586-linux-cc.rul s390x-linux-cc.rul +ln -s i586-linux-gcc.rul s390x-linux-gcc.rul ln -s i586-linux-cc.rul parisc-linux-cc.rul ln -s i586-linux-gcc.rul parisc-linux-gcc.rul ln -s i586-linux-cc.rul parisc64-linux-cc.rul diff -Naurp cdrdao.orig/scsilib/RULES/MKLINKS.orig cdrdao/scsilib/RULES/MKLINKS.orig --- cdrdao.orig/scsilib/RULES/MKLINKS.orig 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/MKLINKS.orig 2009-06-14 08:36:45.000000000 +0000 @@ -0,0 +1,174 @@ +#!/bin/sh +########################################################################### +#ident "@(#)MKLINKS 1.53 04/09/08 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; see the file COPYING. If not, write to the Free Software +# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +########################################################################### +ln -s mk-.id mk-make.id +ln -s r-make.c4x r-gmake.c4x +ln -s r-make.c4x-dep r-gmake.c4x-dep +ln -s r-make.obj r-gmake.obj +ln -s 9000-725-hp-ux-cc.rul 9000-710-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-712-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-715-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-735-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-743-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-755-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-777-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-778-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-780-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-782-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-785-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-800-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-820-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-831-hp-ux-cc.rul +ln -s 9000-725-hp-ux-cc.rul 9000-899-hp-ux-cc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-710-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-712-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-715-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-735-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-743-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-755-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-777-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-778-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-780-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-782-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-785-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-800-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-820-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-831-hp-ux-gcc.rul +ln -s 9000-725-hp-ux-gcc.rul 9000-899-hp-ux-gcc.rul +ln -s hppa-nextstep-cc.rul i386-nextstep-cc.rul +ln -s hppa-nextstep-cc.rul m68k-nextstep-cc.rul +ln -s hppa-nextstep-cc.rul sparc-nextstep-cc.rul +ln -s hppa-nextstep-cc.rul i386-nextstep-gcc.rul +ln -s hppa-nextstep-cc.rul m68k-nextstep-gcc.rul +ln -s hppa-nextstep-cc.rul sparc-nextstep-gcc.rul +ln -s os-irix.id os-irix64.id +ln -s ip22-irix-cc.rul ip17-irix-cc.rul +ln -s ip22-irix-cc.rul ip20-irix-cc.rul +ln -s ip22-irix-cc.rul ip27-irix-cc.rul +ln -s ip22-irix-cc.rul ip28-irix-cc.rul +ln -s ip22-irix-cc.rul ip30-irix-cc.rul +ln -s ip22-irix-cc.rul ip32-irix-cc.rul +ln -s ip22-irix-gcc.rul ip17-irix-gcc.rul +ln -s ip22-irix-gcc.rul ip20-irix-gcc.rul +ln -s ip22-irix-gcc.rul ip27-irix-gcc.rul +ln -s ip22-irix-gcc.rul ip28-irix-gcc.rul +ln -s ip22-irix-gcc.rul ip30-irix-gcc.rul +ln -s ip22-irix-gcc.rul ip32-irix-gcc.rul +ln -s i386-freebsd-cc.rul sparc64-freebsd-cc.rul +ln -s i386-freebsd-gcc.rul sparc64-freebsd-gcc.rul +ln -s i386-netbsd-cc.rul alpha-netbsd-cc.rul +ln -s i386-netbsd-gcc.rul alpha-netbsd-gcc.rul +ln -s i386-netbsd-cc.rul sparc-netbsd-cc.rul +ln -s i386-netbsd-gcc.rul sparc-netbsd-gcc.rul +ln -s i386-netbsd-cc.rul mac68k-netbsd-cc.rul +ln -s i386-netbsd-gcc.rul mac68k-netbsd-gcc.rul +ln -s i386-netbsd-cc.rul amiga-netbsd-cc.rul +ln -s i386-netbsd-gcc.rul amiga-netbsd-gcc.rul +ln -s i386-netbsd-cc.rul macppc-netbsd-cc.rul +ln -s i386-netbsd-gcc.rul macppc-netbsd-gcc.rul +ln -s i386-bsd-os-cc.rul sparc-bsd-os-cc.rul +ln -s i386-bsd-os-gcc.rul sparc-bsd-os-gcc.rul +ln -s i386-bsd-os3-cc.rul sparc-bsd-os3-cc.rul +ln -s i386-bsd-os3-gcc.rul sparc-bsd-os3-gcc.rul +ln -s i586-linux-cc.rul i386-linux-cc.rul +ln -s i586-linux-cc.rul i486-linux-cc.rul +ln -s i586-linux-cc.rul i686-linux-cc.rul +ln -s i586-linux-gcc.rul i386-linux-gcc.rul +ln -s i586-linux-gcc.rul i486-linux-gcc.rul +ln -s i586-linux-gcc.rul i686-linux-gcc.rul +ln -s i586-linux-cc.rul sparc-linux-cc.rul +ln -s i586-linux-gcc.rul sparc-linux-gcc.rul +ln -s i586-linux-cc.rul sparc64-linux-cc.rul +ln -s i586-linux-gcc.rul sparc64-linux-gcc.rul +ln -s i586-linux-cc.rul alpha-linux-cc.rul +ln -s i586-linux-gcc.rul alpha-linux-gcc.rul +ln -s i586-linux-cc.rul ppc-linux-cc.rul +ln -s i586-linux-gcc.rul ppc-linux-gcc.rul +ln -s i586-linux-cc.rul m68k-linux-cc.rul +ln -s i586-linux-gcc.rul m68k-linux-gcc.rul +ln -s i586-linux-cc.rul armv4l-linux-cc.rul +ln -s i586-linux-gcc.rul armv4l-linux-gcc.rul +ln -s i586-linux-cc.rul mips-linux-cc.rul +ln -s i586-linux-gcc.rul mips-linux-gcc.rul +ln -s i586-linux-cc.rul mipsel-linux-cc.rul +ln -s i586-linux-gcc.rul mipsel-linux-gcc.rul +ln -s i586-linux-cc.rul s390-linux-cc.rul +ln -s i586-linux-gcc.rul s390-linux-gcc.rul +ln -s i586-linux-cc.rul parisc-linux-cc.rul +ln -s i586-linux-gcc.rul parisc-linux-gcc.rul +ln -s i586-linux-cc.rul parisc64-linux-cc.rul +ln -s i586-linux-gcc.rul parisc64-linux-gcc.rul +ln -s i586-linux-cc.rul ia64-linux-cc.rul +ln -s i586-linux-gcc.rul ia64-linux-gcc.rul +ln -s i586-linux-cc.rul x86_64-linux-cc.rul +ln -s i586-linux-gcc.rul x86_64-linux-gcc.rul +ln -s os-cygwin32_nt.id os-cygwin_95-4.0.id +ln -s os-cygwin32_nt.id os-cygwin_98-4.0.id +ln -s os-cygwin32_nt.id os-cygwin_98-4.10.id +ln -s os-cygwin32_nt.id os-cygwin_me-4.90.id +ln -s os-cygwin32_nt.id os-cygwin_nt-4.0.id +ln -s os-cygwin32_nt.id os-cygwin_nt-5.0.id +ln -s os-cygwin32_nt.id os-cygwin_nt-5.1.id +ln -s os-unixware.id os-openunix.id +ln -s i486-cygwin32_nt-cc.rul i386-cygwin32_nt-cc.rul +ln -s i486-cygwin32_nt-cc.rul i586-cygwin32_nt-cc.rul +ln -s i486-cygwin32_nt-cc.rul i686-cygwin32_nt-cc.rul +ln -s i486-cygwin32_nt-cc.rul i786-cygwin32_nt-cc.rul +ln -s i486-cygwin32_nt-gcc.rul i386-cygwin32_nt-gcc.rul +ln -s i486-cygwin32_nt-gcc.rul i586-cygwin32_nt-gcc.rul +ln -s i486-cygwin32_nt-gcc.rul i686-cygwin32_nt-gcc.rul +ln -s i486-cygwin32_nt-gcc.rul i786-cygwin32_nt-gcc.rul +ln -s power-macintosh-rhapsody-cc.rul power-macintosh-mac-os10-cc.rul +ln -s power-macintosh-rhapsody-gcc.rul power-macintosh-mac-os10-gcc.rul +ln -s sun4-sunos4-cc.rul sun4c-sunos4-cc.rul +ln -s sun4-sunos4-gcc.rul sun4c-sunos4-gcc.rul +ln -s sun4-sunos5-cc.rul sun4c-sunos5-cc.rul +ln -s sun4-sunos5-gcc.rul sun4c-sunos5-gcc.rul +ln -s sun4-sunos4-cc.rul sun4m-sunos4-cc.rul +ln -s sun4-sunos4-gcc.rul sun4m-sunos4-gcc.rul +ln -s sun4-sunos5-cc.rul sun4m-sunos5-cc.rul +ln -s sun4-sunos5-gcc.rul sun4m-sunos5-gcc.rul +ln -s sun4-sunos5-cc.rul sun4u-sunos5-cc.rul +ln -s sun4-sunos5-gcc.rul sun4u-sunos5-gcc.rul +ln -s sun4-sunos5-cc.rul sun4d-sunos5-cc.rul +ln -s sun4-sunos5-gcc.rul sun4d-sunos5-gcc.rul +ln -s sun4-sunos5-cc.rul sun4e-sunos5-cc.rul +ln -s sun4-sunos5-gcc.rul sun4e-sunos5-gcc.rul +ln -s sun4-sunos5-cc.rul sun4L-sunos5-cc.rul +ln -s sun4-sunos5-gcc.rul sun4L-sunos5-gcc.rul +ln -s i386-unixware-cc.rul i486-unixware-cc.rul +ln -s i386-unixware-gcc.rul i486-unixware-gcc.rul +ln -s i386-unixware-cc.rul i586-unixware-cc.rul +ln -s i386-unixware-gcc.rul i586-unixware-gcc.rul +ln -s i386-unixware-cc.rul pentium-iii-unixware-cc.rul +ln -s i386-unixware-gcc.rul pentium-iii-unixware-gcc.rul +ln -s i386-unixware-cc.rul pentium-pro-unixware-cc.rul +ln -s i386-unixware-gcc.rul pentium-pro-unixware-gcc.rul +ln -s i386-ms-dos-gcc.rul i486-ms-dos-gcc.rul +ln -s i386-ms-dos-gcc.rul i586-ms-dos-gcc.rul +ln -s i386-ms-dos-gcc.rul i686-ms-dos-gcc.rul +ln -s i386-ms-dos-gcc.rul i786-ms-dos-gcc.rul +# +ln -s mk-smake.id mk-build.id +ln -s r-smake.c4x r-build.c4x +ln -s r-smake.c4x-dep r-build.c4x-dep +ln -s r-smake.dep r-build.dep +ln -s r-smake.obj r-build.obj +ln -s r-smake.tag r-build.tag diff -Naurp cdrdao.orig/scsilib/RULES/s390x-linux-cc.rul cdrdao/scsilib/RULES/s390x-linux-cc.rul --- cdrdao.orig/scsilib/RULES/s390x-linux-cc.rul 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/s390x-linux-cc.rul 2009-07-16 22:51:41.000000000 +0000 @@ -0,0 +1,70 @@ +#ident "@(#)i586-linux-cc.rul 1.5 02/10/15 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# +# Platform dependent MACROS for Linux +# +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +########################################################################### +include $(SRCROOT)/$(RULESDIR)/rules.prg +########################################################################### + +CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) + +CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) +COPTS= +CWOPTS= -Wall -Wtraditional \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +COPTOPT= -O +KDEFINES= -DKERNEL -D_KERNEL +COPTDYN= -fpic +COPTGPROF= -pg + +LIB_PREFIX= lib +LIB_SUFFIX= .a +SHL_SUFFIX= .so.1.0 + +#LIB_SOCKET= -lsocket -lnsl -ldl +LIB_SOCKET= +LIB_MATH= -lm +#LIB_KVM= -lkvm +LIB_KVM= + +LIBS_PATH= -L$(OLIBSDIR) + +LDFLAGS= $(LDOPTS) $(LDOPTX) +LDLIBS= $(LIBS) $(LIBX) + +#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +LDOPTS= $(LIBS_PATH) $(LDPATH) +LDOPTDYN= -shared -Wl,-soname,$(TARGET) +LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so + +FLOAT_OPTIONS= + +CC= @echo " ==> COMPILING \"$@\""; gcc +LDCC= @echo " ==> LINKING \"$@\""; gcc +DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +ARFLAGS= cr +LORDER= echo +TSORT= cat + +RMDEP= : +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M +MKDEP_OUT= diff -Naurp cdrdao.orig/scsilib/RULES/s390x-linux-gcc.rul cdrdao/scsilib/RULES/s390x-linux-gcc.rul --- cdrdao.orig/scsilib/RULES/s390x-linux-gcc.rul 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/s390x-linux-gcc.rul 2009-07-16 22:51:41.000000000 +0000 @@ -0,0 +1,70 @@ +#ident "@(#)i586-linux-gcc.rul 1.5 02/10/15 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# +# Platform dependent MACROS for Linux +# +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +########################################################################### +include $(SRCROOT)/$(RULESDIR)/rules.prg +########################################################################### + +CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) + +CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) +COPTS= +CWOPTS= -Wall -Wtraditional \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +COPTOPT= -O +KDEFINES= -DKERNEL -D_KERNEL +COPTDYN= -fpic +COPTGPROF= -pg + +LIB_PREFIX= lib +LIB_SUFFIX= .a +SHL_SUFFIX= .so.1.0 + +#LIB_SOCKET= -lsocket -lnsl -ldl +LIB_SOCKET= +LIB_MATH= -lm +#LIB_KVM= -lkvm +LIB_KVM= + +LIBS_PATH= -L$(OLIBSDIR) + +LDFLAGS= $(LDOPTS) $(LDOPTX) +LDLIBS= $(LIBS) $(LIBX) + +#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +LDOPTS= $(LIBS_PATH) $(LDPATH) +LDOPTDYN= -shared -Wl,-soname,$(TARGET) +LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so + +FLOAT_OPTIONS= + +CC= @echo " ==> COMPILING \"$@\""; gcc +LDCC= @echo " ==> LINKING \"$@\""; gcc +DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +ARFLAGS= cr +LORDER= echo +TSORT= cat + +RMDEP= : +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M +MKDEP_OUT= debian/patches/08-dlopen-lame.patch0000644000000000000000000002656212143544163014276 0ustar Author: Reuben Thomas Description: Patch to toc2mp3 to dlopen lame, without needing any part of LAME while building, so that toc2mp3 can be distributed (Closes: #457805). diff -Naurp cdrdao.orig/configure.ac cdrdao/configure.ac --- cdrdao.orig/configure.ac 2009-06-14 08:36:45.000000000 +0000 +++ cdrdao/configure.ac 2009-07-16 22:49:37.000000000 +0000 @@ -218,14 +218,14 @@ else CPPFLAGS="$ac_save_CPPFLAGS" fi -utiltools="toc2cue cue2toc" +utiltools="toc2cue cue2toc toc2mp3" en_cdrdao=yes en_toc2cue=yes en_cue2toc=yes -en_toc2mp3=no +en_toc2mp3=yes -AC_PATH_LAME(3.92, [utiltools="$utiltools toc2mp3" en_toc2mp3=yes], - [echo "Building of toc2mp3 disabled"]) +#AC_PATH_LAME(3.92, [utiltools="$utiltools toc2mp3" en_toc2mp3=yes], +# [echo "Building of toc2mp3 disabled"]) dnl Determine whether we're building the gcdaster GUI front-end en_xdao=no diff -Naurp cdrdao.orig/utils/Makefile.am cdrdao/utils/Makefile.am --- cdrdao.orig/utils/Makefile.am 2009-06-14 08:36:45.000000000 +0000 +++ cdrdao/utils/Makefile.am 2009-07-16 22:49:37.000000000 +0000 @@ -13,7 +13,7 @@ toc2mp3_SOURCES = toc2mp3.cc toc2cddb_LDADD = -L$(top_builddir)/trackdb -ltrackdb toc2cue_LDADD = -L$(top_builddir)/trackdb -ltrackdb -toc2mp3_LDADD = -L$(top_builddir)/trackdb -ltrackdb @LAME_LIBS@ +toc2mp3_LDADD = -L$(top_builddir)/trackdb -ltrackdb -lmad -lm if COND_MP3 toc2cddb_LDADD += @MAD_LIBS@ diff -Naurp cdrdao.orig/utils/toc2mp3.cc cdrdao/utils/toc2mp3.cc --- cdrdao.orig/utils/toc2mp3.cc 2009-06-14 08:36:45.000000000 +0000 +++ cdrdao/utils/toc2mp3.cc 2009-07-16 22:49:37.000000000 +0000 @@ -33,8 +33,6 @@ #include #include -#include - #include "util.h" #include "Toc.h" #include "CdTextItem.h" @@ -47,6 +45,101 @@ static int VERBOSE = 1; static int CREATE_ALBUM_DIRECTORY = 0; static std::string TARGET_DIRECTORY; +#include + +#define STEREO 0 +#define LAME_MAXMP3BUFFER 16384 + +typedef void *lame_global_flags; +static lame_global_flags *(*dl_lame_init)(void); +typedef void lame_msgfun(const char *fmt, va_list args); +static void (*dl_lame_set_msgf)(lame_global_flags *lf, lame_msgfun *f); +static void (*dl_lame_set_debugf)(lame_global_flags *lf, lame_msgfun *f); +static void (*dl_lame_set_errorf)(lame_global_flags *lf, lame_msgfun *f); +static void (*dl_lame_set_in_samplerate)(lame_global_flags *lf, int rate); +static void (*dl_lame_set_num_channels)(lame_global_flags *lf, int chans); +static void (*dl_lame_set_quality)(lame_global_flags *lf, int q); +static void (*dl_lame_set_mode)(lame_global_flags *lf, int mode); +static void (*dl_lame_set_brate)(lame_global_flags *lf, int bitrate); +static int (*dl_lame_encode_buffer)(lame_global_flags *lf, short int *leftSamples, short int *rightSamples, int samples, unsigned char *mp3buffer, int bufsize); +static int (*dl_lame_encode_flush_nogap)(lame_global_flags *lf, unsigned char *mp3buffer, int bufsize); +static void (*dl_lame_mp3_tags_fid)(lame_global_flags *lf, FILE *fp); +static int (*dl_lame_init_params)(lame_global_flags *lf); +static void (*dl_lame_print_config)(lame_global_flags *lf); +static void (*dl_lame_print_internals)(lame_global_flags *lf); +static int (*dl_lame_init_bitstream)(lame_global_flags *lf); +static void (*dl_lame_close)(lame_global_flags *lf); +static char *(*dl_get_lame_version)(void); +static int (*dl_bitrate_table)[3][16]; +static void (*dl_id3tag_init)(lame_global_flags *lf); +static void (*dl_id3tag_add_v2)(lame_global_flags *lf); +static void (*dl_id3tag_set_title)(lame_global_flags *lf, const char *title); +static void (*dl_id3tag_set_artist)(lame_global_flags *lf, const char *artist); +static void (*dl_id3tag_set_album)(lame_global_flags *lf, const char *album); +static void (*dl_id3tag_set_track)(lame_global_flags *lf, const char *track); + +static int load_lame(void) { + static int loaded=0; + void *library; + + if (loaded) return 0; + + library = dlopen("libmp3lame.so", RTLD_NOW); + + if (!(dl_lame_init = (lame_global_flags *(*)(void))dlsym(library, "lame_init"))) + return -1; + if (!(dl_lame_set_msgf = (void (*)(lame_global_flags *, lame_msgfun *))dlsym(library, "lame_set_msgf"))) + return -1; + if (!(dl_lame_set_debugf = (void (*)(lame_global_flags *, lame_msgfun *))dlsym(library, "lame_set_debugf"))) + return -1; + if (!(dl_lame_set_errorf = (void (*)(lame_global_flags *, lame_msgfun *))dlsym(library, "lame_set_errorf"))) + return -1; + if (!(dl_lame_set_in_samplerate = (void (*)(lame_global_flags *, int))dlsym(library, "lame_set_in_samplerate"))) + return -1; + if (!(dl_lame_set_num_channels = (void (*)(lame_global_flags *, int))dlsym(library, "lame_set_num_channels"))) + return -1; + if (!(dl_lame_set_quality = (void (*)(lame_global_flags *, int))dlsym(library, "lame_set_quality"))) + return -1; + if (!(dl_lame_set_mode = (void (*)(lame_global_flags *, int))dlsym(library, "lame_set_mode"))) + return -1; + if (!(dl_lame_set_brate = (void (*)(lame_global_flags *, int))dlsym(library, "lame_set_brate"))) + return -1; + if (!(dl_lame_encode_buffer = (int (*)(lame_global_flags *, short int *, short int *, int, unsigned char *, int))dlsym(library, "lame_encode_buffer"))) + return -1; + if (!(dl_lame_encode_flush_nogap = (int (*)(lame_global_flags *, unsigned char *, int))dlsym(library, "lame_encode_flush_nogap"))) + return -1; + if (!(dl_lame_mp3_tags_fid = (void (*)(lame_global_flags *, FILE *))dlsym(library, "lame_mp3_tags_fid"))) + return -1; + if (!(dl_lame_init_params = (int (*)(lame_global_flags *))dlsym(library, "lame_init_params"))) + return -1; + if (!(dl_lame_print_config = (void (*)(lame_global_flags *))dlsym(library, "lame_print_config"))) + return -1; + if (!(dl_lame_print_internals = (void (*)(lame_global_flags *))dlsym(library, "lame_print_internals"))) + return -1; + if (!(dl_lame_init_bitstream = (int (*)(lame_global_flags *))dlsym(library, "lame_init_bitstream"))) + return -1; + if (!(dl_lame_close = (void (*)(lame_global_flags *))dlsym(library, "lame_close"))) + return -1; + if (!(dl_get_lame_version = (char * (*)(void))dlsym(library, "get_lame_version"))) + return -1; + if (!(dl_bitrate_table = (int (*)[3][16])dlsym(library, "bitrate_table"))) + return -1; + if (!(dl_id3tag_init = (void (*)(lame_global_flags *))dlsym(library, "id3tag_init"))) + return -1; + if (!(dl_id3tag_add_v2 = (void (*)(lame_global_flags *lf))dlsym(library, "id3tag_add_v2"))) + return -1; + if (!(dl_id3tag_set_title = (void (*)(lame_global_flags *, const char *))dlsym(library, "id3tag_set_title"))) + return -1; + if (!(dl_id3tag_set_artist = (void (*)(lame_global_flags *, const char *))dlsym(library, "id3tag_set_artist"))) + return -1; + if (!(dl_id3tag_set_album = (void (*)(lame_global_flags *, const char *))dlsym(library, "id3tag_set_album"))) + return -1; + if (!(dl_id3tag_set_track = (void (*)(lame_global_flags *, const char *))dlsym(library, "id3tag_set_track"))) + return -1; + + loaded++; + return 0; +} void message_args(int level, int addNewLine, const char *fmt, va_list args) { @@ -141,10 +234,10 @@ static void printUsage() message(0, ""); - message(0, "LAME encoder version: %s", get_lame_version()); + message(0, "LAME encoder version: %s", dl_get_lame_version()); message(0, "Supported bit rates: "); - for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { - message(0, "%d ", bitrate_table[1][i]); + for (int i = 0; i < 16 && (*dl_bitrate_table)[1][i] >= 0; i++) { + message(0, "%d ", (*dl_bitrate_table)[1][i]); } message(0, ""); } @@ -238,8 +331,8 @@ lame_global_flags *init_encoder(int bitr lame_global_flags *lf; int bitrateOk = 0; - for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { - if (bitrate == bitrate_table[1][i]) + for (int i = 0; (*dl_bitrate_table)[1][i] >= 0 && !bitrateOk; i++) { + if (bitrate == (*dl_bitrate_table)[1][i]) bitrateOk = 1; } @@ -248,23 +341,23 @@ lame_global_flags *init_encoder(int bitr return NULL; } - if ((lf = lame_init()) == NULL) { + if ((lf = dl_lame_init()) == NULL) { return NULL; } - lame_set_msgf(lf, lame_message); - lame_set_debugf(lf, lame_message); - lame_set_errorf(lf, lame_error_message); + dl_lame_set_msgf(lf, lame_message); + dl_lame_set_debugf(lf, lame_message); + dl_lame_set_errorf(lf, lame_error_message); - lame_set_in_samplerate(lf, 44100); + dl_lame_set_in_samplerate(lf, 44100); - lame_set_num_channels(lf, 2); + dl_lame_set_num_channels(lf, 2); - lame_set_quality(lf, 2); + dl_lame_set_quality(lf, 2); - lame_set_mode(lf, STEREO); + dl_lame_set_mode(lf, STEREO); - lame_set_brate(lf, bitrate); + dl_lame_set_brate(lf, bitrate); //lame_set_VBR(lf, vbr_abr); @@ -287,22 +380,22 @@ void set_id3_tags(lame_global_flags *lf, { char buf[100]; - id3tag_init(lf); + dl_id3tag_init(lf); - id3tag_add_v2(lf); + dl_id3tag_add_v2(lf); if (!title.empty()) - id3tag_set_title(lf, title.c_str()); + dl_id3tag_set_title(lf, title.c_str()); if (!artist.empty()) - id3tag_set_artist(lf, artist.c_str()); + dl_id3tag_set_artist(lf, artist.c_str()); if (!album.empty()) - id3tag_set_album(lf, album.c_str()); + dl_id3tag_set_album(lf, album.c_str()); if (tracknr > 0 && tracknr <= 255) { sprintf(buf, "%d", tracknr); - id3tag_set_track(lf, buf); + dl_id3tag_set_track(lf, buf); } } @@ -346,7 +439,7 @@ int encode_track(lame_global_flags *lf, rightSamples[i] = audioData[i].right(); } - int count = lame_encode_buffer(lf, leftSamples, rightSamples, + int count = dl_lame_encode_buffer(lf, leftSamples, rightSamples, SAMPLES_PER_BLOCK, mp3buffer, sizeof(mp3buffer)); @@ -368,7 +461,7 @@ int encode_track(lame_global_flags *lf, } if (ret != 0) { - int count = lame_encode_flush_nogap(lf, mp3buffer, sizeof(mp3buffer)); + int count = dl_lame_encode_flush_nogap(lf, mp3buffer, sizeof(mp3buffer)); if (count > 0) { if (fullWrite(fd, mp3buffer, count) != count) { @@ -387,7 +480,7 @@ int encode_track(lame_global_flags *lf, FILE *fp = fopen(fileName.c_str(), "a+"); if (fp != NULL) { - lame_mp3_tags_fid(lf, fp); + dl_lame_mp3_tags_fid(lf, fp); fclose(fp); } else { @@ -449,6 +542,9 @@ int main(int argc, char **argv) PRGNAME = *argv; + if (load_lame()) + message(-10, "Cannot load libmp3lame.so"); + switch (parseCommandLine(argc, argv, &tocFile, &bitrate)) { case 0: printUsage(); @@ -600,17 +696,17 @@ int main(int argc, char **argv) set_id3_tags(lf, trackNr, title, performer, album); if (firstEncodedTrack) { - if (lame_init_params(lf) < 0) { + if (dl_lame_init_params(lf) < 0) { message(-2, "Setting of lame parameters failed"); err = 1; break; } message(1, "Lame encoder settings:"); - lame_print_config(lf); + dl_lame_print_config(lf); message(1, "Selected bit rate: %d kbit/s", bitrate); if (VERBOSE >= 2) - lame_print_internals(lf); + dl_lame_print_internals(lf); message(1, ""); @@ -621,7 +717,7 @@ int main(int argc, char **argv) firstEncodedTrack = 0; } else { - if (lame_init_bitstream(lf) != 0) { + if (dl_lame_init_bitstream(lf) != 0) { message(-2, "Cannot initialize bit stream."); err = 1; break; @@ -648,7 +744,7 @@ int main(int argc, char **argv) nextTrack = titr.next(nstart, nend); } - lame_close(lf); + dl_lame_close(lf); exit(err); } debian/patches/11-rules-mips.patch0000644000000000000000000001356512143544163014172 0ustar Author: Daniel Baumann Description: Fixes outdated smake rules (Closes: #357759). diff -Naurp cdrdao.orig/scsilib/RULES/MKLINKS cdrdao/scsilib/RULES/MKLINKS --- cdrdao.orig/scsilib/RULES/MKLINKS 2009-06-14 08:36:45.000000000 +0000 +++ cdrdao/scsilib/RULES/MKLINKS 2009-07-16 22:50:53.000000000 +0000 @@ -107,6 +107,8 @@ ln -s i586-linux-cc.rul armv4l-linux-cc. ln -s i586-linux-gcc.rul armv4l-linux-gcc.rul ln -s i586-linux-cc.rul mips-linux-cc.rul ln -s i586-linux-gcc.rul mips-linux-gcc.rul +ln -s i586-linux-cc.rul mips64-linux-cc.rul +ln -s i586-linux-gcc.rul mips64-linux-gcc.rul ln -s i586-linux-cc.rul mipsel-linux-cc.rul ln -s i586-linux-gcc.rul mipsel-linux-gcc.rul ln -s i586-linux-cc.rul s390-linux-cc.rul diff -Naurp cdrdao.orig/scsilib/RULES/mips64-linux-cc.rul cdrdao/scsilib/RULES/mips64-linux-cc.rul --- cdrdao.orig/scsilib/RULES/mips64-linux-cc.rul 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/mips64-linux-cc.rul 2009-07-16 22:50:53.000000000 +0000 @@ -0,0 +1,70 @@ +#ident "@(#)i586-linux-cc.rul 1.5 02/10/15 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# +# Platform dependent MACROS for Linux +# +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +########################################################################### +include $(SRCROOT)/$(RULESDIR)/rules.prg +########################################################################### + +CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) + +CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) +COPTS= +CWOPTS= -Wall -Wtraditional \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +COPTOPT= -O +KDEFINES= -DKERNEL -D_KERNEL +COPTDYN= -fpic +COPTGPROF= -pg + +LIB_PREFIX= lib +LIB_SUFFIX= .a +SHL_SUFFIX= .so.1.0 + +#LIB_SOCKET= -lsocket -lnsl -ldl +LIB_SOCKET= +LIB_MATH= -lm +#LIB_KVM= -lkvm +LIB_KVM= + +LIBS_PATH= -L$(OLIBSDIR) + +LDFLAGS= $(LDOPTS) $(LDOPTX) +LDLIBS= $(LIBS) $(LIBX) + +#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +LDOPTS= $(LIBS_PATH) $(LDPATH) +LDOPTDYN= -shared -Wl,-soname,$(TARGET) +LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so + +FLOAT_OPTIONS= + +CC= @echo " ==> COMPILING \"$@\""; gcc +LDCC= @echo " ==> LINKING \"$@\""; gcc +DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +ARFLAGS= cr +LORDER= echo +TSORT= cat + +RMDEP= : +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M +MKDEP_OUT= diff -Naurp cdrdao.orig/scsilib/RULES/mips64-linux-gcc.rul cdrdao/scsilib/RULES/mips64-linux-gcc.rul --- cdrdao.orig/scsilib/RULES/mips64-linux-gcc.rul 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/mips64-linux-gcc.rul 2009-07-16 22:50:53.000000000 +0000 @@ -0,0 +1,70 @@ +#ident "@(#)i586-linux-gcc.rul 1.5 02/10/15 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# +# Platform dependent MACROS for Linux +# +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +########################################################################### +include $(SRCROOT)/$(RULESDIR)/rules.prg +########################################################################### + +CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) + +CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) +COPTS= +CWOPTS= -Wall -Wtraditional \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +COPTOPT= -O +KDEFINES= -DKERNEL -D_KERNEL +COPTDYN= -fpic +COPTGPROF= -pg + +LIB_PREFIX= lib +LIB_SUFFIX= .a +SHL_SUFFIX= .so.1.0 + +#LIB_SOCKET= -lsocket -lnsl -ldl +LIB_SOCKET= +LIB_MATH= -lm +#LIB_KVM= -lkvm +LIB_KVM= + +LIBS_PATH= -L$(OLIBSDIR) + +LDFLAGS= $(LDOPTS) $(LDOPTX) +LDLIBS= $(LIBS) $(LIBX) + +#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +LDOPTS= $(LIBS_PATH) $(LDPATH) +LDOPTDYN= -shared -Wl,-soname,$(TARGET) +LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so + +FLOAT_OPTIONS= + +CC= @echo " ==> COMPILING \"$@\""; gcc +LDCC= @echo " ==> LINKING \"$@\""; gcc +DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +ARFLAGS= cr +LORDER= echo +TSORT= cat + +RMDEP= : +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M +MKDEP_OUT= debian/patches/10-rules-armel.patch0000644000000000000000000001361112143544163014311 0ustar Author: Daniel Baumann Description: Fixes outdated smake rules (Closes: #450752). diff -Naurp cdrdao.orig/scsilib/RULES/MKLINKS cdrdao/scsilib/RULES/MKLINKS --- cdrdao.orig/scsilib/RULES/MKLINKS 2009-06-14 08:36:45.000000000 +0000 +++ cdrdao/scsilib/RULES/MKLINKS 2009-07-16 22:50:45.000000000 +0000 @@ -105,6 +105,8 @@ ln -s i586-linux-cc.rul m68k-linux-cc.ru ln -s i586-linux-gcc.rul m68k-linux-gcc.rul ln -s i586-linux-cc.rul armv4l-linux-cc.rul ln -s i586-linux-gcc.rul armv4l-linux-gcc.rul +ln -s i586-linux-cc.rul armv5tel-linux-cc.rul +ln -s i586-linux-gcc.rul armv5tel-linux-gcc.rul ln -s i586-linux-cc.rul mips-linux-cc.rul ln -s i586-linux-gcc.rul mips-linux-gcc.rul ln -s i586-linux-cc.rul mipsel-linux-cc.rul diff -Naurp cdrdao.orig/scsilib/RULES/armv5tel-linux-cc.rul cdrdao/scsilib/RULES/armv5tel-linux-cc.rul --- cdrdao.orig/scsilib/RULES/armv5tel-linux-cc.rul 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/armv5tel-linux-cc.rul 2009-07-16 22:50:45.000000000 +0000 @@ -0,0 +1,70 @@ +#ident "@(#)i586-linux-cc.rul 1.5 02/10/15 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# +# Platform dependent MACROS for Linux +# +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +########################################################################### +include $(SRCROOT)/$(RULESDIR)/rules.prg +########################################################################### + +CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) + +CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) +COPTS= +CWOPTS= -Wall -Wtraditional \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +COPTOPT= -O +KDEFINES= -DKERNEL -D_KERNEL +COPTDYN= -fpic +COPTGPROF= -pg + +LIB_PREFIX= lib +LIB_SUFFIX= .a +SHL_SUFFIX= .so.1.0 + +#LIB_SOCKET= -lsocket -lnsl -ldl +LIB_SOCKET= +LIB_MATH= -lm +#LIB_KVM= -lkvm +LIB_KVM= + +LIBS_PATH= -L$(OLIBSDIR) + +LDFLAGS= $(LDOPTS) $(LDOPTX) +LDLIBS= $(LIBS) $(LIBX) + +#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +LDOPTS= $(LIBS_PATH) $(LDPATH) +LDOPTDYN= -shared -Wl,-soname,$(TARGET) +LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so + +FLOAT_OPTIONS= + +CC= @echo " ==> COMPILING \"$@\""; gcc +LDCC= @echo " ==> LINKING \"$@\""; gcc +DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +ARFLAGS= cr +LORDER= echo +TSORT= cat + +RMDEP= : +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M +MKDEP_OUT= diff -Naurp cdrdao.orig/scsilib/RULES/armv5tel-linux-gcc.rul cdrdao/scsilib/RULES/armv5tel-linux-gcc.rul --- cdrdao.orig/scsilib/RULES/armv5tel-linux-gcc.rul 1970-01-01 00:00:00.000000000 +0000 +++ cdrdao/scsilib/RULES/armv5tel-linux-gcc.rul 2009-07-16 22:50:45.000000000 +0000 @@ -0,0 +1,70 @@ +#ident "@(#)i586-linux-gcc.rul 1.5 02/10/15 " +########################################################################### +# Written 1996 by J. Schilling +########################################################################### +# +# Platform dependent MACROS for Linux +# +########################################################################### +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +########################################################################### +include $(SRCROOT)/$(RULESDIR)/rules.prg +########################################################################### + +CPPFLAGS= $(CPPOPTS) $(CPPOPTX) +CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX) + +CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) +COPTS= +CWOPTS= -Wall -Wtraditional \ + -Wshadow -Wmissing-prototypes -Wstrict-prototypes +COPTOPT= -O +KDEFINES= -DKERNEL -D_KERNEL +COPTDYN= -fpic +COPTGPROF= -pg + +LIB_PREFIX= lib +LIB_SUFFIX= .a +SHL_SUFFIX= .so.1.0 + +#LIB_SOCKET= -lsocket -lnsl -ldl +LIB_SOCKET= +LIB_MATH= -lm +#LIB_KVM= -lkvm +LIB_KVM= + +LIBS_PATH= -L$(OLIBSDIR) + +LDFLAGS= $(LDOPTS) $(LDOPTX) +LDLIBS= $(LIBS) $(LIBX) + +#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH) +LDOPTS= $(LIBS_PATH) $(LDPATH) +LDOPTDYN= -shared -Wl,-soname,$(TARGET) +LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so + +FLOAT_OPTIONS= + +CC= @echo " ==> COMPILING \"$@\""; gcc +LDCC= @echo " ==> LINKING \"$@\""; gcc +DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc +RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; true +ARFLAGS= cr +LORDER= echo +TSORT= cat + +RMDEP= : +MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M +MKDEP_OUT= debian/patches/06-tocparser.patch0000644000000000000000000000154212143544163014070 0ustar Author: Florian Forster Description: Undo upstream removal of automatic reading of the track lengths in TOC files (Closes: #440419). Index: cdrdao-1.2.3/trackdb/TocParser.g =================================================================== --- cdrdao-1.2.3.orig/trackdb/TocParser.g 2009-05-20 08:21:37.000000000 +0200 +++ cdrdao-1.2.3/trackdb/TocParser.g 2010-07-04 14:17:48.000000000 +0200 @@ -630,6 +630,15 @@ samples > [ unsigned long s ] ( msf > [ m ] << $s = m.samples(); >> | uLong > [ $s ] ) + << if ($st != NULL && $st->length() == 0) { + // try to determine length + if ($st->determineLength() != 0) { + message(-2, "%s:%d: Cannot determine length of track data specification.", + filename_, $lineNr); + error_ = 1; + } + } + >> ; // fail action << $s = 0; >> debian/watch0000644000000000000000000000035112143544163010221 0ustar version=3 opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ http://qa.debian.org/watch/sf.php/cdrdao/cdrdao-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|jar) debian/cdrdao.examples0000644000000000000000000000004112143544163012160 0ustar contrib/psxcopy* contrib/wav2dao debian/copyright0000644000000000000000000000361212143713065011125 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: cdrdao Source: http://cdrdao.sourceforge.net Files: * Copyright: 1999-2005, Andreas Mueller 1999-2005, Manuel Clos 1999-2005, Denis Leroy License: GPL-2+ Files: debian/* Copyright: 1998-2002, Martin Mitchell 2002, Gerhard Tonn 2002, Andreas Metzler 2003, J.H.M Dassen (Ray) 2003-2006, Andrew Suffield 2006-2009, Daniel Baumann 2009, Christoph Egger 2010, Adam D. Barratt 2010, Josselin Mouette 2011, gregor herrmann 2012, Robert Millan 2013, Markus Koschany License: GPL-2+ License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2. debian/changelog0000644000000000000000000005210612143713276011052 0ustar cdrdao (1:1.2.3-2) unstable; urgency=low * QA upload. * Do not build the gcdmaster binary package anymore because it depends on the obsolete libgnomeuimm library which is going to be removed from Debian. (Closes: #707861) * debian/control: - Drop libgnomeuimm-2.6-dev and libgtkmm-2.4-dev from Build-Depends, they are going to be removed from Debian. - Add libgconf2-dev and dh-autoreconf to Build-Depends and remove autotools-dev. - Make libperl4-corelibs-perl | perl (<< 5.12.3-7) a recommendation instead of a full dependency. This is acceptable because the example perl scripts are not required by cdrdao to function properly. (Closes: #699320) * Override lintian warning script-uses-perl4-libs-without-dep. * debian/rules: - Build with --autoreconf instead with --autotools_dev to recreate the whole build system during build time. - Disable lame, scglib and xdao support explicitly. - Override dh_auto_install and change the destination directory to debian/tmp thus no further changes are required for the existing install files. -- Markus Koschany Sun, 12 May 2013 15:18:48 +0200 cdrdao (1:1.2.3-1) unstable; urgency=low * QA upload. * Set Maintainer to Debian QA Group. * Bump compat level to 9 and use debhelper >=9 for automatic hardening build flags. * Bump Standards-Version to 3.9.4, no changes required. * cdrdao-binary: Add missing dependency on libperl4-corelibs-perl | perl (<< 5.12.3-7). (Closes: #658944) * Update debian/copyright to copyright format 1.0. * Add missing dep3 header to 15-kfreebsd-gnu.patch. * debian/patches: - Add 18-create-valid-desktop-file.patch and remove deprecated UTF-8 Encoding entry, fix outdated categories and Icon entry. - Add 19-fix-format-not-a-string-literal-error.patch which prevents a FTBFS. - Add 20-fix-spelling-and-hypen-used-as-minus.patch which corrects errors of the same name in cdrdao's and gcdmaster's manpage. * debian/rules: - Use dh sequencer to simplify debian/rules and to provide recommended build-arch and build-indep targets. - Build with --parallel. - Use --with autotools_dev addon to provide an up-to-date config.sub and config.guess file and do not remove these files in the clean target. - Build with --Wl, --as-needed to avoid unnecessary dependencies on gcdmaster. - Enable all hardening build flags with hardening=+all. * Add watch file. Thanks to Bart Martens. -- Markus Koschany Tue, 29 Jan 2013 16:46:12 +0100 cdrdao (1:1.2.3-0.3) unstable; urgency=low * Non-maintainer upload. * 15-kfreebsd-gnu.patch: Fix FTBFS on GNU/kFreeBSD, based on patch from Christoph Egger. (Closes: #644643) * 16-gcdmaster-segfault.patch: Fix segfault in gcdmaster, thanks Adrian Knoth. (Closes: #590647) * 17-cd-text-hldtst.patch: CD-TEXT support for "HL-DT-ST" "DVDRAM GSA-H42L", thanks Kees Cook. (Closes: #533097) -- Robert Millan Sun, 08 Apr 2012 18:16:02 +0200 cdrdao (1:1.2.3-0.2) unstable; urgency=low * Non-maintainer upload. * Fix "FTBFS: ScsiIf-linux.cc:287:37: error: no matching function for call to 'stat::stat(const char [22], stat*)'": add patch 14-stat.h.patch (include sys/stat.h) by brian m. carlson. Closes: #625005 -- gregor herrmann Wed, 05 Oct 2011 16:59:54 +0200 cdrdao (1:1.2.3-0.1) unstable; urgency=low * Non-maintainer upload. * New upstream release. Closes: #580873. * Switch to 3.0 source format to use the pristing upstream tar.bz2. * 01-setuid.patch, 03-manpage.patch, 05-excl.patch, 07-cdtext.patch, 09-gcc-3.4.patch, SigC_namespace: dropped, merged upstream. * 02-conffile.patch: regenerated to apply cleanly. * 04-device.patch: dropped, obsolete. * 06-tocparser.patch: disabled, looks obsolete. * 08-dlopen-lame.patch: disabled, we don’t distribute toc2mp3. * 10-rules-armel.patch, 11-rules-mips.patch, 12-rules-s390.patch, 13-rename-functions.patch: disabled, the new version doesn’t use this schilyware. * Use upstream-provided manual pages. * Install GConf schemas. * Stop running stuff in scsilib/, it’s not used anymore. -- Josselin Mouette Sun, 04 Jul 2010 15:32:17 +0200 cdrdao (1:1.2.2-18.2) unstable; urgency=low * Non-maintainer upload. * Fix FTBFS with sigc++ 2.2.4.2. Thanks to Steve Langasek for the patch. (Closes: #569396) -- Adam D. Barratt Tue, 27 Apr 2010 20:09:13 +0100 cdrdao (1:1.2.2-18.1) unstable; urgency=low * Non-maintainer upload. * Import patch by Stefan Potyra to build with new eglibc (Closes: #549399) -- Christoph Egger Tue, 08 Dec 2009 14:37:13 +0100 cdrdao (1:1.2.2-18) unstable; urgency=low [ Daniel Baumann ] * Replacing obsolete dh_clean -k with dh_prep. * Using correct rfc-2822 date formats in changelog. * Updating package to standards version 3.8.2. * Using quilt rather than dpatch. * Using common name for local manpages directory. * Updating year in copyright file. * Updating rules file to current state of the art. * Updating package to standards version 3.8.3. * Sorting and wrapping depends. * Removing vcs fields. [ Christian Hübschi ] * New maintainer. -- Christian Hübschi Wed, 26 Aug 2009 21:29:35 +0200 cdrdao (1:1.2.2-17) unstable; urgency=low * Updating vcs fields in control file. * Using patch-stamp rather than patch in rules file. -- Daniel Baumann Mon, 29 Sep 2008 21:33:00 +0200 cdrdao (1:1.2.2-16) unstable; urgency=medium * Updating cross build handling in rules. * Change clean target definition in rules (Closes: #450752, #471224). * Updating to standards 3.8.0. -- Daniel Baumann Fri, 20 Jun 2008 09:58:00 +0200 cdrdao (1:1.2.2-15) unstable; urgency=low * Adding patch to add s390 smake rules (Closes: #250031, #471224). * Adding patch to add mips smake rules (Closes: #357759). * Adding patch to add armel smake rules (Closes: #450752). * Removing leftover in patches directory. * Updatingto debhelper 7. * Correcting indenting in copyright file. -- Daniel Baumann Sun, 04 May 2008 12:48:00 +0200 cdrdao (1:1.2.2-14) unstable; urgency=medium * Completeting clean target in rules file, thanks to Peter Green (Closes: #460191). * Reordering rules file. * Rewriting copyright file in machine-interpretable format. * Adding vcs fields in control file. * Updating package to debhelper 6. * Removing useless whitespaces from changelog file. * Removing watch file. * Reverting config.guess and config.sub to upstream. -- Daniel Baumann Wed, 23 Apr 2008 02:31:00 +0200 cdrdao (1:1.2.2-13) unstable; urgency=medium * Updated gcc-4.3 patch, thanks to Thiemo Seufer (Closes: #455309). -- Daniel Baumann Mon, 07 Apr 2008 22:43:00 +0200 cdrdao (1:1.2.2-12) unstable; urgency=medium * Applied patch from Reuben Thomas to toc2mp3 to dlopen lame, without needing any part of LAME while building, so that toc2mp3 can be distributed (Closes: #457805). * Updated patch to fix build failures with g++-4.3 (Closes: #455309). * Fixed spelling mistake in package description. * Removing even more of that shily buildsystem stuff in clean target, hopefully fixes the FTBFS caused by that on alpha (Closes: #460191). -- Daniel Baumann Fri, 07 Mar 2008 12:12:00 +0100 cdrdao (1:1.2.2-11) unstable; urgency=low * Applied patch from Matthias Klose to fix build failures with g++-4.3 (Closes: #455309). -- Daniel Baumann Tue, 29 Jan 2008 16:58:00 +0100 cdrdao (1:1.2.2-10) unstable; urgency=low * Added patch from anonymous to add missing entries to TOC output when using CdText (Closes: #458357). -- Daniel Baumann Sun, 30 Dec 2007 17:41:00 +0100 cdrdao (1:1.2.2-9) unstable; urgency=low * Bumping to new policy version. * Using new homepage field in control. * Don't hide make errors in clean target of rules. * Added fail-missing to dh_install call in rules. * Updated 04-device.dpatch to point to /dev/cdrw instead of /dev/cdrom (Closes: #452123). * Fixed clean rule in target (Closes: #442522). -- Daniel Baumann Sun, 23 Dec 2007 12:28:00 +0100 cdrdao (1:1.2.2-8) unstable; urgency=medium * Undo upstream removal of automatic reading of the track lengths in TOC files, thanks to Florian Forster (Closes: #440419). -- Daniel Baumann Mon, 24 Sep 2007 14:08:00 +0200 cdrdao (1:1.2.2-7) unstable; urgency=low * Applied O_EXCL patch from cdrecord (Closes: #272646). -- Daniel Baumann Tue, 04 Sep 2007 22:27:00 +0200 cdrdao (1:1.2.2-6) unstable; urgency=low * Rebuild against new libgtkmm. -- Daniel Baumann Tue, 02 Jan 2007 18:38:00 +0100 cdrdao (1:1.2.2-5) unstable; urgency=medium * Fixed manpage typo as reported by A. Costa (Closes: #400245). -- Daniel Baumann Fri, 24 Nov 2006 20:24:00 +0100 cdrdao (1:1.2.2-4) unstable; urgency=medium * Replaces cdrecord with wodim in long-description (Closes: #399109). -- Daniel Baumann Fri, 17 Nov 2006 21:06:00 +0100 cdrdao (1:1.2.2-3) unstable; urgency=medium * Added manpages for toc2cddb and toc2cue based on the submission of Francois Wendling (Closes: #399093). -- Daniel Baumann Fri, 17 Nov 2006 18:48:00 +0100 cdrdao (1:1.2.2-2) unstable; urgency=medium * Fixed configure call to actually link against ogg vorbis, thanks to Nathanael Nerode (Closes: #392281). -- Daniel Baumann Wed, 11 Oct 2006 09:59:00 +0200 cdrdao (1:1.2.2-1) unstable; urgency=low * New upstream release. * Dropping 05-gcc41.dpatch completely, went upstream. * Dropping most stuff from 03-manpage.dpatch, went upstream. -- Daniel Baumann Fri, 06 Oct 2006 22:14:00 +0200 cdrdao (1:1.2.1-7) unstable; urgency=low * Enabled gnome frontend as suggested by Free Ekanayaka (Closes: #369725). * Added patch from Free Ekanayaka to set the proper default device. * Added patch to fix FTBFS with GCC 4.1. * Updated manpage patch to fix two additional error in gcdmaster.1. -- Daniel Baumann Mon, 17 Jul 2006 07:04:00 +0200 cdrdao (1:1.2.1-6) unstable; urgency=low * Removed accidently imported cue2toc manpage (Closes: #353500, #353529, #353543). -- Daniel Baumann Sun, 19 Feb 2006 13:10:00 +0100 cdrdao (1:1.2.1-5) unstable; urgency=low * New maintainer (Closes: #352429). * Included contrib/* as examples (Closes: #200463). * Redone debian/ using new debheler templates and dpatch. * Added watch file. -- Daniel Baumann Sun, 12 Feb 2006 09:31:00 +0100 cdrdao (1:1.2.1-4) unstable; urgency=low * Really do remove cue2toc this time (closes: #347241) -- Andrew Suffield Mon, 23 Jan 2006 12:33:27 +0000 cdrdao (1:1.2.1-3) unstable; urgency=low * Remove cue2toc. It's not actually part of cdrdao, upstream just copied an old version in here. It has its own package, if you want it. (closes: #347241) * Fix some manpage errors (closes: #347981) * Bump to policy 3.6.2 (no changes) * Tidy the description a little -- Andrew Suffield Wed, 18 Jan 2006 18:57:39 +0000 cdrdao (1:1.2.1-2) unstable; urgency=low * Fix stupid bug that makes the package impossible to build. So the question is, why did it build for me? (closes: #340691) -- Andrew Suffield Fri, 25 Nov 2005 19:26:09 +0000 cdrdao (1:1.2.1-1) unstable; urgency=low * New upstream release - Unbreak toc2cue (closes: #222036) - Includes newer scsilib version with amd64 support - note that this is completely untestable and not in Debian anyway, so don't bother filing bugs about it not working (closes: #249634, #249642, #326472) * Clean up dead Suggests relation to gcdmaster (closes: #311738) * Fix copyright file to include upstream authors (closes: #337360) * Fix manpage to include current authors (closes: #300958) * Completely disable the ability to run setuid root, and expand the description in README.Debian. That should be the end of security issues in cdrdao. (closes: #309735, #133473, #140038) * Bump priority up to optional (was extra) - k3b wants to depend on it -- Andrew Suffield Thu, 24 Nov 2005 22:43:37 +0000 cdrdao (1:1.1.9-3) unstable; urgency=low * It is apparently impossible to build packages with correct dependencies while gcc 3.4 is installed, even if it isn't used. Nothing else is wrong, just the dependencies (closes: #256070). -- Andrew Suffield Thu, 24 Jun 2004 22:33:16 +0100 cdrdao (1:1.1.9-2) unstable; urgency=low * Add a --without-lame to the configure arguments -- Andrew Suffield Thu, 24 Jun 2004 21:38:05 +0100 cdrdao (1:1.1.9-1) unstable; urgency=low * New upstream version (closes: #235429) * Drop gcdmaster; it's slated to be split out upstream anyway, and I don't want to maintain the thing. (closes: #198496) -- Andrew Suffield Wed, 23 Jun 2004 23:16:00 +0100 cdrdao (1:1.1.7-5) unstable; urgency=low * No changes since 1.1.7-4, just re-targetting for unstable. The new libscg seems to work fine. (closes: #207854) -- Andrew Suffield Sat, 06 Dec 2003 15:24:21 +0000 cdrdao (1:1.1.7-4) experimental; urgency=low * Ram in a new version of libscg. This should get the linux 2.5+ ATAPI interface to work. -- Andrew Suffield Thu, 31 Jul 2003 23:16:41 +0100 cdrdao (1:1.1.7-3) unstable; urgency=low * Fiddle with the symlink kludge in scsilib/RULES a bit more. Something changed *again* and it doesn't quite work any more. I really hate this build system. (closes: #196614) * Apply sourceforge patch #717958, relaxing some assertions when reading from certain CDs on certain read-only drives. (closes: #189586, #169787) * Add entry for TEAC 512E to drivers file. (closes: #196559) -- Andrew Suffield Sun, 08 Jun 2003 18:05:20 +0100 cdrdao (1:1.1.7-2) unstable; urgency=low * Repackage with debhelper * Add /etc/default/cdrdao (as opposed to /etc/defaults/cdrdao) to the set of config files read (closes: #149151, #189392). The old /etc/defaults/cdrdao file is still read if present, for now. * Install a menu entry (closes: #163515). * Add README.Debian, with notes about setuid cdrdao and toc2mp3. -- Andrew Suffield Tue, 13 May 2003 16:43:52 +0100 cdrdao (1:1.1.7-1) unstable; urgency=low * Adopt (closes: #192666) A real update will follow in a few days; this one is primarily to change the maintainer address. * Drop old versioned conflict with suidmanager (pre-woody) -- Andrew Suffield Tue, 13 May 2003 16:43:52 +0100 cdrdao (1:1.1.7-0.4) unstable; urgency=medium * [debian/rules, debian/control] Reworked auto* handling: no more build dependency on autotools; handle updating of config.guess and config.sub in 'clean' target; new target 'source-updates'. * [autogen.sh] Copied from CVS. * [configure.in, configure] Provide more information when xcdrdao/gcdmaster cannot be built. Added AC_PREREQ(2.57) so the gtkmm-config test works. -- J.H.M. Dassen (Ray) Sun, 02 Feb 2003 13:57:09 +0100 cdrdao (1:1.1.7-0.3) unstable; urgency=medium * NMU. * Applied patch from Andreas Metzler which hopefully fixes the "parse error before `__const'" FTBFS that most archs got with -0.2: (Closes: #176805) * Change some files in xdao: take care that for every '#include ' there is a '#include ' listed before it. [xcdrdao.cc gcdmaster.cc ViewSwitcher.cc RecordTocSource.cc RecordHDTarget.cc DeviceList.cc CdDevice.cc] I have no idea what I am doing but at least it compiles. -- J.H.M. Dassen (Ray) Sun, 02 Feb 2003 10:46:59 +0100 cdrdao (1:1.1.7-0.2) unstable; urgency=medium * NMU. * Updated build dependencies, gcc 3.2 transition. This fixes the dependency on a libsigc++ that's no longer available in sid. (Closes: #176805) Similarly fixes the libgnomemm dependency. (Closes: #103286) As well as the libgktmm dependency. (Closes: #178271) -- J.H.M. Dassen (Ray) Sat, 01 Feb 2003 18:43:02 +0100 cdrdao (1:1.1.7-0.1) unstable; urgency=high * Urgency high because it fixes copyright issues. * New upstream version 1.1.7 (Closes: #161885) - Don't use and depend on non-free libedc any more (Closes: #162788) * Use config.sub and config.guess from autotools-dev (add build-dependeny) * remove and generate symlinks in RULES for ia64 parisc(64) and s390 The last NMU copied the files for s390 instead, making the patch grow. * These two things could fix 116782, at least partially. * Update Build-Deps: libgtkmm-dev >= 1.2.9 -- Andreas Metzler Mon, 07 Oct 2002 11:31:10 +0200 cdrdao (1:1.1.5-3.1) unstable; urgency=low * Non-maintainer upload * Add support for s390. (Closes: #123992) -- Gerhard Tonn Fri, 01 Feb 2002 17:08:00 +0100 cdrdao (1:1.1.5-3) unstable; urgency=low * Remove suid-root status due to security issues. (closes: #127930) * Include toc2cue utility in package. (closes: #116449) -- Martin Mitchell Sat, 19 Jan 2002 22:08:00 +1100 cdrdao (1:1.1.5-2) unstable; urgency=low * Update to standards version 3.5.5. * Recompile gcdmaster with new libs. (closes: #102621) -- Martin Mitchell Sun, 01 Jul 2001 14:10:54 +1000 cdrdao (1:1.1.5-1) unstable; urgency=low * New upstream release. (closes: #96889, #96891, #79585) * Update to standards version 3.5.4. -- Martin Mitchell Thu, 24 May 2001 00:56:16 +1000 cdrdao (1:1.1.4-4) unstable; urgency=low * Include fix for sparc compiling. (closes: #87031, #89961) * Small fix to information output when keeping images. (closes: #85177) -- Martin Mitchell Mon, 19 Mar 2001 10:45:00 +1100 cdrdao (1:1.1.4-3) unstable; urgency=low * Include fix for arm compiling. (closes: #87322) * Update to standards version 3.5.2. -- Martin Mitchell Mon, 19 Mar 2001 10:10:16 +1100 cdrdao (1:1.1.4-2) unstable; urgency=low * Split gcdmaster to separate package. (closes: #80515) * Correct formatting in manpage. (closes: #82816) * Remove suidregister support. -- Martin Mitchell Sat, 27 Jan 2001 14:10:06 +1100 cdrdao (1:1.1.4-1) unstable; urgency=low * New upstream release. (closes: #66998, #66983, #70534, #72293, #74261) * Fixes suid use file ownership. (closes: #58319) * Update copyright information. * Update to standards version 3.2.1. -- Martin Mitchell Sun, 08 Oct 2000 00:06:20 +1100 cdrdao (1:1.1.3-3) unstable; urgency=low * Add missing build dependency. (closes: #54022) -- Martin Mitchell Sun, 09 Jan 2000 01:52:32 +1100 cdrdao (1:1.1.3-2) unstable; urgency=low * Update to standards version 3.1.1. * Recompile with latest libstdc++ library. (closes: #52107, #53473) -- Martin Mitchell Tue, 28 Dec 1999 19:54:52 +1100 cdrdao (1:1.1.3-1) unstable; urgency=low * New upstream release. (closes: #48746, #29933) * Reintroduce xcdrdao to package. (closes: #40228) * Add suidregister support. (closes #47462) -- Martin Mitchell Sun, 31 Oct 1999 15:41:17 +1100 cdrdao (1:1.1.2-1) unstable; urgency=low * New upstream release. * Update to standards version 3.0.1 -- Martin Mitchell Thu, 05 Aug 1999 01:41:25 +1000 cdrdao (1:1.1.1-1) unstable; urgency=low * New upstream release. * Drop support for xcdrdao, for now. (#39482,#39577) * Update to standards version 2.5.1. -- Martin Mitchell Sat, 19 Jun 1999 22:23:11 +1000 cdrdao (1:1.1.0-1) unstable; urgency=low * New upstream release. * Fix build problems on alpha. (#36083) -- Martin Mitchell Sat, 17 Apr 1999 15:29:39 +1000 cdrdao (1.010-1) unstable; urgency=low * New upstream release. -- Martin Mitchell Wed, 27 Jan 1999 22:14:35 +1100 cdrdao (1.09-1) unstable; urgency=low * New upstream release. -- Martin Mitchell Tue, 27 Oct 1998 18:40:56 +1100 cdrdao (1.08-1) unstable; urgency=low * New upstream release. -- Martin Mitchell Fri, 09 Oct 1998 17:35:02 +1000 cdrdao (1.07-1) unstable; urgency=low * New upstream release. -- Martin Mitchell Fri, 25 Sep 1998 22:29:44 +1000 cdrdao (1.06-1) unstable; urgency=low * Initial Release -- Martin Mitchell Fri, 18 Sep 1998 22:26:27 +1000 debian/cdrdao.README.Debian0000644000000000000000000000323512143544163012470 0ustar cdrdao for Debian ----------------- 1. Running cdrdao as a non-root user In the past, cdrdao has been installed setuid root. Due to security issues, this was removed. Such security issues probably still remain at this time. If you make cdrdao setuid, then it is likely it can be leveraged to gain full shell access to the relevant uid. To make this firmly clear, cdrdao will drop setuid root privileges on startup. In order to allow regular users to run cdrdao, you can grant them access to the relevant device nodes. If you're using scsi emulation or a genuine scsi burner, this will probably be a /dev/scd and a /dev/sg node - for device 0,1,0, /dev/scd1 and /dev/sg1. This will grant access to all users in the cdrom group: chgrp cdrom /dev/scd1 /dev/sg1 chmod g+rw /dev/scd1 /dev/sg1 If you're using the ATAPI packet writing interface in linux 2.6, it'll just be /dev/hdc or similar, and the installer probably already set this up for you. Then use "adduser user cdrom" to add the users to the cdrom group. One side-effect of this is that cdrdao will not run with real-time priority. There is currently no easy, safe way to grant this. With a modern CD writer, it probably won't matter, but it may cause buffer underruns if the system is under significant load while burning. If this really bothers you, use sudo to run cdrdao, and be aware that any user who can run cdrdao can probably gain root if they really want to. 2. toc2mp3 The toc2mp3 utility provided in the cdrdao source requires lame in order to work. For legal reasons, lame is not included in Debian, so toc2mp3 is not included either. -- Andrew Suffield Thu, 24 Nov 2005 22:24:24 +0000