diff options
Diffstat (limited to 'debian/patches/38_remove_gen_device.patch')
| -rw-r--r-- | debian/patches/38_remove_gen_device.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/debian/patches/38_remove_gen_device.patch b/debian/patches/38_remove_gen_device.patch new file mode 100644 index 0000000..f411858 --- /dev/null +++ b/debian/patches/38_remove_gen_device.patch @@ -0,0 +1,104 @@ +Remove (broken) generic device support from jack + +The current support in jack for "generic devices" is completely +broken. While there is a --gen-device option (corresponding to %D in +jack_helpers), it is actually not used anywhere - only in the cmd_old +of cdda2wav but this is not used. The normal cmd uses %d which is the +normal device. + +Furthermore, jack checks that the device specified as --gen-device +exists (i.e. it assumes it's something like /dev/....). However, +according to latest cdda2wav, it expects a SCSI string a la 1,0,0 +(bus, id, lun). Further tests show that using 1,0,0 or /dev/sr0 +on my system with a USB CD-ROM (i.e. one that shows up as SCSI) does +not make any difference at all. + +My conclusion is that this "generic device" stuff is obsolete. +Current Linux kernels should deal with devices properly, regardless of +them being IDE or SCSI. In fact, I just saw a proposal to get rid of +the ide-scsi stuff in the kernel. + +I'll therefore remove the (broken) generic device support from jack. + + +diff -urN jack-3.1.1+cvs20050801~/jack_config.py jack-3.1.1+cvs20050801/jack_config.py +--- jack-3.1.1+cvs20050801~/jack_config.py 2006-02-13 21:49:58.000000000 +0000 ++++ jack-3.1.1+cvs20050801/jack_config.py 2006-02-13 21:50:33.000000000 +0000 +@@ -64,12 +64,6 @@ + 'usage': "use which device for ripping", + 'long': 'device', + }, +- 'gen_device': { +- 'type': types.StringType, +- 'val': None, +- 'doc': "cdda2wav may need the scsi generic device", +- 'long': 'AUTO', +- }, + 'encoder': { + 'type': types.StringType, + 'val': "oggenc", +diff -urN jack-3.1.1+cvs20050801~/jack_functions.py jack-3.1.1+cvs20050801/jack_functions.py +--- jack-3.1.1+cvs20050801~/jack_functions.py 2006-02-13 21:49:58.000000000 +0000 ++++ jack-3.1.1+cvs20050801/jack_functions.py 2006-02-13 21:50:24.000000000 +0000 +@@ -111,8 +111,6 @@ + "Returns track list" + if jack_helpers.helpers[toc_prog].has_key('toc_cmd'): + cmd = string.replace(jack_helpers.helpers[toc_prog]['toc_cmd'], "%d", cf['_cd_device']) +- if cf['_gen_device']: +- cmd = string.replace(cmd, "%D", cf['_gen_device']) + p = os.popen(cmd) + start = 0 + erg = [] +diff -urN jack-3.1.1+cvs20050801~/jack_helpers.py jack-3.1.1+cvs20050801/jack_helpers.py +--- jack-3.1.1+cvs20050801~/jack_helpers.py 2006-02-13 21:49:58.000000000 +0000 ++++ jack-3.1.1+cvs20050801/jack_helpers.py 2006-02-13 21:51:04.000000000 +0000 +@@ -350,7 +350,6 @@ + ch = [ "none", "mono", "stereo", "three", "quad" ].index(ch) + erg.append([num, length, start, copy, pre, ch, 1, cf['_bitrate'], cf['_name'] % (num + 1)]) + """, +- 'toc_cmd_old': "cdda2wav --no-infofile -D %D -J -v 35 2>&1", + 'toc_fkt_old': r""" + new_c2w = 0 + new_toc1 = 0 +diff -urN jack-3.1.1+cvs20050801~/jack_prepare.py jack-3.1.1+cvs20050801/jack_prepare.py +--- jack-3.1.1+cvs20050801~/jack_prepare.py 2006-02-13 21:49:58.000000000 +0000 ++++ jack-3.1.1+cvs20050801/jack_prepare.py 2006-02-13 21:50:18.000000000 +0000 +@@ -62,9 +62,6 @@ + else: + jack_ripstuff.all_tracks = jack_functions.gettoc(cf['_toc_prog']) + toc_just_read = 1 +- # check that the generic device is usable, too +- if cf['_gen_device'] and not os.access(cf['_gen_device'], os.R_OK | os.W_OK): +- warning(r"""could not open generic device %s for reading and writing.""" % cf['_gen_device']) + + if cf['_scan_dirs']: + dirs = [os.getcwd()] +diff -urN jack-3.1.1+cvs20050801~/jack_workers.py jack-3.1.1+cvs20050801/jack_workers.py +--- jack-3.1.1+cvs20050801~/jack_workers.py 2006-02-13 21:49:58.000000000 +0000 ++++ jack-3.1.1+cvs20050801/jack_workers.py 2006-02-13 21:50:12.000000000 +0000 +@@ -78,7 +78,6 @@ + if i == "%n": args.append(`track[NUM]`) + elif i == "%o": args.append(track[NAME].decode(cf['_charset'], "replace") + ".wav") + elif i == "%d": args.append(cf['_cd_device']) +- elif i == "%D": args.append(cf['_gen_device']) + else: args.append(i) + data = start_new_process(args) + data['type'] = "ripper" +@@ -165,7 +164,6 @@ + for i in string.split(helpers[ripper]['otf-cmd']): + if i == "%n": args.append(`track[NUM]`) + elif i == "%d": args.append(cf['_cd_device']) +- elif i == "%D": args.append(cf['_gen_device']) + else: args.append(i) + data['rip']['start_time'] = time.time() + pid = os.fork() +@@ -205,8 +203,6 @@ + args.append(track[NAME].decode(cf['_charset'], "replace") + jack_targets.targets[jack_helpers.helpers[cf['_encoder']]['target']]['file_extension']) + elif i == "%d": + args.append(cf['_cd_device']) +- elif i == "%D": +- args.append(cf['_gen_device']) + else: + args.append(i) + data['enc']['start_time'] = time.time() + |