Annotation of /trunk/cdrdao/patches/cdrdao-1.2.2-tocparser.patch
Parent Directory | Revision Log
Revision 871 -
(hide annotations)
(download)
Thu Jul 16 16:10:19 2009 UTC (15 years, 2 months ago) by niro
File size: 907 byte(s)
Thu Jul 16 16:10:19 2009 UTC (15 years, 2 months ago) by niro
File size: 907 byte(s)
patches for cdrdao
1 | niro | 871 | Snatched from Debian |
2 | |||
3 | #!/bin/sh /usr/share/dpatch/dpatch-run | ||
4 | ## 06-tocparser.dpatch by Florian Forster <octo@verplant.org> | ||
5 | ## | ||
6 | ## DP: Undo upstream removal of automatic reading of the track lengths in TOC | ||
7 | ## DP: files (Closes: #440419). | ||
8 | |||
9 | @DPATCH@ | ||
10 | |||
11 | diff -Naurp cdrdao-1.2.2.orig/trackdb/TocParser.g cdrdao-1.2.2/trackdb/TocParser.g | ||
12 | --- cdrdao-1.2.2.orig/trackdb/TocParser.g 2005-11-03 01:08:16.000000000 +0000 | ||
13 | +++ cdrdao-1.2.2/trackdb/TocParser.g 2007-09-24 11:58:34.000000000 +0000 | ||
14 | @@ -496,6 +496,15 @@ subTrack < [ TrackData::Mode trackType, | ||
15 | } | ||
16 | >> | ||
17 | ) | ||
18 | + << if ($st != NULL && $st->length() == 0) { | ||
19 | + // try to determine length | ||
20 | + if ($st->determineLength() != 0) { | ||
21 | + message(-2, "%s:%d: Cannot determine length of track data specification.", | ||
22 | + filename_, $lineNr); | ||
23 | + error_ = 1; | ||
24 | + } | ||
25 | + } | ||
26 | + >> | ||
27 | ; | ||
28 | // fail action | ||
29 | << delete $st, $st = NULL; | ||
30 |