add a "-r" flag that enables a "raw" mode - copy the data out in 2352

sector chunks.  this flag has already been included by the upstream and
will be in the next release of bchunk.

3 files changed, 74 insertions, 1 deletions

diff --git a/sysutils/bchunk/distinfo b/sysutils/bchunk/distinfo
index 5c3ccd71c63..29bf4c8f2f0 100644
--- a/sysutils/bchunk/distinfo
+++ b/sysutils/bchunk/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/11/04 03:28:45 tv Exp $
+$NetBSD: distinfo,v 1.5 2003/08/25 12:11:29 mrg Exp $
 
 SHA1 (bchunk-1.1.1.tar.gz) = a3d25cf8a53e2b4f1793f44b53569ffe587a6a2b
 Size (bchunk-1.1.1.tar.gz) = 14633 bytes
+SHA1 (patch-aa) = 26373282c599914ec869775802d209d6c1cc73a9
+SHA1 (patch-ab) = ae144230a5f7b62bc166e3f7ab1e20702d3a2129
diff --git a/sysutils/bchunk/patches/patch-aa b/sysutils/bchunk/patches/patch-aa
new file mode 100644
index 00000000000..473fa125aef
--- /dev/null
+++ b/sysutils/bchunk/patches/patch-aa
@@ -0,0 +1,22 @@
+--- bchunk.1.orig	2001-08-07 21:20:31.000000000 +1000
++++ bchunk.1	2003-07-18 23:57:34.000000000 +1000
+@@ -2,7 +2,7 @@
+ .SH NAME
+ bchunk \- CD image format conversion from bin/cue to iso/cdr
+ .SH SYNOPSIS
+-.B bchunk [-v] [-p] [-w] [-s] <image.bin> <image.cue> <basename>
++.B bchunk [-v] [-p] [-r] [-w] [-s] <image.bin> <image.cue> <basename>
+ .SH DESCRIPTION
+ .LP
+ .B bchunk 
+@@ -41,6 +41,10 @@
+ makes binchunker go into PSX mode and truncate MODE2/2352 tracks to
+ 2336 bytes at offset 0 instead of normal 2048 bytes at offset 24.
+ (untested, please let me know if this actually works)
++.TP 10
++.BI \-r
++makes binchunker output MODE2/2352 tracks in raw format, from offset
++0 for 2352 bytes.
+ .SH FILES
+ .LP
+ .TP 5
diff --git a/sysutils/bchunk/patches/patch-ab b/sysutils/bchunk/patches/patch-ab
new file mode 100644
index 00000000000..f29464ad4a7
--- /dev/null
+++ b/sysutils/bchunk/patches/patch-ab
@@ -0,0 +1,49 @@
+--- bchunk.c.orig	2001-08-07 21:18:29.000000000 +1000
++++ bchunk.c	2003-07-18 23:56:09.000000000 +1000
+@@ -25,10 +25,11 @@
+ #include <unistd.h>
+ 
+ #define VERSION "1.1.1"
+-#define USAGE "Usage: bchunk [-v] [-p (PSX)] [-w (wav)] [-s (swabaudio)]\n" \
++#define USAGE "Usage: bchunk [-v] [-r] [-p (PSX)] [-w (wav)] [-s (swabaudio)]\n" \
+         "         <image.bin> <image.cue> <basename>\n" \
+ 	"Example: bchunk foo.bin foo.cue foo\n" \
+ 	"  -v  Verbose mode\n" \
++	"  -r  Raw mode\n" \
+ 	"  -p  PSX mode: truncate MODE2/2352 to 2336 bytes instead of normal 2048\n" \
+ 	"  -w  Output audio files in WAV format\n" \
+ 	"  -s  swabaudio: swap byte order in audio tracks\n"
+@@ -88,6 +89,7 @@
+ char *cuefile = NULL;
+ int verbose = 0;
+ int psxtruncate = 0;
++int raw = 0;
+ int swabaudio = 0;
+ int towav = 0;
+ 
+@@ -99,8 +101,11 @@
+ {
+ 	int s;
+ 	
+-	while ((s = getopt(argc, argv, "swvp?h")) != -1) {
++	while ((s = getopt(argc, argv, "swvp?hr")) != -1) {
+ 		switch (s) {
++			case 'r':
++				raw = 1;
++				break;
+ 			case 'v':
+ 				verbose = 1;
+ 				break;
+@@ -190,7 +195,11 @@
+ 		
+ 	} else if (!strcasecmp(modes, "MODE2/2352")) {
+ 		track->extension = ext_iso;
+-		if (psxtruncate) {
++		if (raw) {
++			/* Raw MODE2/2352 */
++			track->bstart = 0;
++			track->bsize = 2352;
++		} else if (psxtruncate) {
+ 			/* PSX: truncate from 2352 to 2336 byte tracks */
+ 			track->bstart = 0;
+ 			track->bsize = 2336;