r20 - trunk/packages/vorbis-tools/debian/patches
Adeodato Simó
adeodato at costa.debian.org
Mon Jan 16 22:13:59 UTC 2006
Author: adeodato
Date: 2006-01-16 22:13:58 +0000 (Mon, 16 Jan 2006)
New Revision: 20
Modified:
trunk/packages/vorbis-tools/debian/patches/series
trunk/packages/vorbis-tools/debian/patches/upstream_r10080-fix_non-ascii_comments.diff
trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff
trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff
Log:
Make consistent use of http://trac.xiph.org/changeset/${REV}?format=diff
to generate upstream svn patches. Scripted, if someone's interested.
Modified: trunk/packages/vorbis-tools/debian/patches/series
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/series 2006-01-16 21:56:11 UTC (rev 19)
+++ trunk/packages/vorbis-tools/debian/patches/series 2006-01-16 22:13:58 UTC (rev 20)
@@ -1,6 +1,6 @@
-upstream_r9935-dont_clobber_file_on_error.diff
-upstream_r9696-play_from_pipe.diff
-upstream_r10080-fix_non-ascii_comments.diff
+upstream_r9696-play_from_pipe.diff -p2
+upstream_r9935-dont_clobber_file_on_error.diff -p2
+upstream_r10080-fix_non-ascii_comments.diff -p2
for_upstream-mention_alsa09_in_ogg123.1.diff
for_upstream-oggenc_inputfile_vs_input.wav.diff
for_upstream-mention_option_-R_in_vorbiscomment.1.diff
Modified: trunk/packages/vorbis-tools/debian/patches/upstream_r10080-fix_non-ascii_comments.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/upstream_r10080-fix_non-ascii_comments.diff 2006-01-16 21:56:11 UTC (rev 19)
+++ trunk/packages/vorbis-tools/debian/patches/upstream_r10080-fix_non-ascii_comments.diff 2006-01-16 22:13:58 UTC (rev 20)
@@ -1,7 +1,7 @@
-Index: vorbis-tools/share/charset.c
+Index: trunk/vorbis-tools/share/charset.c
===================================================================
---- vorbis-tools/share/charset.c (revision 2185)
-+++ vorbis-tools/share/charset.c (revision 10080)
+--- trunk/vorbis-tools/share/charset.c (revision 2185)
++++ trunk/vorbis-tools/share/charset.c (revision 10080)
@@ -27,4 +27,8 @@
* 8-bit char, 16-bit short and 32-bit int.
*/
@@ -11,10 +11,10 @@
+#endif
#ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */
-Index: vorbis-tools/share/iconvert.c
+Index: trunk/vorbis-tools/share/iconvert.c
===================================================================
---- vorbis-tools/share/iconvert.c (revision 3028)
-+++ vorbis-tools/share/iconvert.c (revision 10080)
+--- trunk/vorbis-tools/share/iconvert.c (revision 3028)
++++ trunk/vorbis-tools/share/iconvert.c (revision 10080)
@@ -16,4 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -24,10 +24,10 @@
+#endif
#ifdef HAVE_ICONV
-Index: vorbis-tools/share/utf8.c
+Index: trunk/vorbis-tools/share/utf8.c
===================================================================
---- vorbis-tools/share/utf8.c (revision 3510)
-+++ vorbis-tools/share/utf8.c (revision 10080)
+--- trunk/vorbis-tools/share/utf8.c (revision 3510)
++++ trunk/vorbis-tools/share/utf8.c (revision 10080)
@@ -22,4 +22,8 @@
*/
Modified: trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff 2006-01-16 21:56:11 UTC (rev 19)
+++ trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff 2006-01-16 22:13:58 UTC (rev 20)
@@ -1,25 +1,20 @@
-Index: ogg123/file_transport.c
+Index: trunk/vorbis-tools/ogg123/file_transport.c
===================================================================
---- a/ogg123/file_transport.c (revision 9695)
-+++ b/ogg123/file_transport.c (working copy)
-@@ -26,6 +26,7 @@
- typedef struct file_private_t {
+--- trunk/vorbis-tools/ogg123/file_transport.c (revision 2983)
++++ trunk/vorbis-tools/ogg123/file_transport.c (revision 9696)
+@@ -27,4 +27,5 @@
FILE *fp;
data_source_stats_t stats;
+ int seekable;
} file_private_t;
-
-@@ -51,6 +52,7 @@
- source->transport = &file_transport;
+@@ -52,4 +53,5 @@
source->private = private;
+ private->seekable = 1;
private->stats.transfer_rate = 0;
private->stats.bytes_read = 0;
- private->stats.input_buffer_used = 0;
-@@ -60,9 +62,10 @@
- }
+@@ -61,7 +63,8 @@
/* Open file */
- if (strcmp(source_string, "-") == 0)
@@ -30,31 +25,24 @@
+ } else
private->fp = fopen(source_string, "r");
- if (private->fp == NULL) {
-@@ -84,6 +87,8 @@
+@@ -84,4 +87,6 @@
int items;
long start;
-
-+ if (!private->seekable) return 0;
+
- /* Record where we are */
- start = ftell(fp);
++ if (!private->seekable) return 0;
-@@ -118,6 +123,8 @@
- file_private_t *private = source->private;
+ /* Record where we are */
+@@ -119,4 +124,6 @@
FILE *fp = private->fp;
+ if (!private->seekable) return -1;
+
return fseek(fp, offset, whence);
}
-
-@@ -135,6 +142,8 @@
+@@ -135,4 +142,6 @@
file_private_t *private = source->private;
FILE *fp = private->fp;
-
-+ if (!private->seekable) return -1;
+
- return ftell(fp);
- }
++ if (!private->seekable) return -1;
+ return ftell(fp);
Modified: trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff 2006-01-16 21:56:11 UTC (rev 19)
+++ trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff 2006-01-16 22:13:58 UTC (rev 20)
@@ -1,75 +1,58 @@
-Index: vorbiscomment/vcomment.c
+Index: trunk/vorbis-tools/vorbiscomment/vcomment.c
===================================================================
---- a/vorbiscomment/vcomment.c (revision 9934)
-+++ b/vorbiscomment/vcomment.c (revision 9935)
-@@ -63,7 +63,7 @@
- void free_param(param_t *param);
+--- trunk/vorbis-tools/vorbiscomment/vcomment.c (revision 9393)
++++ trunk/vorbis-tools/vorbiscomment/vcomment.c (revision 9935)
+@@ -64,5 +64,5 @@
void parse_options(int argc, char *argv[], param_t *param);
void open_files(param_t *p);
-void close_files(param_t *p);
+void close_files(param_t *p, int output_written);
- /**********
-@@ -107,7 +107,7 @@
- {
+@@ -108,5 +108,5 @@
fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
vcedit_error(state));
- close_files(param);
+ close_files(param, 0);
free_param(param);
vcedit_clear(state);
- return 1;
-@@ -120,7 +120,7 @@
- /* done */
+@@ -121,5 +121,5 @@
vcedit_clear(state);
- close_files(param);
+ close_files(param, 0);
free_param(param);
return 0;
- }
-@@ -133,7 +133,7 @@
- {
+@@ -134,5 +134,5 @@
fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
vcedit_error(state));
- close_files(param);
+ close_files(param, 0);
free_param(param);
vcedit_clear(state);
- return 1;
-@@ -174,7 +174,7 @@
- {
+@@ -175,5 +175,5 @@
fprintf(stderr, _("Failed to write comments to output file: %s\n"),
vcedit_error(state));
- close_files(param);
+ close_files(param, 0);
free_param(param);
vcedit_clear(state);
- return 1;
-@@ -183,7 +183,7 @@
- /* done */
+@@ -184,5 +184,5 @@
vcedit_clear(state);
- close_files(param);
+ close_files(param, 1);
free_param(param);
return 0;
- }
-@@ -527,23 +527,31 @@
-
+@@ -528,22 +528,30 @@
***********/
-void close_files(param_t *p)
-+void close_files(param_t *p, int output_written)
- {
+-{
- if (p->in != NULL && p->in != stdin) fclose(p->in);
- if (p->out != NULL && p->out != stdout) fclose(p->out);
- if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
-+ if (p->in != NULL && p->in != stdin) fclose(p->in);
-+ if (p->out != NULL && p->out != stdout) fclose(p->out);
-+ if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
-
+-
- if(p->tempoutfile) {
- /* Some platforms fail to rename a file if the new name already exists,
- * so we need to remove, then rename. How stupid.
@@ -81,6 +64,12 @@
- fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
- p->infilename);
- }
++void close_files(param_t *p, int output_written)
++{
++ if (p->in != NULL && p->in != stdin) fclose(p->in);
++ if (p->out != NULL && p->out != stdout) fclose(p->out);
++ if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
++
+ if(p->tempoutfile) {
+ if(output_written) {
+ /* Some platforms fail to rename a file if the new name already
@@ -94,6 +83,8 @@
+ p->infilename);
+ }
}
+-}
+-
+ else {
+ if(remove(p->outfilename)) {
+ fprintf(stderr, _("Error removing erroneous temporary file %s\n"),
@@ -101,5 +92,5 @@
+ }
+ }
+ }
- }
-
++}
++
More information about the pkg-xiph-commits
mailing list