ogg dev - Jul 2006 - [vorbis-tools] Some patches coming from Debian bugs

Hello.

Attached are some patches that some Debian users of vorbis-tools have
sent to our BTS over the years (numbers refer to Debian bugs).

It'd be nice to see them integrated. They apply cleanly to SVN as of
today.

The largefile_support one is a bit bigger than just the configure.ac
since the submitter adviced that config.h got included in all C source
files before the standard includes, so that the _FILE_OFFSET_BITS macro
is seen by them.

Please maintain pkg-xiph-maint@lists.alioth.debian.org in the CC, and
feel free to reach us (Debian maintainers for xiph.org stuff) in that
list in the future.

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
                                           Listening to: Luz - Tu perdón
-------------- next part --------------
Index: configure.ac
==================================================================---
configure.ac	(revision 11702)
+++ configure.ac	(working copy)
@@ -31,6 +31,8 @@
 ALL_LINGUAS="be cs da es fr hr hu nl ro ru sv uk"
 AM_GNU_GETTEXT
 
+AC_SYS_LARGEFILE
+
 dnl --------------------------------------------------
 dnl Set build flags based on environment
 dnl --------------------------------------------------
Index: vcut/vcut.c
==================================================================---
vcut/vcut.c	(revision 11702)
+++ vcut/vcut.c	(working copy)
@@ -10,6 +10,10 @@
  * last modified: $Id: vcut.c,v 1.9 2003/09/03 07:58:05 calc Exp $
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ogg/ogg.h>
Index: vorbiscomment/vcedit.c
==================================================================---
vorbiscomment/vcedit.c	(revision 11702)
+++ vorbiscomment/vcedit.c	(working copy)
@@ -9,6 +9,10 @@
  * last modified: $Id: vcedit.c,v 1.23 2003/09/03 07:58:05 calc Exp $
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: vorbiscomment/vcomment.c
==================================================================---
vorbiscomment/vcomment.c	(revision 11702)
+++ vorbiscomment/vcomment.c	(working copy)
@@ -8,16 +8,15 @@
  * Of limited usability on its own, but could be useful.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <locale.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "getopt.h"
 #include "utf8.h"
 #include "i18n.h"
Index: ogginfo/theora.c
==================================================================---
ogginfo/theora.c	(revision 11702)
+++ ogginfo/theora.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "theora.h"
Index: ogginfo/ogginfo2.c
==================================================================---
ogginfo/ogginfo2.c	(revision 11702)
+++ ogginfo/ogginfo2.c	(working copy)
@@ -6,6 +6,9 @@
  * Licensed under the GNU GPL, distributed with this program.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
Index: oggdec/oggdec.c
==================================================================---
oggdec/oggdec.c	(revision 11702)
+++ oggdec/oggdec.c	(working copy)
@@ -7,6 +7,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
Index: share/charset_test.c
==================================================================---
share/charset_test.c	(revision 11702)
+++ share/charset_test.c	(working copy)
@@ -16,6 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <string.h>
 
Index: share/makemap.c
==================================================================---
share/makemap.c	(revision 11702)
+++ share/makemap.c	(working copy)
@@ -16,6 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <errno.h>
 #include <iconv.h>
 #include <stdio.h>
Index: oggenc/audio.c
==================================================================---
oggenc/audio.c	(revision 11702)
+++ oggenc/audio.c	(working copy)
@@ -8,6 +8,9 @@
  ** AIFF/AIFC support from OggSquish, (c) 1994-1996 Monty
<xiphmont@xiph.org>
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -15,10 +18,6 @@
 #include <sys/types.h>
 #include <math.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "audio.h"
 #include "platform.h"
 #include "i18n.h"
Index: oggenc/oggenc.c
==================================================================---
oggenc/oggenc.c	(revision 11702)
+++ oggenc/oggenc.c	(working copy)
@@ -9,6 +9,10 @@
  * and libvorbis examples, (c) Monty <monty@xiph.org>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
@@ -18,10 +22,6 @@
 #include <locale.h>
 #include <errno.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "platform.h"
 #include "encode.h"
 #include "audio.h"
Index: oggenc/flac.c
==================================================================---
oggenc/flac.c	(revision 11702)
+++ oggenc/flac.c	(working copy)
@@ -7,6 +7,9 @@
  **
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
Index: oggenc/resample.c
==================================================================---
oggenc/resample.c	(revision 11702)
+++ oggenc/resample.c	(working copy)
@@ -1,5 +1,9 @@
 /* resample.c: see resample.h for interesting stuff */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
