From 05c1cbe5213dc97b830974720a4545ac487c3910 Mon Sep 17 00:00:00 2001 From: simonb Date: Sat, 6 Jan 2001 06:47:19 +0000 Subject: Update to cdd-1.0nb3, with the following changes (by me): + Add a -w flag to output WAV files instead of raw audio. + Add the "TOSHIBA DVD-ROM SD-C2402" DVD drive. + Handle a CDDCPPFLAGS mk.conf variable, can be used to set a C preprocessor CDD_MMC_SPEED define (maximum value of 65535) for some DVD's that don't get MMC setspeed requests right (eg, the drive mentioned above). + Fold existing pkgsrc patches into distribution tar file. --- audio/cdd/Makefile | 11 +++- audio/cdd/files/md5 | 4 +- audio/cdd/files/patch-sum | 10 +-- audio/cdd/patches/patch-aa | 21 ------ audio/cdd/patches/patch-ab | 161 --------------------------------------------- audio/cdd/patches/patch-ac | 11 ---- audio/cdd/patches/patch-ad | 61 ----------------- 7 files changed, 15 insertions(+), 264 deletions(-) delete mode 100644 audio/cdd/patches/patch-aa delete mode 100644 audio/cdd/patches/patch-ab delete mode 100644 audio/cdd/patches/patch-ac delete mode 100644 audio/cdd/patches/patch-ad (limited to 'audio/cdd') diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile index bdae4f6d10b..e8b721343a2 100644 --- a/audio/cdd/Makefile +++ b/audio/cdd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 1999/12/24 00:59:45 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/01/06 06:47:19 simonb Exp $ -DISTNAME= cdd-1.0myc2 -WRKSRC= ${WRKDIR}/cdd +DISTNAME= cdd-1.0nb3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,6 +8,12 @@ MAINTAINER= thorpej@netbsd.org BUILD_DEPENDS+= ${PREFIX}/lib/libscsi.a:../../devel/libscsi +.include "../../mk/bsd.prefs.mk" + +.if defined(CDDCPPFLAGS) +MAKE_ENV+= "CDDCPPFLAGS=${CDDCPPFLAGS}" +.endif + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/cdd ${PREFIX}/bin @${INSTALL_PROGRAM} ${WRKSRC}/stripzeros ${PREFIX}/bin diff --git a/audio/cdd/files/md5 b/audio/cdd/files/md5 index 78084741ed4..51ff2eb45e1 100644 --- a/audio/cdd/files/md5 +++ b/audio/cdd/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:16:53 agc Exp $ +$NetBSD: md5,v 1.3 2001/01/06 06:47:20 simonb Exp $ -MD5 (cdd-1.0myc2.tar.gz) = 26e5cd38a4f232b2180db50765c1b3be +MD5 (cdd-1.0nb3.tar.gz) = dbcfb504f99ebd3a192c3d8fdf272e3c diff --git a/audio/cdd/files/patch-sum b/audio/cdd/files/patch-sum index e8501b1f5c2..69228e841d3 100644 --- a/audio/cdd/files/patch-sum +++ b/audio/cdd/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.4 2000/08/21 04:00:22 simonb Exp $ +$NetBSD: patch-sum,v 1.5 2001/01/06 06:47:20 simonb Exp $ -MD5 (patch-aa) = c49a207bd48a87a47e686fb6ebec7015 -MD5 (patch-ab) = c8a3bf1cc2d2d1194b9ac418400e8e86 -MD5 (patch-ac) = 4d0b58755a9ab62c3710a174d8c5bc3e -MD5 (patch-ad) = 2e73b01e469b3a3ada4f8dc043912785 +This placeholder file is generated by the ``makepatchsum'' target +whenever the patches directory is empty or missing. Its purpose +is to ensure that the presence of any obsolete patches will cause +the proper error to be emitted at build time. diff --git a/audio/cdd/patches/patch-aa b/audio/cdd/patches/patch-aa deleted file mode 100644 index d78e3d8fa93..00000000000 --- a/audio/cdd/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1998/11/04 21:12:44 garbled Exp $ - ---- Makefile.orig Sun Mar 29 00:54:57 1998 -+++ Makefile Wed Jul 22 17:17:23 1998 -@@ -1,4 +1,4 @@ - CC = cc --CFLAGS = -g -O3 -Wall -DNETWORK_DB -Ilibscsi -Ist --LDFLAGS = -Llibscsi -lscsi -Lst -lst -+CFLAGS = -g -O3 -Wall -DNETWORK_DB -I${PREFIX}/include -Ist -+LDFLAGS = -L${PREFIX}/lib -lscsi -Lst -lst -lutil - -@@ -16,5 +16,8 @@ - --all: cdd pcmplay stripzeros -+all: stlib cdd pcmplay stripzeros - - $(CDD_OBJECTS): cdd.h -+ -+stlib: -+ cd st; make - diff --git a/audio/cdd/patches/patch-ab b/audio/cdd/patches/patch-ab deleted file mode 100644 index 52170eabfd4..00000000000 --- a/audio/cdd/patches/patch-ab +++ /dev/null @@ -1,161 +0,0 @@ -$NetBSD: patch-ab,v 1.1 1998/11/04 08:27:38 garbled Exp $ ---- cdd.c.orig Wed Nov 4 01:14:06 1998 -+++ cdd.c Wed Nov 4 01:14:11 1998 -@@ -56,8 +56,10 @@ - #include - #include - #include -+#include - #include - #include -+#include - #include "cdd.h" - #include "cdd_cdcmds.h" - #include "cdd_util.h" -@@ -68,11 +70,13 @@ - OPTS G_opts; - - int F_cdctlfd; -+char cd_raw_partition[11]; - - int main(int argc, char *argv[]) - { - CDTOC cdtoc; - int count; -+char ctldev[MAXPATHLEN]; - - strcpy(G_opts.workdir, "/tmp"); - G_opts.onlyaudio = FALSE; -@@ -83,27 +87,12 @@ - G_opts.bequiet = FALSE; - G_opts.dostdout = FALSE; - G_opts.cddb = FALSE; -+strcpy(G_opts.cddev, "cd0"); - - signal(SIGINT, resetcd); - signal(SIGBUS, resetcd); - signal(SIGSEGV, resetcd); - --#ifdef __NetBSD__ --F_cdctlfd=scsi_open("/dev/rcd0d", O_RDWR); --#else --F_cdctlfd=scsi_open("/dev/rcd0.ctl", O_RDWR); --#endif -- --if(F_cdctlfd < 0) -- { --#ifdef __NetBSD__ -- fprintf(stderr,"Unable to open /dev/rcd0d [%d]\n", errno); --#else -- fprintf(stderr,"Unable to open /dev/rcd0.ctl [%d]\n", errno); --#endif -- exit(0); -- } -- - for(count=1;count][-a][-d][-r][-n][-noed][-h]", argv[0]); - fprintf(stderr,"[-p][-q][destdir|-]\n\n"); - fprintf(stderr," -h This help\n"); -+ fprintf(stderr," -c dev Use CD-ROM drive (default: %s)\n", G_opts.cddev); - fprintf(stderr," -t # Copy only Track #\n"); - fprintf(stderr," -a Copy only AUDIO tracks\n"); - fprintf(stderr," -p Play AUDIO during Copy\n"); -@@ -155,11 +156,27 @@ - fprintf(stderr,"any error checking\n\n"); - fprintf(stderr,"Running CDD with no options will show the table of "); - fprintf(stderr,"contents of the CD in the \ndrive\n\n"); -- close(F_cdctlfd); - exit(0); - } - } - -+#ifdef __NetBSD__ -+if (G_opts.cddev[0] == '/') -+ strcpy(ctldev, G_opts.cddev); -+else -+ sprintf(ctldev, "/dev/r%s%c", G_opts.cddev, getrawpartition() + 'a'); -+#else -+sprintf(ctldev, "/dev/r%s.ctl", G_opts.cddev); -+#endif -+ -+F_cdctlfd=scsi_open(ctldev, O_RDWR); -+ -+if(F_cdctlfd < 0) -+ { -+ fprintf(stderr,"Unable to open %s [%d]\n", ctldev, errno); -+ exit(0); -+ } -+ - cdd_printf("\nCDD v%s, Copyright (C) 1996, ", VERSION); - cdd_printf("Charles R. Henrich, All Rights Reserved.\n\n"); - -@@ -367,7 +384,8 @@ - #ifdef __NetBSD__ - ifd=dup(F_cdctlfd); - #else --ifd=open("/dev/rcd0c", O_RDONLY, 0600); -+sprintf(buffer, "/dev/r%sc", G_opts.cddev); -+ifd=open(buffer, O_RDONLY, 0600); - #endif - - if(ifd < 0) -@@ -375,7 +393,7 @@ - #ifdef __NetBSD__ - fprintf(stderr,"Unable to dup descriptor\n"); - #else -- fprintf(stderr,"Unable to open /dev/rcd0c\n"); -+ fprintf(stderr,"Unable to open %s\n", buffer); - #endif - close(F_cdctlfd); - exit(0); -@@ -435,7 +453,8 @@ - #ifdef __NetBSD__ - ifd=dup(F_cdctlfd); - #else --ifd=open("/dev/rcd0c", O_RDONLY); -+sprintf(buffer, "/dev/r%sc", G_opts.cddev); -+ifd=open(buffer, O_RDONLY); - #endif - - if(ifd < 0) -@@ -443,7 +462,7 @@ - #ifdef __NetBSD__ - fprintf(stderr,"Unable to dup descriptor\n"); - #else -- fprintf(stderr,"Unable to open /dev/rcd0c\n"); -+ fprintf(stderr,"Unable to open %s\n", buffer); - #endif - close(F_cdctlfd); - exit(0); diff --git a/audio/cdd/patches/patch-ac b/audio/cdd/patches/patch-ac deleted file mode 100644 index a3e8f2dfb4d..00000000000 --- a/audio/cdd/patches/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/11/04 08:27:38 garbled Exp $ ---- cdd.h.orig Mon Jul 14 02:56:31 1997 -+++ cdd.h Sun Nov 1 19:18:58 1998 -@@ -85,6 +85,7 @@ - int bequiet; - int dostdout; - int cddb; -+ char cddev[MAXPATHLEN]; - } OPTS; - - typedef struct tocentry diff --git a/audio/cdd/patches/patch-ad b/audio/cdd/patches/patch-ad deleted file mode 100644 index 17ceb86b76a..00000000000 --- a/audio/cdd/patches/patch-ad +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2000/08/21 04:00:23 simonb Exp $ - - -Note: before adding drives to the compatibility list, please test them - thoroughly. This means you should be able to read the same - track off a CD at least 10 times and get identical files out. - Once you've done this for several CD's, then you can say that - the drive has been sufficiently tested, and add it to the list. - - - - ---- cdd_cdcmds.c.orig Sun May 31 17:13:24 1998 -+++ cdd_cdcmds.c Sun Aug 20 23:45:24 2000 -@@ -160,6 +160,46 @@ - mmc_end_cdda - } - , -+ { -+ "SONY CDU4811", -+ mmc_getcdtoc, -+ mmc_cd_setblocksize, -+ mmc_cdrawread, -+ mmc_cddaread, -+ mmc_begin_cdda, -+ mmc_end_cdda -+ } -+ , -+ { -+ "MATSHITA CD-R CW-7502", -+ mmc_getcdtoc, -+ mmc_cd_setblocksize, -+ mmc_cdrawread, -+ mmc_cddaread, -+ mmc_begin_cdda, -+ mmc_end_cdda -+ } -+ , -+ { -+ "MATSHITA CD-R CW-7582", -+ mmc_getcdtoc, -+ mmc_cd_setblocksize, -+ mmc_cdrawread, -+ mmc_cddaread, -+ mmc_begin_cdda, -+ mmc_end_cdda -+ } -+ , -+ { -+ "TEAC CD-532E-A", -+ mmc_getcdtoc, -+ mmc_cd_setblocksize, -+ mmc_cdrawread, -+ mmc_cddaread, -+ mmc_begin_cdda, -+ mmc_end_cdda -+ } -+ , - { - "END-OF-DEVICES", - unsupported, -- cgit v1.2.3