rpms/xcdroast/F-7 xcdroast-0.98alpha15-frozen_gui.patch, 1.1, 1.2 xcdroast-0.98alpha15-prodvd.patch, 1.1, 1.2 xcdroast-0.98alpha15-scan.patch, 1.2, 1.3 xcdroast.spec, 1.28, 1.29
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Wed Jun 20 12:59:12 UTC 2007
- Previous message (by thread): rpms/kipi-plugins/devel kipi-plugins-0.1.4-beta2-LIB_KIO.patch, NONE, 1.1 kipi-plugins.spec, 1.35, 1.36
- Next message (by thread): rpms/cdrkit/F-7 .cvsignore, 1.2, 1.3 cdrkit.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/pkgs/rpms/xcdroast/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28957
Modified Files:
xcdroast-0.98alpha15-frozen_gui.patch
xcdroast-0.98alpha15-prodvd.patch
xcdroast-0.98alpha15-scan.patch xcdroast.spec
Log Message:
fixes for cdrkit compat
xcdroast-0.98alpha15-frozen_gui.patch:
Index: xcdroast-0.98alpha15-frozen_gui.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xcdroast/F-7/xcdroast-0.98alpha15-frozen_gui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcdroast-0.98alpha15-frozen_gui.patch 18 Apr 2005 13:33:14 -0000 1.1
+++ xcdroast-0.98alpha15-frozen_gui.patch 20 Jun 2007 12:59:06 -0000 1.2
@@ -1,15 +1,3 @@
-diff -ur xcdroast-0.98alpha15/src/io.c xcdroast-0.98alpha15.new/src/io.c
---- xcdroast-0.98alpha15/src/io.c 2004-12-15 10:28:52.624442832 +0100
-+++ xcdroast-0.98alpha15.new/src/io.c 2004-12-15 10:10:35.000000000 +0100
-@@ -2970,7 +2970,7 @@
-
-
- /* read output of getcdtoc */
-- n = read_line(source, line, MAXLINE);
-+ n = read_line_wait(source, line, MAXLINE);
-
- /* getcdtoc finished */
- if (n <= 0) {
diff -ur xcdroast-0.98alpha15/src/main.h xcdroast-0.98alpha15.new/src/main.h
--- xcdroast-0.98alpha15/src/main.h 2003-10-30 13:49:04.000000000 +0100
+++ xcdroast-0.98alpha15.new/src/main.h 2004-12-15 10:21:34.000000000 +0100
xcdroast-0.98alpha15-prodvd.patch:
Index: xcdroast-0.98alpha15-prodvd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xcdroast/F-7/xcdroast-0.98alpha15-prodvd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xcdroast-0.98alpha15-prodvd.patch 20 Sep 2004 15:58:24 -0000 1.1
+++ xcdroast-0.98alpha15-prodvd.patch 20 Jun 2007 12:59:06 -0000 1.2
@@ -1,6 +1,40 @@
---- xcdroast-0.98alpha15/src/init.c.prodvd 2004-09-20 17:23:03.137510064 +0200
-+++ xcdroast-0.98alpha15/src/init.c 2004-09-20 17:23:03.163506112 +0200
-@@ -440,6 +440,7 @@
+--- xcdroast-0.98alpha15/src/main.c.prodvd 2003-10-30 14:01:01.000000000 +0100
++++ xcdroast-0.98alpha15/src/main.c 2007-06-20 14:15:36.000000000 +0200
+@@ -584,7 +584,7 @@ gint stat;
+ if (curset.isProDVD == 1 && sizeof(off_t) != 8) {
+ show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0);
+ }
+-
++#if 0
+ /* if we are in DVD mode, check if the security-key is set */
+ if (curset.isProDVD == 1) {
+ keyenv = getenv("CDR_SECURITY");
+@@ -593,7 +593,7 @@ gint stat;
+ }
+
+ }
+-
++#endif
+ dolog(1,"Starting X-CD-Roast\n");
+
+ /* install a signal handler to catch CTRL-C */
+--- xcdroast-0.98alpha15/src/xtools.c.prodvd 2007-06-20 14:55:15.000000000 +0200
++++ xcdroast-0.98alpha15/src/xtools.c 2007-06-20 14:54:50.000000000 +0200
+@@ -2403,8 +2403,11 @@ gchar tmp[MAXLINE];
+
+ /* use DVD version if installed and media type > 1GB */
+ if (curset.isProDVD && curset.cdrtype > 1000) {
++ get_spawn_path(CDRECORDPRODVD,tmp);
++ if (is_file(tmp)) {
+ g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER,
+ "CDRECORDPRODVD");
++ }
+ } else {
+ g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER,
+ "CDRECORD");
+--- xcdroast-0.98alpha15/src/init.c.prodvd 2007-06-20 14:15:36.000000000 +0200
++++ xcdroast-0.98alpha15/src/init.c 2007-06-20 14:15:36.000000000 +0200
+@@ -440,6 +440,7 @@ gint out, isProDVD;
gtk_exit(1);
}
}
@@ -8,9 +42,9 @@
get_spawn_path(MKISOFS,tmp);
check_executable(tmp,NULL,1);
---- xcdroast-0.98alpha15/src/io.c.prodvd 2004-09-20 17:23:03.149508240 +0200
-+++ xcdroast-0.98alpha15/src/io.c 2004-09-20 17:23:03.176504136 +0200
-@@ -1491,11 +1491,7 @@
+--- xcdroast-0.98alpha15/src/io.c.prodvd 2007-06-20 14:15:36.000000000 +0200
++++ xcdroast-0.98alpha15/src/io.c 2007-06-20 14:15:36.000000000 +0200
+@@ -1491,11 +1491,7 @@ gchar *p;
if (!dev) return;
/* if prodvd available use it to get additional info */
@@ -23,7 +57,16 @@
g_snprintf(line, MAXLINE, "%s dev= \"%s\" -v -checkdrive 2>&1", tmp, dev);
dodebug(1, "calling: %s\n", line);
-@@ -5556,11 +5552,7 @@
+@@ -2970,7 +2966,7 @@ gchar line[MAXLINE];
+
+
+ /* read output of getcdtoc */
+- n = read_line(source, line, MAXLINE);
++ n = read_line_wait(source, line, MAXLINE);
+
+ /* getcdtoc finished */
+ if (n <= 0) {
+@@ -5556,11 +5552,7 @@ gint found_atip,errcount;
}
/* build command line */
@@ -36,7 +79,7 @@
g_snprintf(line,MAXLINE,"%s %s -atip 2>&1",
tmp3,tmp);
-@@ -5993,7 +5985,7 @@
+@@ -5993,7 +5985,7 @@ gchar tmp[MAXLINE];
/* or cdrecord died by signal? e.g. SIGALRM */
if (WIFSIGNALED(ret) && read_done == 0) {
@@ -45,7 +88,7 @@
if (curset.isProDVD) {
strncpy(tmp, "\nReceived ALARM from cdrecord-ProDVD. Aborting blank...\nInvalid ProDVD key?\n", MAXLINE);
-@@ -6001,7 +5993,7 @@
+@@ -6001,7 +5993,7 @@ gchar tmp[MAXLINE];
gtk_text_insert(GTK_TEXT(readtrack_textview),
fixedfont,NULL,NULL,tmp, strlen(tmp));
read_done = 1;
@@ -54,7 +97,7 @@
}
dodebug(10,"Finished in read_blank_out with status: %d\n",
-@@ -6168,11 +6160,7 @@
+@@ -6168,11 +6160,7 @@ gint ret;
strcat(tmp3, tmp4);
}
@@ -67,7 +110,7 @@
g_snprintf(cmd, MAXLINE,
"%s %s gracetime=%d -v %sblank=%s",
-@@ -6380,10 +6368,10 @@
+@@ -6380,10 +6368,10 @@ gint cdrecord_stderr;
/* or cdrecord died by signal? e.g. SIGALRM */
if (WIFSIGNALED(ret) && read_done == 0) {
@@ -80,7 +123,7 @@
}
dodebug(10,"Finished in read_write_out with status: %d\n",
-@@ -6719,10 +6707,12 @@
+@@ -6719,10 +6707,12 @@ gchar *p;
/* display an error when useing prodvd and cdrecord aborts */
static void display_invalid_prodvdkey() {
@@ -94,7 +137,7 @@
}
-@@ -9918,11 +9908,7 @@
+@@ -9918,12 +9908,8 @@ gchar *p;
*isProDVD = 0;
strcpy(ver,"");
@@ -103,27 +146,121 @@
- } else {
- get_wrap_path("CDRECORD",line);
- }
+- strcat(line," -version 2>/dev/null");
+ get_wrap_path_cdrecord(line);
- strcat(line," -version 2>/dev/null");
++ strcat(line," -version 2>&1");
dodebug(1, "calling: %s\n", line);
---- xcdroast-0.98alpha15/src/main.c.prodvd 2003-10-30 14:01:01.000000000 +0100
-+++ xcdroast-0.98alpha15/src/main.c 2004-09-20 17:23:03.178503832 +0200
-@@ -584,7 +584,7 @@
- if (curset.isProDVD == 1 && sizeof(off_t) != 8) {
- show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0);
+ if ((fpin = popen(line,"r")) == NULL) {
+@@ -10011,6 +9997,7 @@ gchar *p;
+
+ gint check_version_mkisofs(gchar *match, gchar *found) {
+ gchar line[MAXLINE];
++gchar vline[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
+@@ -10025,17 +10012,22 @@ gchar *p;
+ }
+
+ strcpy(line,"");
++ strcpy(vline,"");
+ for (;;) {
+ if (fgets(line,MAXLINE,fpin) == NULL)
+ break;
+ dodebug(10,"got: %s",line);
++ /* only get first line */
++ if (strcmp(vline,"") == 0) {
++ strncpy(vline, line, MAXLINE);
++ }
+ }
+
+ if (pclose(fpin) == -1) {
+ g_error("pclose error\n");
}
--
-+#if 0
- /* if we are in DVD mode, check if the security-key is set */
- if (curset.isProDVD == 1) {
- keyenv = getenv("CDR_SECURITY");
-@@ -593,7 +593,7 @@
- }
+- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) {
++ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) {
+ /* failed to open - permission denied */
+ return 2;
}
+@@ -10044,7 +10036,7 @@ gchar *p;
+ /* now line contains the version string of mkisofs */
+ /* try to extract the version number */
+
+- p = strstr(line,"mkisofs");
++ p = strstr(vline,"mkisofs");
+ if (p != NULL) {
+ p = strtok(p+8, " ");
+ if (p != NULL) {
+@@ -10077,7 +10069,7 @@ gchar line2[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
-
-+#endif
- dolog(1,"Starting X-CD-Roast\n");
++ int icedax=0;
+ strcpy(ver,"");
+ get_wrap_path("CDDA2WAV",line);
+ strcat(line," -h 2>&1");
+@@ -10092,6 +10084,9 @@ gchar *p;
+ if (fgets(line,MAXLINE,fpin) == NULL)
+ break;
+ dodebug(11,"got: %s",line);
++ if (strstr(line, "icedax") != NULL) {
++ icedax=1;
++ }
+ if (strncmp(line, "Version", 7) == 0) {
+ strcpy(line2, line);
+ dodebug(10,"got version: %s",line);
+@@ -10107,6 +10102,10 @@ gchar *p;
+ return 2;
+ }
- /* install a signal handler to catch CTRL-C */
++ if (icedax) {
++ strcpy(found, CDDA2WAV_VERSION);
++ return 0;
++ }
+
+ /* now line2 contains the version string of cdda2wav */
+ /* try to extract the version number */
+@@ -10141,6 +10140,7 @@ gchar *p;
+
+ gint check_version_readcd(gchar *match, gchar *found) {
+ gchar line[MAXLINE];
++gchar vline[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
+@@ -10155,17 +10155,22 @@ gchar *p;
+ }
+
+ strcpy(line,"");
++ strcpy(vline,"");
+ for (;;) {
+ if (fgets(line,MAXLINE,fpin) == NULL)
+ break;
+ dodebug(10,"got: %s",line);
++ /* only get first line */
++ if (strcmp(vline,"") == 0) {
++ strncpy(vline, line, MAXLINE);
++ }
+ }
+
+ if (pclose(fpin) == -1) {
+ g_error("pclose error\n");
+ }
+
+- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) {
++ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) {
+ /* failed to open - permission denied */
+ return 2;
+ }
+@@ -10174,7 +10179,7 @@ gchar *p;
+ /* now line contains the version string of readcd */
+ /* try to extract the version number */
+
+- p = strstr(line,"readcd");
++ p = strstr(vline,"readcd");
+ if (p != NULL) {
+ p = strtok(p+7, " ");
+ if (p != NULL) {
xcdroast-0.98alpha15-scan.patch:
Index: xcdroast-0.98alpha15-scan.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xcdroast/F-7/xcdroast-0.98alpha15-scan.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xcdroast-0.98alpha15-scan.patch 20 Sep 2004 15:58:24 -0000 1.2
+++ xcdroast-0.98alpha15-scan.patch 20 Jun 2007 12:59:06 -0000 1.3
@@ -70,7 +70,7 @@
- scanbus_new(txt, scanparam);
+ glob_t globbuf;
+ int i;
-+ glob("/dev/cdrom*", GLOB_NOSORT, NULL, &globbuf);
++ glob("/dev/cdrom-*", GLOB_NOSORT, NULL, &globbuf);
+ for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i
+++) {
+ scanbus_new_single(globbuf.gl_pathv[i], txt);
Index: xcdroast.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xcdroast/F-7/xcdroast.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xcdroast.spec 15 Mar 2007 12:04:19 -0000 1.28
+++ xcdroast.spec 20 Jun 2007 12:59:06 -0000 1.29
@@ -1,7 +1,7 @@
Summary: An X Window System based tool for creating CDs.
Name: xcdroast
Version: 0.98a15
-Release: 13
+Release: 13%{?dist}.1
License: GPL
Group: Applications/Multimedia
Source: http://prdownloads.sourceforge.net/xcdroast/xcdroast-0.98alpha15.tar.gz
- Previous message (by thread): rpms/kipi-plugins/devel kipi-plugins-0.1.4-beta2-LIB_KIO.patch, NONE, 1.1 kipi-plugins.spec, 1.35, 1.36
- Next message (by thread): rpms/cdrkit/F-7 .cvsignore, 1.2, 1.3 cdrkit.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list