Index: oggenc/platform.c
==================================================================---
oggenc/platform.c	(revision 11702)
+++ oggenc/platform.c	(working copy)
@@ -11,6 +11,9 @@
 
 /* Platform support routines  - win32, OS/2, unix */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "platform.h"
 #include "encode.h"
Index: oggenc/easyflac.c
==================================================================---
oggenc/easyflac.c	(revision 11702)
+++ oggenc/easyflac.c	(working copy)
@@ -33,6 +33,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include "easyflac.h"
 
Index: oggenc/encode.c
==================================================================---
oggenc/encode.c	(revision 11702)
+++ oggenc/encode.c	(working copy)
@@ -9,6 +9,9 @@
  ** and libvorbis examples, (c) Monty <monty@xiph.org>
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
Index: ogg123/playlist.c
==================================================================---
ogg123/playlist.c	(revision 11702)
+++ ogg123/playlist.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: ogg123/vorbis_comments.c
==================================================================---
ogg123/vorbis_comments.c	(revision 11702)
+++ ogg123/vorbis_comments.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: ogg123/cfgfile_options.c
==================================================================---
ogg123/cfgfile_options.c	(revision 11702)
+++ ogg123/cfgfile_options.c	(working copy)
@@ -20,6 +20,10 @@
  * function for your platform / compiler.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
Index: ogg123/flac_format.c
==================================================================---
ogg123/flac_format.c	(revision 11702)
+++ ogg123/flac_format.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
Index: ogg123/callbacks.c
==================================================================---
ogg123/callbacks.c	(revision 11702)
+++ ogg123/callbacks.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
Index: ogg123/file_transport.c
==================================================================---
ogg123/file_transport.c	(revision 11702)
+++ ogg123/file_transport.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: ogg123/audio.c
==================================================================---
ogg123/audio.c	(revision 11702)
+++ ogg123/audio.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
Index: ogg123/ogg123.c
==================================================================---
ogg123/ogg123.c	(revision 11702)
+++ ogg123/ogg123.c	(working copy)
@@ -18,6 +18,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
Index: ogg123/oggvorbis_format.c
==================================================================---
ogg123/oggvorbis_format.c	(revision 11702)
+++ ogg123/oggvorbis_format.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
Index: ogg123/buffer.c
==================================================================---
ogg123/buffer.c	(revision 11702)
+++ ogg123/buffer.c	(working copy)
@@ -15,6 +15,9 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/wait.h>
Index: ogg123/cmdline_options.c
==================================================================---
ogg123/cmdline_options.c	(revision 11702)
+++ ogg123/cmdline_options.c	(working copy)
@@ -15,14 +15,14 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ao/ao.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "getopt.h"
 #include "cmdline_options.h"
 #include "status.h"
Index: ogg123/easyflac.c
==================================================================---
ogg123/easyflac.c	(revision 11702)
+++ ogg123/easyflac.c	(working copy)
@@ -33,6 +33,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include "easyflac.h"
 
Index: ogg123/format.c
==================================================================---
ogg123/format.c	(revision 11702)
+++ ogg123/format.c	(working copy)
@@ -15,12 +15,13 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "transport.h"
 #include "format.h"
 #include "i18n.h"
Index: ogg123/transport.c
==================================================================---
ogg123/transport.c	(revision 11702)
+++ ogg123/transport.c	(working copy)
@@ -15,12 +15,13 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "transport.h"
 #include "i18n.h"
 
Index: ogg123/speex_format.c
==================================================================---
ogg123/speex_format.c	(revision 11702)
+++ ogg123/speex_format.c	(working copy)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-------------- next part --------------
Index: vorbiscomment/vorbiscomment.1
==================================================================---
vorbiscomment/vorbiscomment.1	(revision 11702)
+++ vorbiscomment/vorbiscomment.1	(working copy)
@@ -55,7 +55,7 @@
 To edit those comments:
 
     vorbiscomment -l file.ogg > file.txt
-    [edit the comments in file.txt to your statisfaction]
+    [edit the comments in file.txt to your satisfaction]
     vorbiscomment -w -c file.txt file.ogg newfile.ogg
 
 To simply add a comment:
Index: oggenc/man/oggenc.1
==================================================================---
oggenc/man/oggenc.1	(revision 11702)
+++ oggenc/man/oggenc.1	(working copy)
@@ -247,7 +247,7 @@
 set closer to 0, the bitrate manager attempts to hoard bits for future
 use in sudden bitrate increases (biasing toward better transient
 reproduction).  When set closer to 1, the bitrate manager neglects
-transients in favor using bits for homogenous passages.  In the
+transients in favor using bits for homogeneous passages.  In the
 middle, the manager uses a balanced approach.  The default setting is \.2, 
 thus biasing slightly toward transient reproduction.
 
