summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-cdr/xcdroast/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-cdr/xcdroast/files')
-rw-r--r--app-cdr/xcdroast/files/cdda2wav_version.patch54
-rw-r--r--app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch45
-rw-r--r--app-cdr/xcdroast/files/io_compile.patch21
3 files changed, 120 insertions, 0 deletions
diff --git a/app-cdr/xcdroast/files/cdda2wav_version.patch b/app-cdr/xcdroast/files/cdda2wav_version.patch
new file mode 100644
index 000000000000..cd001e0ee7bf
--- /dev/null
+++ b/app-cdr/xcdroast/files/cdda2wav_version.patch
@@ -0,0 +1,54 @@
+diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c
+--- xcdroast-0.98+0alpha16~/src/io.c 2008-08-21 15:11:40.000000000 +0200
++++ xcdroast-0.98+0alpha16/src/io.c 2009-12-29 22:54:08.571188849 +0100
+@@ -10062,6 +10062,7 @@
+
+ gint check_version_cdda2wav(gchar *match, gchar *found) {
+ gchar line[MAXLINE];
++gchar vline[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
+@@ -10076,32 +10077,38 @@
+ }
+
+ 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;
+ }
+
+- /* now line contains the version string of cdda2wav */
++ /* now vline contains the version string of cdda2wav */
+ /* try to extract the version number */
+
+- p = strstr(line,"version");
++ p = strstr(vline,"version");
+ if (p != NULL) {
+ p = strtok(p+8, " _");
+ if (p != NULL) {
+ strcpy(ver,p);
+ }
+ } else {
+- p = strstr(line,"cdda2wav");
++ p = strstr(vline,"cdda2wav");
+ if (p != NULL) {
+ p = strtok(p+9, " ");
+ if (p != NULL) {
diff --git a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch
new file mode 100644
index 000000000000..d2e15ef54c69
--- /dev/null
+++ b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch
@@ -0,0 +1,45 @@
+--- src/io.c
++++ src/io.c
+@@ -2665,6 +2665,8 @@
+ g_error("Unexpected output in cdda2wav toc-output\n");
+ }
+ trackinfo[tocnr]->track_nr = atoi(p1);
++ if (trackinfo[tocnr]->track_nr == 0)
++ cdinfo.nr_tracks++;
+ trackinfo[tocnr]->isosize = -1;
+
+ /* reststring into tmp2 - strip to remove leading spaces */
+@@ -8401,6 +8403,9 @@
+ if (extract_quoted(tmp) != 0)
+ return;
+
++ if (matchnr == 0 && trackinfo[matchnr]->track_nr == 0)
++ matchnr++;
++
+ if (mode == 0) {
+ if (matchnr >= cdinfo.nr_tracks) {
+ g_warning("invalid track count from cddb-server\n");
+@@ -8482,14 +8487,20 @@
+
+ /* build of command line */
+ if (mode == 0 || mode == 2) {
++ gint ntr = cdinfo.nr_tracks;
++
++ if (ntr > 0 && trackinfo[0]->track_nr == 0)
++ ntr--;
+ g_snprintf(tmp,MAXLINE,"cddb query %s %d ",
+- cdinfo.cddb_discid, cdinfo.nr_tracks);
++ cdinfo.cddb_discid, ntr);
+ for (i = 0; i < cdinfo.nr_tracks; i++) {
++ if (trackinfo[i]->track_nr == 0)
++ continue;
+ g_snprintf(tmp2,MAXLINE,"%d ",
+ trackinfo[i]->start_sec + 150);
+ strcat(tmp,tmp2);
+ }
+- g_snprintf(tmp2,MAXLINE,"%d",cdinfo.total_size / 75);
++ g_snprintf(tmp2,MAXLINE,"%d",(cdinfo.leadout + 150) / 75);
+ strcat(tmp,tmp2);
+ } else {
+ /* get data from toc file */
+
diff --git a/app-cdr/xcdroast/files/io_compile.patch b/app-cdr/xcdroast/files/io_compile.patch
new file mode 100644
index 000000000000..7285bd335df0
--- /dev/null
+++ b/app-cdr/xcdroast/files/io_compile.patch
@@ -0,0 +1,21 @@
+--- src/io.c.org 2009-02-24 09:38:27.000000000 +0100
++++ src/io.c 2009-02-24 09:45:18.000000000 +0100
+@@ -1903,7 +1903,8 @@
+ }
+
+ strcpy(str,"");
+- fgets(str,MAXLINE,fpin);
++ if (fgets(str,MAXLINE,fpin) == NULL)
++ g_error("fgets error\n");
+
+ if (pclose(fpin) == -1) {
+ g_error("pclose error\n");
+@@ -4720,7 +4721,7 @@
+ dolog(3, "Saving extended output to %s\n", fname);
+
+ /* write to file */
+- fd = open(fname,O_WRONLY | O_CREAT);
++ fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ if (fd < 0) {
+ g_warning("Can't open file %s for writing\n",fname);
+ return 1;