[xiph-commits] r12185 - in trunk/vorbis-tools: . ogg123 oggdec oggenc ogginfo share vcut vorbiscomment

Fri Dec 8 16:50:14 PST 2006

Author: conrad
Date: 2006-12-08 16:49:59 -0800 (Fri, 08 Dec 2006)
New Revision: 12185

Modified:
   trunk/vorbis-tools/configure.ac
   trunk/vorbis-tools/ogg123/audio.c
   trunk/vorbis-tools/ogg123/buffer.c
   trunk/vorbis-tools/ogg123/callbacks.c
   trunk/vorbis-tools/ogg123/cfgfile_options.c
   trunk/vorbis-tools/ogg123/cmdline_options.c
   trunk/vorbis-tools/ogg123/easyflac.c
   trunk/vorbis-tools/ogg123/file_transport.c
   trunk/vorbis-tools/ogg123/flac_format.c
   trunk/vorbis-tools/ogg123/format.c
   trunk/vorbis-tools/ogg123/ogg123.c
   trunk/vorbis-tools/ogg123/oggvorbis_format.c
   trunk/vorbis-tools/ogg123/playlist.c
   trunk/vorbis-tools/ogg123/speex_format.c
   trunk/vorbis-tools/ogg123/transport.c
   trunk/vorbis-tools/ogg123/vorbis_comments.c
   trunk/vorbis-tools/oggdec/oggdec.c
   trunk/vorbis-tools/oggenc/audio.c
   trunk/vorbis-tools/oggenc/easyflac.c
   trunk/vorbis-tools/oggenc/encode.c
   trunk/vorbis-tools/oggenc/flac.c
   trunk/vorbis-tools/oggenc/oggenc.c
   trunk/vorbis-tools/oggenc/platform.c
   trunk/vorbis-tools/oggenc/resample.c
   trunk/vorbis-tools/ogginfo/ogginfo2.c
   trunk/vorbis-tools/ogginfo/theora.c
   trunk/vorbis-tools/share/charset_test.c
   trunk/vorbis-tools/share/makemap.c
   trunk/vorbis-tools/vcut/vcut.c
   trunk/vorbis-tools/vorbiscomment/vcedit.c
   trunk/vorbis-tools/vorbiscomment/vcomment.c
Log:
Add largefile support. Closes ticket:879
>From debian patch for-upstream-largefile-support.diff
This patch adds AC_SYS_LARGEFILE to configure.ac, and ensures that config.h
is correctly included in all source files.


Modified: trunk/vorbis-tools/configure.ac
===================================================================

--- trunk/vorbis-tools/configure.ac	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/configure.ac	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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 --------------------------------------------------

Modified: trunk/vorbis-tools/ogg123/audio.c
===================================================================
--- trunk/vorbis-tools/ogg123/audio.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/audio.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>

Modified: trunk/vorbis-tools/ogg123/buffer.c
===================================================================
--- trunk/vorbis-tools/ogg123/buffer.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/buffer.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,9 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/wait.h>

Modified: trunk/vorbis-tools/ogg123/callbacks.c
===================================================================
--- trunk/vorbis-tools/ogg123/callbacks.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/callbacks.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 

Modified: trunk/vorbis-tools/ogg123/cfgfile_options.c
===================================================================
--- trunk/vorbis-tools/ogg123/cfgfile_options.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/cfgfile_options.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>

Modified: trunk/vorbis-tools/ogg123/cmdline_options.c
===================================================================
--- trunk/vorbis-tools/ogg123/cmdline_options.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/cmdline_options.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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"

Modified: trunk/vorbis-tools/ogg123/easyflac.c
===================================================================
--- trunk/vorbis-tools/ogg123/easyflac.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/easyflac.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -33,6 +33,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include "easyflac.h"
 

Modified: trunk/vorbis-tools/ogg123/file_transport.c
===================================================================
--- trunk/vorbis-tools/ogg123/file_transport.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/file_transport.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/vorbis-tools/ogg123/flac_format.c
===================================================================
--- trunk/vorbis-tools/ogg123/flac_format.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/flac_format.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

Modified: trunk/vorbis-tools/ogg123/format.c
===================================================================
--- trunk/vorbis-tools/ogg123/format.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/format.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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"

