diff options
author | abs <abs> | 2003-01-31 11:02:28 +0000 |
---|---|---|
committer | abs <abs> | 2003-01-31 11:02:28 +0000 |
commit | 49b594ad26be66b9c4728359b05355f83ff4ff64 (patch) | |
tree | 9e2d6d2415bfb92b807c059402bbef2467f69c69 /sysutils | |
parent | 95234672411b015d44346582eff6f4f77906d5eb (diff) | |
download | pkgsrc-49b594ad26be66b9c4728359b05355f83ff4ff64.tar.gz |
Update dvdrecord to 0.1.3nb1
Pull across scanbus patch from cdrecord
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/dvdrecord/Makefile | 3 | ||||
-rw-r--r-- | sysutils/dvdrecord/distinfo | 5 | ||||
-rw-r--r-- | sysutils/dvdrecord/patches/patch-aa | 4 | ||||
-rw-r--r-- | sysutils/dvdrecord/patches/patch-ab | 107 |
4 files changed, 114 insertions, 5 deletions
diff --git a/sysutils/dvdrecord/Makefile b/sysutils/dvdrecord/Makefile index a79383b8d4a..9a5397cd264 100644 --- a/sysutils/dvdrecord/Makefile +++ b/sysutils/dvdrecord/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2003/01/25 10:10:06 toshii Exp $ +# $NetBSD: Makefile,v 1.3 2003/01/31 11:02:28 abs Exp $ DISTNAME= dvdrtools-${VERSION} PKGNAME= ${DISTNAME:S/dvdrtools/dvdrecord/} +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://freesoftware.fsf.org/download/dvdrtools/dvdrtools.pkg/${VERSION}/ EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/dvdrecord/distinfo b/sysutils/dvdrecord/distinfo index bdba5799b97..c2f081d50f1 100644 --- a/sysutils/dvdrecord/distinfo +++ b/sysutils/dvdrecord/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/01/17 13:53:11 toshii Exp $ +$NetBSD: distinfo,v 1.2 2003/01/31 11:02:29 abs Exp $ SHA1 (dvdrtools-0.1.3.tar.bz2) = ec654042b669b06324e0dc46919426ea6588d613 Size (dvdrtools-0.1.3.tar.bz2) = 1165042 bytes -SHA1 (patch-aa) = e85833a5974be236904b99372698d03ac53d1f35 +SHA1 (patch-aa) = 6463dd7852df43089724976c75a24ea41d9a66bc +SHA1 (patch-ab) = 3ba572ffbe59a068e01e73af1035711c4a373578 diff --git a/sysutils/dvdrecord/patches/patch-aa b/sysutils/dvdrecord/patches/patch-aa index 260967dafaf..9c61a7a5ff9 100644 --- a/sysutils/dvdrecord/patches/patch-aa +++ b/sysutils/dvdrecord/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/01/17 13:53:11 toshii Exp $ +$NetBSD: patch-aa,v 1.2 2003/01/31 11:02:29 abs Exp $ ---- Makefile.in.orig Wed Jan 1 23:32:41 2003 +--- Makefile.in.orig Wed Jan 1 14:32:41 2003 +++ Makefile.in @@ -133,8 +133,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ diff --git a/sysutils/dvdrecord/patches/patch-ab b/sysutils/dvdrecord/patches/patch-ab new file mode 100644 index 00000000000..4691cf0b7e7 --- /dev/null +++ b/sysutils/dvdrecord/patches/patch-ab @@ -0,0 +1,107 @@ +$NetBSD: patch-ab,v 1.1 2003/01/31 11:02:29 abs Exp $ + +--- libscg/scsi-bsd.c.orig Tue Jan 29 17:23:22 2002 ++++ libscg/scsi-bsd.c +@@ -48,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.40"; /* The version for this transport*/ ++LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.40nb1"; /* The version for this transport*/ + + #define MAX_SCG 16 /* Max # of SCSI controllers */ + #define MAX_TGT 16 +@@ -108,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); + } +@@ -130,6 +130,15 @@ scgo_open(scgp, device) + register int l; + register int nopen = 0; + char devname[64]; ++#if defined(__NetBSD__) ++ struct scsi_addr mysaddr; ++#if defined(__i386__) ++ char slicename[] = "d"; /* i386 is special */ ++#else ++ char slicename[] = "c"; /* this is what the rest uses */ ++#endif ++ char *myslicename = slicename; ++#endif + + if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) { + errno = EINVAL; +@@ -156,6 +165,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%s", l, 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 goto openbydev; ++ } ++ } else for (l=0; l < MAX_LUN ; l++) { ++ sprintf(devname, "/dev/rcd%d%s", l, 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), +@@ -192,6 +255,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. |