@@ -293,25 +293,25 @@
 
 Specifying a high-quality encoding averaging 256 kbps (but still VBR).
 .RS
-oggenc infile.wav -b 256 out.ogg
+oggenc infile.wav -b 256 -o out.ogg
 .RE
 .PP
 
 Specifying a maximum and average bitrate, and enforcing these.
 .RS
-oggenc infile.wav --managed -b 128 -M 160 out.ogg
+oggenc infile.wav --managed -b 128 -M 160 -o out.ogg
 .RE
 .PP
 
 Specifying quality rather than bitrate (to a very high quality mode)
 .RS
-oggenc infile.wav -q 6 out.ogg
+oggenc infile.wav -q 6 -o out.ogg
 .RE
 .PP
 
 Downsampling and downmixing to 11 kHz mono before encoding.
 .RS
-oggenc --resample 11025 --downmix infile.wav -q 1 out.ogg
+oggenc --resample 11025 --downmix infile.wav -q 1 -o out.ogg
 .RE
 .PP
 
@@ -319,7 +319,7 @@
 .RS
 oggenc somefile.wav -t "The track title" -a "artist who
performed this" -l
 "name of album" -c
-"OTHERFIELD=contents of some other field not explictly supported"
+"OTHERFIELD=contents of some other field not explicitly supported"
 .RE
 .PP
 
Index: ogg123/ogg123.1
==================================================================---
ogg123/ogg123.1	(revision 11702)
+++ ogg123/ogg123.1	(working copy)
@@ -258,7 +258,7 @@
 .RE
 .PP
 
-Stress test your harddrive:
+Stress test your hard drive:
 .RS
 .B ogg123 -d oss -d wav -f 1.wav -d wav -f 2.wav -d wav -f 3.wav -d wav -f
4.wav -d wav -f 5.wav  test.ogg
 .RE
-------------- next part --------------
Index: vorbiscomment/vorbiscomment.1
==================================================================---
vorbiscomment/vorbiscomment.1	(revision 11702)
+++ vorbiscomment/vorbiscomment.1	(working copy)
@@ -44,6 +44,8 @@
 Specify a new tag on the command line. Each tag is given as a single string.
The part before the '=' is treated as the tag name and the part after as
the value.
 .IP "-w"
 Replace comments with the new set given either on the command line with -t or
from a file with -c.
+.IP "-R"
+Read and write comments in utf8, rather than converting to the user's
character set.
 
 .\" Examples go here
 .SH EXAMPLES
-------------- next part --------------
Index: po/fr.po
==================================================================--- po/fr.po
(revision 11702)
+++ po/fr.po	(working copy)
@@ -731,7 +731,7 @@
 #: oggenc/encode.c:359
 #, c-format
 msgid "\tEncoding [%2dm%.2ds so far] %c"
-msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c"
+msgstr "\tCodage [%2dm%.2ds pour l'instant] %c"
 
 #: oggenc/encode.c:377
 #, c-format
@@ -789,7 +789,7 @@
 "         %s%s%s \n"
 "at average bitrate %d kbps "
 msgstr ""
-"Encodage de %s%s%s \n"
+"Codage de %s%s%s \n"
 "         en %s%s%s \n"
 "au débit moyen de %d kbps "
 
@@ -810,7 +810,7 @@
 "         %s%s%s \n"
 "at approximate bitrate %d kbps (VBR encoding enabled)\n"
 msgstr ""
-"Encodage de %s%s%s \n"
+"Codage de %s%s%s \n"
 "         en %s%s%s \n"
 "au débit approximatif de %d kbps (encodage VBR en cours)\n"
 
@@ -821,7 +821,7 @@
 "         %s%s%s \n"
 "at quality level %2.2f using constrained VBR "
 msgstr ""
-"Encodage de %s%s%s \n"
+"Codage de %s%s%s \n"
 "         en %s%s%s \n"
 "au niveau de qualité %2.2f en utilisant un VBR contraint "
 
@@ -832,7 +832,7 @@
 "         %s%s%s \n"
 "at quality %2.2f\n"
 msgstr ""
-"Encodage de %s%s%s \n"
+"Codage de %s%s%s \n"
 "         en %s%s%s \n"
 "à la qualité %2.2f\n"
 
@@ -843,7 +843,7 @@
 "         %s%s%s \n"
 "using bitrate management "
 msgstr ""
-"Encodage de %s%s%s \n"
+"Codage de %s%s%s \n"
 "         en %s%s%s \n"
 "en utilisant la gestion du débit "