Hi,
For me, the following change to 13_cdrecord_to_wodim.patch fixes this.
Please test, as my setup is pretty nonstandard (i.e., not a Debian
box.). (Since this overwrites everything from 12_*.patch, the latter
should probably be removed.)
Best,
--Lorenz
--- xcdroast/debian/patches/13_cdrecord_to_wodim.patch 2006-12-06
15:11:23.000000000 +0100
+++ 13_cdrecord_to_wodim.patch 2006-12-06 15:10:37.000000000 +0100
@@ -690,7 +681,28 @@
}
}
}
-@@ -10137,7 +10140,7 @@
+@@ -10007,7 +10032,7 @@
+
+ strcpy(ver,"");
+ get_wrap_path("MKISOFS",line);
+- strcat(line," -version 2>/dev/null");
++ strcat(line," --version 2>/dev/null");
+
+ dodebug(1, "calling: %s\n", line);
+ if ((fpin = popen(line,"r")) == NULL) {
+@@ -10034,9 +10059,9 @@
+ /* now line contains the version string of mkisofs */
+ /* try to extract the version number */
+
+- p = strstr(line,"mkisofs");
++ p = strstr(line, MKISOFS_NAME);
+ if (p != NULL) {
+- p = strtok(p+8, " ");
++ p = strtok(p + (sizeof(MKISOFS_NAME) - 1) + 1, " ");
+ if (p != NULL) {
+ strcpy(ver,p);
+ }
+@@ -10137,7 +10162,7 @@
strcpy(ver,"");
get_wrap_path("READCD",line);
@@ -699,9 +711,22 @@
dodebug(1, "calling: %s\n", line);
if ((fpin = popen(line,"r")) == NULL) {
-diff -ur xcdroast-0.98+0alpha15.orig/src/main.c
xcdroast-0.98+0alpha15/src/main.c
---- xcdroast-0.98+0alpha15.orig/src/main.c 2006-10-24 01:44:15.000000000
+0000
-+++ xcdroast-0.98+0alpha15/src/main.c 2006-10-22 13:15:10.000000000 +0000
+@@ -10164,9 +10189,9 @@
+ /* now line contains the version string of readcd */
+ /* try to extract the version number */
+
+- p = strstr(line,"readcd");
++ p = strstr(line, READCD_NAME);
+ if (p != NULL) {
+- p = strtok(p+7, " ");
++ p = strtok(p + (sizeof(READCD_NAME) - 1) + 1, " ");
+ if (p != NULL) {
+ strcpy(ver,p);
+ }
+Index: xcdroast/src/main.c
+===================================================================
+--- xcdroast.orig/src/main.c 2006-12-06 14:47:54.000000000 +0100
++++ xcdroast/src/main.c 2006-12-06 14:47:54.000000000 +0100
@@ -227,7 +227,7 @@
gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0);
@@ -902,39 +931,55 @@
gint support_ontheflyaudio;
gint writer_devnr;
gint reader_devnr;
-diff -ur xcdroast-0.98+0alpha15.orig/src/xcdroast.h
xcdroast-0.98+0alpha15/src/xcdroast.h
---- xcdroast-0.98+0alpha15.orig/src/xcdroast.h 2006-10-24 01:44:15.000000000
+0000
-+++ xcdroast-0.98+0alpha15/src/xcdroast.h 2006-10-24 01:43:05.000000000
+0000
-@@ -112,19 +112,23 @@
+Index: xcdroast/src/xcdroast.h
+===================================================================
+--- xcdroast.orig/src/xcdroast.h 2006-12-06 14:47:54.000000000 +0100
++++ xcdroast/src/xcdroast.h 2006-12-06 15:00:30.000000000 +0100
+@@ -112,11 +112,19 @@
then in $PREFIX (e.g. /usr/bin/cdrecord instead of
/usr/local/lib/xcdroast-0.98/bin/cdrecord) */
-#define CDRECORD "bin/cdrecord"
-#define CDRECORDPRODVD "bin/cdrecord.prodvd"
+-#define CDDA2WAV "bin/cdda2wav"
+-#define READCD "bin/readcd"
+-#define MKISOFS "bin/mkisofs"
+#define CDRECORD "bin/wodim"
+#define CDRECORDDVD "bin/wodim"
- #define CDDA2WAV "bin/cdda2wav"
- #define READCD "bin/readcd"
- #define MKISOFS "bin/mkisofs"
-
++#define CDDA2WAV "bin/icedax"
++#define READCD "bin/readom"
++#define MKISOFS "bin/genisoimage"
++
+#define CDRECORD_NAME "wodim"
+#define CDRECORDDVD_NAME "wodim"
+#define CDRECORDDVD_IS_FREE
+
++#define CDDA2WAV_NAME "icedax"
++#define READCD_NAME "readom"
++#define MKISOFS_NAME "genisoimage"
+
/* MINIMUM required versions. Greater versions are now silently
accepted.
- Distribution-Vendors: DO NOT TOUCH THESE!
+@@ -124,11 +132,11 @@
IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */
#define CDRECORD_VERSION "1.11a34"
-#define CDRECORD_PRODVD_VERSION "2.01.01"
+#define CDRECORDDVD_VERSION "2.01.01"
#define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01.01"
- #define MKISOFS_VERSION "1.15a17"
- #define CDDA2WAV_VERSION "1.11a34"
-diff -ur xcdroast-0.98+0alpha15.orig/src/xcdrwrap.c
xcdroast-0.98+0alpha15/src/xcdrwrap.c
---- xcdroast-0.98+0alpha15.orig/src/xcdrwrap.c 2006-10-24 01:44:02.000000000
+0000
-+++ xcdroast-0.98+0alpha15/src/xcdrwrap.c 2006-10-22 13:18:50.000000000
+0000
+-#define MKISOFS_VERSION "1.15a17"
+-#define CDDA2WAV_VERSION "1.11a34"
+-#define READCD_VERSION "1.11a34"
++#define MKISOFS_VERSION "1.1.0"
++#define CDDA2WAV_VERSION "1.1.0"
++#define READCD_VERSION "1.1.0"
+
+ /* group to use for non-root-mode */
+ /* #define NONROOTMODEGROUP "xcdwrite" - HISTORIC */
+Index: xcdroast/src/xcdrwrap.c
+===================================================================
+--- xcdroast.orig/src/xcdrwrap.c 2006-12-06 14:47:54.000000000 +0100
++++ xcdroast/src/xcdrwrap.c 2006-12-06 14:47:54.000000000 +0100
@@ -277,8 +277,8 @@
strcpy(ret, CDRECORD);
return ret;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
