[gentoo-commits] gentoo-x86 commit in app-cdr/cdrdao/files: cdrdao-1.2.2-cdtext.patch cdrdao-1.2.2-device.patch cdrdao-1.2.2-toc2cue.patch cdrdao-1.2.2-tocparser.patch

[Peter Alfredsen (loki_val)]

loki_val    09/02/01 01:42:56

  Added:                cdrdao-1.2.2-cdtext.patch cdrdao-1.2.2-device.patch
                        cdrdao-1.2.2-toc2cue.patch
                        cdrdao-1.2.2-tocparser.patch
  Log:
  EAPI-2, fix bug 238891, CDTEXT and toc2cue problems. Import patches from Debian for a few issues. Remove RESTRICT=strip, which seems to be left-overs from a user-submitted ebuild in bug 43003.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch?rev=1.1&content-type=text/plain

Index: cdrdao-1.2.2-cdtext.patch
===================================================================

#!/bin/sh /usr/share/dpatch/dpatch-run
## 07-cdtext.dpatch by Anonymous
##
## DP: Adds missing entries to TOC output when using CdText (Closes: #458357).

@DPATCH@

diff -Naurp cdrdao-1.2.2.orig/trackdb/CdTextItem.cc cdrdao-1.2.2/trackdb/CdTextItem.cc
--- cdrdao-1.2.2.orig/trackdb/CdTextItem.cc	2004-04-28 00:46:05.000000000 +0000
+++ cdrdao-1.2.2/trackdb/CdTextItem.cc	2007-12-30 16:35:40.000000000 +0000
@@ -320,6 +320,15 @@ int CdTextItem::isTrackPack(PackType typ
   int ret;
   
   switch (type) {
+  case CDTEXT_DISK_ID:
+  case CDTEXT_GENRE:
+  case CDTEXT_TOC_INFO1:
+  case CDTEXT_TOC_INFO2:
+  case CDTEXT_RES1:
+  case CDTEXT_RES2:
+  case CDTEXT_RES3:
+  case CDTEXT_RES4:
+  case CDTEXT_SIZE_INFO:
   case CDTEXT_TITLE:
   case CDTEXT_PERFORMER:
   case CDTEXT_SONGWRITER:




1.1                  app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch?rev=1.1&content-type=text/plain

Index: cdrdao-1.2.2-device.patch
===================================================================

#!/bin/sh /usr/share/dpatch/dpatch-run
## 04-device.dpatch by Free Ekanayaka <free@××××××××.com>
##
## DP: Change default device to /dev/cdrw (Closes: #452123).

@DPATCH@

diff -Naur cdrdao-1.2.2.orig/dao/main.cc cdrdao-1.2.2/dao/main.cc
--- cdrdao-1.2.2.orig/dao/main.cc	2006-09-19 09:07:11.000000000 +0000
+++ cdrdao-1.2.2/dao/main.cc	2006-10-06 20:24:57.000000000 +0000
@@ -140,7 +140,7 @@
 
 #elif defined(__linux__)
 
-static const char *SCSI_DEVICE = "/dev/cdrecorder";
+static const char *SCSI_DEVICE = "/dev/cdrw";
 static int FIFO_BUFFERS = 32;
 
 #else




1.1                  app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch?rev=1.1&content-type=text/plain

Index: cdrdao-1.2.2-toc2cue.patch
===================================================================
diff -Naur cdrdao-1.2.2/trackdb/TocParser.g cdrdao-1.2.2-cclpatch/trackdb/TocParser.g
--- cdrdao-1.2.2/trackdb/TocParser.g	2008-10-06 08:50:48.000000000 -0700
+++ cdrdao-1.2.2-cclpatch/trackdb/TocParser.g	2008-10-06 08:50:48.000000000 -0700
@@ -774,7 +774,7 @@
       << if (item != NULL) {
            int type = item->packType();
 
-           if (isTrack && ((type >= 0x86 && type <= 0x89) || type == 0x8f)) {
+           if (isTrack && ((type > 0x86 && type <= 0x89) || type == 0x8f)) {
              message(-2, "%s:%d: Invalid CD-TEXT item for a track.",
                      filename_, lineNr);
              error_ = 1;



1.1                  app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch?rev=1.1&content-type=text/plain

Index: cdrdao-1.2.2-tocparser.patch
===================================================================
Snatched from Debian

#!/bin/sh /usr/share/dpatch/dpatch-run
## 06-tocparser.dpatch by Florian Forster <octo@××××××××.org>
##
## DP: Undo upstream removal of automatic reading of the track lengths in TOC
## DP: files (Closes: #440419).

@DPATCH@

diff -Naurp cdrdao-1.2.2.orig/trackdb/TocParser.g cdrdao-1.2.2/trackdb/TocParser.g
--- cdrdao-1.2.2.orig/trackdb/TocParser.g	2005-11-03 01:08:16.000000000 +0000
+++ cdrdao-1.2.2/trackdb/TocParser.g	2007-09-24 11:58:34.000000000 +0000
@@ -496,6 +496,15 @@ subTrack < [ TrackData::Mode trackType, 
 	  }
        >>
     )
+    << if ($st != NULL && $st->length() == 0) {
+         // try to determine length 
+         if ($st->determineLength() != 0) {
+	   message(-2, "%s:%d: Cannot determine length of track data specification.",
+		   filename_, $lineNr);
+	   error_ = 1;
+	 }
+       }
+    >> 
     ;
     // fail action
     << delete $st, $st = NULL;