diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-06-22 01:15:33 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-06-22 01:15:33 +0000 |
| commit | 61f6407cf34be4a226b749f2b36c1e64fb21c2a0 (patch) | |
| tree | 746748cf45a5f5f6ee9c93eb8df73919a47d16bd /audio | |
| parent | da23cba2f64b66790e2156b1e4003d6bc45ad979 (diff) | |
| download | pkgsrc-61f6407cf34be4a226b749f2b36c1e64fb21c2a0.tar.gz | |
Properly recognize Toshiba ATAPI CDROM/DVD.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/cdparanoia/files/patch-sum | 4 | ||||
| -rw-r--r-- | audio/cdparanoia/patches/patch-cg | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/audio/cdparanoia/files/patch-sum b/audio/cdparanoia/files/patch-sum index cf731a202d9..10c16e1395a 100644 --- a/audio/cdparanoia/files/patch-sum +++ b/audio/cdparanoia/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.5 2000/06/22 00:41:17 wiz Exp $ +$NetBSD: patch-sum,v 1.6 2000/06/22 01:15:33 hubertf Exp $ MD5 (patch-aa) = 598f4761b68407f819fa9b8c67ba627c MD5 (patch-ab) = c3ef67eeb817732c2f29c11dd7048ba4 @@ -12,4 +12,4 @@ MD5 (patch-cc) = 795d7c9f4971ad7804229f757ab4479e MD5 (patch-cd) = ab3d1eaaa4706c77a0e4795f20759c8c MD5 (patch-ce) = 6f15e3f28c38a0058428c5f5981029ad MD5 (patch-cf) = 5d4fa67d7aeb2fec2439f3eba97fc6d6 -MD5 (patch-cg) = 36caf1ef348cef0016c6e95eb3ac3650 +MD5 (patch-cg) = 387fe70a6e9d64403e503f6b2a3112f2 diff --git a/audio/cdparanoia/patches/patch-cg b/audio/cdparanoia/patches/patch-cg index dcb4a0bc83c..58feef320dc 100644 --- a/audio/cdparanoia/patches/patch-cg +++ b/audio/cdparanoia/patches/patch-cg @@ -1,7 +1,5 @@ -$NetBSD: patch-cg,v 1.2 2000/03/13 05:23:29 itohy Exp $ - ---- interface/scsi_interface.c.orig Tue Dec 14 13:28:03 1999 -+++ interface/scsi_interface.c Sat Mar 11 23:11:34 2000 +--- interface/scsi_interface.c.orig Tue Dec 14 05:28:03 1999 ++++ interface/scsi_interface.c Thu Jun 22 03:06:09 2000 @@ -32,6 +32,7 @@ #endif @@ -86,13 +84,13 @@ $NetBSD: patch-cg,v 1.2 2000/03/13 05:23:29 itohy Exp $ + } + sreq->senselen = SENSEBUFLEN; + sreq->timeout = 10000; /* 10s */ - -- if(sg_hd->sense_buffer[0]){ ++ + status = ioctl(d->cdda_fd, SCIOCCOMMAND, (void *) sreq); + if (status < 0) + return(TR_ILLEGAL); +#endif -+ + +- if(sg_hd->sense_buffer[0]){ +#ifdef __linux__ + if(sg_hd->sense_buffer[0]) +#endif @@ -185,3 +183,15 @@ $NetBSD: patch-cg,v 1.2 2000/03/13 05:23:29 itohy Exp $ fprintf(stderr," Transport error: %s\n",strerror_tr[err]); fprintf(stderr," System error: %s\n",strerror(errno)); } +@@ -1376,6 +1463,11 @@ + /* Mt Fuji */ + if(reportp) + cdmessage(d,"\tDrive appears to be Mt. Fuji ATAPI C/DVD\n"); ++ return(1); ++ case 0x32: ++ /* Toshiba DVD */ ++ if(reportp) ++ cdmessage(d,"\tDrive appears to be Toshiba ATAPI C/DVD\n"); + return(1); + default: + if(reportp) |