← Back to branch summary

~ubuntu-branches/ubuntu/precise/flac/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/05_eof_warnings_are_errors.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Joshua Kwan
  • Date: 2007-05-29 22:56:36 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070529225636-ljeff8xxip09qaap
Tags: 1.1.4-1
http://bugs.debian.org/405167
http://bugs.debian.org/411311
* New upstream release. closes: #405167, #411311
  - libOggFLAC and libOggFLAC++ have been merged into libFLAC, so
    remove their corresponding packages.
  - Because of the API changes required to effect the above, there has
    been yet another soname bump. libflac7 -> libflac8 and
    libflac++5 -> libflac++6. Emails have been dispatched to the
    maintainers of dependent packages.
* Some notes on patches that were removed:
  - 02_stdin_stdout, 06_manpage_mention_utf8_convert: merged upstream
  - 08_manpage_warnings: Upstream has changed the manpage so it defintely
    can't fit in in 80 cols, so just forget about it. We'll live.
  - 05_eof_warnings_are_errors: Upstream decided to add a -w option to
    flac to treat all warnings as errors. I am going to defer to that
    for now, but if people think it's stupid let me know and I'll port
    the patch forward.
  - 04_stack_smasher: was a backport from 1.1.3, so it's obsolete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_eof_warnings_are_errors.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 05_eof_warnings_are_errors.dpatch by Joshua Kwan <joshk@triplehelix.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -u flac-1.1.2/debian/changelog flac-1.1.2/debian/changelog
9
 
only in patch2:
10
 
unchanged:
11
 
--- flac-1.1.2.orig/src/flac/encode.c
12
 
+++ flac-1.1.2/src/flac/encode.c
13
 
@@ -397,8 +397,8 @@
14
 
                                                return EncoderSession_finish_error(&encoder_session);
15
 
                                        }
16
 
                                        else if(feof(infile)) {
17
 
-                                               flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned int)encoder_session.total_samples_to_encode, (unsigned int)encoder_session.samples_written);
18
 
-                                               data_bytes= 0;
19
 
+                                               flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned int)encoder_session.total_samples_to_encode, (unsigned int)encoder_session.samples_written);
20
 
+                                               return EncoderSession_finish_error(&encoder_session);
21
 
                                        }
22
 
                                }
23
 
                                else {
24
 
@@ -456,7 +456,8 @@
25
 
                                                        return EncoderSession_finish_error(&encoder_session);
26
 
                                                }
27
 
                                                else if(bytes_read != (*options.common.align_reservoir_samples) * bytes_per_frame) {
28
 
-                                                       flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned int)bytes_read, (unsigned int)encoder_session.total_samples_to_encode, (unsigned int)encoder_session.samples_written);
29
 
+                                                       flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned int)bytes_read, (unsigned int)encoder_session.total_samples_to_encode, (unsigned int)encoder_session.samples_written);
30
 
+                                                       return EncoderSession_finish_error(&encoder_session);
31
 
                                                }
32
 
                                                else {
33
 
                                                        info_align_carry= *options.common.align_reservoir_samples;
34
 
@@ -735,8 +736,8 @@
35
 
                                                return EncoderSession_finish_error(&encoder_session);
36
 
                                        }
37
 
                                        else if(feof(infile)) {
38
 
-                                               flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
39
 
-                                               data_bytes = 0;
40
 
+                                               flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
41
 
+                                               return EncoderSession_finish_error(&encoder_session);
42
 
                                        }
43
 
                                }
44
 
                                else {
45
 
@@ -794,8 +795,8 @@
46
 
                                                        return EncoderSession_finish_error(&encoder_session);
47
 
                                                }
48
 
                                                else if(bytes_read != (*options.common.align_reservoir_samples) * bytes_per_wide_sample) {
49
 
-                                                       flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
50
 
-                                                       data_bytes = 0;
51
 
+                                                       flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
52
 
+                                                       return EncoderSession_finish_error(&encoder_session);
53
 
                                                }
54
 
                                                else {
55
 
                                                        info_align_carry = *options.common.align_reservoir_samples;
56
 
@@ -1046,8 +1047,8 @@
57
 
                                        return EncoderSession_finish_error(&encoder_session);
58
 
                                }
59
 
                                else if(feof(infile)) {
60
 
-                                       flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
61
 
-                                       total_input_bytes_read = max_input_bytes;
62
 
+                                       flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
63
 
+                                       return EncoderSession_finish_error(&encoder_session);
64
 
                                }
65
 
                        }
66
 
                        else {
67
 
@@ -1098,7 +1099,8 @@
68
 
                                        return EncoderSession_finish_error(&encoder_session);
69
 
                                }
70
 
                                else if(bytes_read != (*options.common.align_reservoir_samples) * bytes_per_wide_sample) {
71
 
-                                       flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
72
 
+                                       flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n", encoder_session.inbasefilename, (unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode, (unsigned)encoder_session.samples_written);
73
 
+                                       return EncoderSession_finish_error(&encoder_session);
74
 
                                }
75
 
                                else {
76
 
                                        info_align_carry = *options.common.align_reservoir_samples;