head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.12 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.10 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.8 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.6 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.2 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.4.0.16 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.14 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.12 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.10 pkgsrc-2008Q1:1.4.0.8 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2008.11.05.19.48.51; author wiz; state dead; branches; next 1.4; 1.4 date 2007.06.08.17.30.09; author wiz; state Exp; branches; next 1.3; 1.3 date 2006.02.04.12.05.17; author wiz; state Exp; branches; next 1.2; 1.2 date 2004.08.04.21.19.26; author wiz; state Exp; branches; next 1.1; 1.1 date 2003.12.17.16.09.07; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.12.17.16.09.07; author wiz; state Exp; branches; next ; desc @@ 1.5 log @Remove cdrtools-ossdvd, which was a patched version of cdrtools-2.01.01a05. It is not maintained upstream any longer and the need for it is gone; the current cdrtools package does all it did. @ text @$NetBSD: patch-ai,v 1.4 2007/06/08 17:30:09 wiz Exp $ --- libscg/scsi-bsd.c.orig 2004-01-14 23:13:05.000000000 +0000 +++ libscg/scsi-bsd.c @@@@ -39,6 +39,7 @@@@ static char __sccsid[] = #undef sense #include +#include /* * Warning: you may change this source, but if you do that @@@@ -47,7 +48,7 @@@@ static char __sccsid[] = * Choose your name instead of "schily" and make clear that the version * string is related to a modified source. */ -LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/ +LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42nb1"; /* The version for this transport*/ #define MAX_SCG 16 /* Max # of SCSI controllers */ #define MAX_TGT 16 @@@@ -107,7 +108,7 @@@@ scgo_version(scgp, what) * return "schily" for the SCG_AUTHOR request. */ case SCG_AUTHOR: - return (_scg_auth_schily); + return ("frueauf"); case SCG_SCCS_ID: return (__sccsid); } @@@@ -139,6 +140,10 @@@@ scgo_open(scgp, device) register int l; register int nopen = 0; char devname[64]; +#if defined(__NetBSD__) + struct scsi_addr mysaddr; + int myslicename = getrawpartition(); +#endif if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) { errno = EINVAL; @@@@ -165,6 +170,60 @@@@ scgo_open(scgp, device) if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2)) goto openbydev; + +/* + * I know of no method in NetBSD to probe the scsibus and get the mapping + * busnumber,target,lun --> devicename. + * + * Because of this implement a true bruteforce hack to find + * out what cdroms there are. + * + * Note that this method only finds cd0-cd7. Anything higher + * than this needs additional tweaks. + * + * Feel free to implement this cleanly if you have better knowledge. + * Until then this helps to get -scanbus und thus xcdroast working :-) + * + */ +#if defined(__NetBSD__) + if (busno >= 0 && tgt >= 0 && tlun >= 0) { + for (l=0; l < MAX_LUN ; l++) { + sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename); + f = open(devname, O_RDWR); + if (f >= 0) { + if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) { + close(f); + errno = EINVAL; + return (0); + } + if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) { + scglocal(scgp)->scgfiles[busno][tgt][tlun] = f; + return(1); + } + } + } + } else for (l=0; l < MAX_LUN ; l++) { + sprintf(devname, "/dev/rcd%d%c", l, 'a' + myslicename); + f = open(devname, O_RDWR); + if (f >= 0) { + if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) { + close(f); + errno = EINVAL; + return (0); + } + scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr); + scg_target(scgp) = tgt = SADDR_TARGET(mysaddr); + if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) { + close(f); + errno = EINVAL; + return (0); + } + scg_lun(scgp) = tlun = SADDR_LUN(mysaddr); + if (scg_setup(scgp, f, busno, tgt, tlun)) + nopen++; + } + } +#else /* not __NetBSD__ */ if (busno >= 0 && tgt >= 0 && tlun >= 0) { js_snprintf(devname, sizeof (devname), @@@@ -201,6 +260,7 @@@@ scgo_open(scgp, device) } } } +#endif /* end of not __NetBSD__ */ /* * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@@,l * We do the apropriate tests and try our best. @ 1.4 log @Sergevy Svishchev writes (in PR 35481): k3b uses cdrecord for CD-R[W] writing tasks and invokes it with 'dev=,,' argument. The code in scsi-bsd.c attempts to find a device node (/dev/rcd?d) that matches these , and ; this code stops after first failure. If cd0 does not exist, but cd1 does, the code will fail to match cd1. Also, the code doesn't use getrawpartition(). Apply his patches for both problems. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to 2.01.01a05, syncing patches with wip/cdrtools-devel. Changes: * Thu Feb 02 2006 - Release of a GPL compliant 2.01.01a05-ossdvd patch. This patch is for cdrtools-2.01.01a05.tar.bz2 and is adjusted to work with linux kernel 2.6.12 or higher and can be compiled with gcc-4.0.x. The rawio patch using libcap has been migrated to cdrtools-2.01.01a05-rawio.patch.bz2 . The patch called cdrtools-2.01.01-scsibuf.patch.bz has become redundant, as this has been integrated inside cdrtools-2.01.01a05.tar.bz2 . RPMS and SRPMS have been updated for mandriva 2006.0. The order of applying patches is now : 1. cdrtools-2.01.01a05-ossdvd.patch.bz2 .ossdvd 2. cdrtools-2.01.01a01-DVD-speed.patch.bz2 .dvd-speed 3. cdrtools-2.01.01a05-rawio.patch.bz2 .rawio 4. cdrtools-2.01.01a01-scanbus.patch.bz2 .scanbus Warly's Cdrecord DVD patch and others can now be found on http://people.mandriva.com/~warly/files/cdrtools/ @ text @d5 9 a13 1 @@@@ -47,7 +47,7 @@@@ static char __sccsid[] = d22 1 a22 1 @@@@ -107,7 +107,7 @@@@ scgo_version(scgp, what) d31 1 a31 1 @@@@ -139,6 +139,15 @@@@ scgo_open(scgp, device) d37 1 a37 6 +#if defined(__i386__) || defined(__amd64__) + char slicename[] = "d"; /* i386 is special */ +#else + char slicename[] = "c"; /* this is what the rest uses */ +#endif + char *myslicename = slicename; d42 1 a42 1 @@@@ -165,6 +174,60 @@@@ scgo_open(scgp, device) d64 1 a64 1 + sprintf(devname, "/dev/rcd%d%s", l, myslicename); d76 1 a76 1 + } else goto openbydev; d79 1 a79 1 + sprintf(devname, "/dev/rcd%d%s", l, myslicename); d103 1 a103 1 @@@@ -201,6 +264,7 @@@@ scgo_open(scgp, device) @ 1.2 log @Update to 2.01a27: - New option -tao is now needed if you like to write in TAO mode. Cdrecord now does no longer writes if no write mode has been specified. - New option -sao as alias for -dao. As the official name for the write mo de is SAO, -sao is more correct than -dao. - New paranoia sub option paraopts=overlap=xx This is mainly a bug fix for cdda2wav. Cdda2wav previously _always_ did completely deactivat the dynamic overlapping from libparanoia. Instead, it did set the overlapping to the statical value 0. If you omit paraopts=overlap=xx, cdda2wav will now use dynamic overlaping with -paranoia. If you like the old behavior, use: paraopts=overlap=0 - New paranoia sub option paraopts=minoverlap=xx This sets the minimum dynamic overlap - New paranoia sub option paraopts=maxoverlap=xx This sets the maximum dynamic overlap - Better paranoia statistics output - Fixed a Problem with some Linux sound card drivers that caused cdda2wav to be unable to output to the soundcard. - Trying to add verbose output that estimates the read quality with -paranoia - Support for PowerPC CHRP Boot added - Support for -uid/-gid for UDF Filesystems added - isoinfo now is able to list ElTorito Boot information with -d - isoinfo now correctly shows long RR filenames from CE Extension records. - New options -root & -old-root from Patrik Ohly This allows mkisofs to be used for "incremental backups" where each backup is put into a separate directory tree on the CD. And some bug fixes. @ text @d3 1 a3 1 --- libscg/scsi-bsd.c.orig 2004-01-15 00:13:05.000000000 +0100 d5 1 a5 1 @@@@ -48,7 +48,7 @@@@ static char __sccsid[] = d14 1 a14 1 @@@@ -108,7 +108,7 @@@@ scgo_version(scgp, what) d23 1 a23 1 @@@@ -140,6 +140,15 @@@@ scgo_open(scgp, device) d29 1 a29 1 +#if defined(__i386__) d39 1 a39 1 @@@@ -166,6 +175,60 @@@@ scgo_open(scgp, device) d100 1 a100 1 @@@@ -202,6 +265,7 @@@@ scgo_open(scgp, device) @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.3 2003/01/03 16:27:10 lukem Exp $ d3 3 a5 3 --- libscg/scsi-bsd.c.orig Mon Oct 21 15:57:07 2002 +++ libscg/scsi-bsd.c Sat Nov 30 18:20:19 2002 @@@@ -48,7 +48,7 @@@@ d9 2 a10 2 -LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41"; /* The version for this transport*/ +LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41nb1"; /* The version for this transport*/ d14 1 a14 1 @@@@ -108,7 +108,7 @@@@ d23 1 a23 1 @@@@ -140,6 +140,15 @@@@ d39 1 a39 1 @@@@ -166,6 +175,60 @@@@ d99 2 a100 2 js_snprintf(devname, sizeof(devname), @@@@ -202,6 +265,7 @@@@ @ 1.1.1.1 log @Initial import of cdrtools-ossdvd, a patched version of cdrtools with DVD writing support. @ text @@