Modified: trunk/vorbis-tools/ogg123/ogg123.c
===================================================================
--- trunk/vorbis-tools/ogg123/ogg123.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/ogg123.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -18,6 +18,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>

Modified: trunk/vorbis-tools/ogg123/oggvorbis_format.c
===================================================================
--- trunk/vorbis-tools/ogg123/oggvorbis_format.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/oggvorbis_format.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/vorbis-tools/ogg123/playlist.c
===================================================================
--- trunk/vorbis-tools/ogg123/playlist.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/playlist.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/vorbis-tools/ogg123/speex_format.c
===================================================================
--- trunk/vorbis-tools/ogg123/speex_format.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/speex_format.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/vorbis-tools/ogg123/transport.c
===================================================================
--- trunk/vorbis-tools/ogg123/transport.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/transport.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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"
 

Modified: trunk/vorbis-tools/ogg123/vorbis_comments.c
===================================================================
--- trunk/vorbis-tools/ogg123/vorbis_comments.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogg123/vorbis_comments.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/vorbis-tools/oggdec/oggdec.c
===================================================================
--- trunk/vorbis-tools/oggdec/oggdec.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggdec/oggdec.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -7,6 +7,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>

Modified: trunk/vorbis-tools/oggenc/audio.c
===================================================================
--- trunk/vorbis-tools/oggenc/audio.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/audio.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -8,6 +8,9 @@
  ** AIFF/AIFC support from OggSquish, (c) 1994-1996 Monty <xiphmont at 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"

Modified: trunk/vorbis-tools/oggenc/easyflac.c
===================================================================
--- trunk/vorbis-tools/oggenc/easyflac.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/easyflac.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -33,6 +33,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include "easyflac.h"
 

Modified: trunk/vorbis-tools/oggenc/encode.c
===================================================================
--- trunk/vorbis-tools/oggenc/encode.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/encode.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -9,6 +9,9 @@
  ** and libvorbis examples, (c) Monty <monty at xiph.org>
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>

Modified: trunk/vorbis-tools/oggenc/flac.c
===================================================================
--- trunk/vorbis-tools/oggenc/flac.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/flac.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -7,6 +7,9 @@
  **
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>

Modified: trunk/vorbis-tools/oggenc/oggenc.c
===================================================================
--- trunk/vorbis-tools/oggenc/oggenc.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/oggenc.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -9,6 +9,10 @@
  * and libvorbis examples, (c) Monty <monty at 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"

Modified: trunk/vorbis-tools/oggenc/platform.c
===================================================================
--- trunk/vorbis-tools/oggenc/platform.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/platform.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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"

Modified: trunk/vorbis-tools/oggenc/resample.c
===================================================================
--- trunk/vorbis-tools/oggenc/resample.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/oggenc/resample.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>

Modified: trunk/vorbis-tools/ogginfo/ogginfo2.c
===================================================================
--- trunk/vorbis-tools/ogginfo/ogginfo2.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogginfo/ogginfo2.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>

Modified: trunk/vorbis-tools/ogginfo/theora.c
===================================================================
--- trunk/vorbis-tools/ogginfo/theora.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/ogginfo/theora.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -15,6 +15,10 @@
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "theora.h"

Modified: trunk/vorbis-tools/share/charset_test.c
===================================================================
--- trunk/vorbis-tools/share/charset_test.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/share/charset_test.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>
 

Modified: trunk/vorbis-tools/share/makemap.c
===================================================================
--- trunk/vorbis-tools/share/makemap.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/share/makemap.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>

Modified: trunk/vorbis-tools/vcut/vcut.c
===================================================================
--- trunk/vorbis-tools/vcut/vcut.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/vcut/vcut.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>

Modified: trunk/vorbis-tools/vorbiscomment/vcedit.c
===================================================================
--- trunk/vorbis-tools/vorbiscomment/vcedit.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/vorbiscomment/vcedit.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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>

Modified: trunk/vorbis-tools/vorbiscomment/vcomment.c
===================================================================
--- trunk/vorbis-tools/vorbiscomment/vcomment.c	2006-12-09 00:43:20 UTC (rev 12184)
+++ trunk/vorbis-tools/vorbiscomment/vcomment.c	2006-12-09 00:49:59 UTC (rev 12185)
@@ -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"

