[GNUnet-SVN] r21464 - in Extractor: . src/plugins

[gnunet]

Author: grothoff
Date: 2012-05-13 21:15:48 +0200 (Sun, 13 May 2012)
New Revision: 21464

Modified:
   Extractor/INSTALL
   Extractor/src/plugins/Makefile.am
   Extractor/src/plugins/ebml_extractor.c
Log:
-fixing build issues

Modified: Extractor/INSTALL
===================================================================
--- Extractor/INSTALL   2012-05-13 18:07:10 UTC (rev 21463)
+++ Extractor/INSTALL   2012-05-13 19:15:48 UTC (rev 21464)
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2012-05-13 18:07:10 UTC (rev 21463)
+++ Extractor/src/plugins/Makefile.am   2012-05-13 19:15:48 UTC (rev 21464)
@@ -11,12 +11,16 @@
 
 SUBDIRS = . 
 
+if HAVE_VORBISFILE
+ PLUGIN_OGG=libextractor_ogg.la
+endif
+
 plugin_LTLIBRARIES = \
   libextractor_id3.la \
   libextractor_id3v2.la \
   libextractor_ebml.la \
   libextractor_s3m.la \
-  libextractor_ogg.la \
+  $(PLUGIN_OGG) \
   libextractor_png.la \
   libextractor_mp3.la
 

Modified: Extractor/src/plugins/ebml_extractor.c
===================================================================
--- Extractor/src/plugins/ebml_extractor.c      2012-05-13 18:07:10 UTC (rev 
21463)
+++ Extractor/src/plugins/ebml_extractor.c      2012-05-13 19:15:48 UTC (rev 
21464)
@@ -1003,10 +1003,12 @@
   if (state->valid_ebml && !state->reported_ebml)
   {
     state->reported_ebml = 1;
-    snprintf (format, MAX_STRING_SIZE, "%llu", state->ebml_version);
+    snprintf (format, MAX_STRING_SIZE, "%llu", (unsigned long long) 
state->ebml_version);
     format[MAX_STRING_SIZE] = '\0';
     ADD_EBML(format, EXTRACTOR_METATYPE_FORMAT_VERSION);
-    snprintf (format, MAX_STRING_SIZE, "%s %llu (EBML %llu)", state->doctype, 
state->doctype_version, state->ebml_version);
+    snprintf (format, MAX_STRING_SIZE, "%s %llu (EBML %llu)", state->doctype, 
+              (unsigned long long) state->doctype_version,
+              (unsigned long long) state->ebml_version);
     format[MAX_STRING_SIZE] = '\0';
     ADD_EBML (format, EXTRACTOR_METATYPE_RESOURCE_TYPE);
   }
@@ -1026,7 +1028,7 @@
     if (state->matroska_info_duration != -1.0)
     {
       uint64_t seconds = (uint64_t) ((state->matroska_info_duration * (float) 
state->matroska_info_timecode_scale) / 1e+9);
-      snprintf (format, MAX_STRING_SIZE, "%llus", seconds);
+      snprintf (format, MAX_STRING_SIZE, "%llus", (unsigned long long) 
seconds);
       format[MAX_STRING_SIZE] = '\0';
       ADD_MATROSKA(format, EXTRACTOR_METATYPE_DURATION);
     }
@@ -1159,7 +1161,9 @@
        * done either way (stretching horizontally or squishing vertically),
        * so let's stick to hard cold pixel counts.
        */
-      snprintf (format, MAX_STRING_SIZE, "%llux%llu", 
state->matroska_track_video_pixel_width, 
state->matroska_track_video_pixel_height);
+      snprintf (format, MAX_STRING_SIZE, "%llux%llu", 
+                (unsigned long long) state->matroska_track_video_pixel_width,
+                (unsigned long long) state->matroska_track_video_pixel_height);
       format[MAX_STRING_SIZE] = '\0';
       ADD_MATROSKA (format, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
     }
@@ -1176,13 +1180,14 @@
       hz_part[MAX_STRING_SIZE] = '\0';
 
       if (state->matroska_track_audio_bit_depth > 0)
-        snprintf (bit_part, MAX_STRING_SIZE, "%llu-bit ", 
state->matroska_track_audio_bit_depth);
+        snprintf (bit_part, MAX_STRING_SIZE, "%llu-bit ", (unsigned long long) 
state->matroska_track_audio_bit_depth);
       else
         bit_part[0] = '\0';
       bit_part[MAX_STRING_SIZE] = '\0';
 
       snprintf (format, MAX_STRING_SIZE, "%s track %s(%s, %llu-channel %sat 
%s) [%s]",
-          track_type_string, name_part, codec_part, 
state->matroska_track_audio_channels,
+          track_type_string, name_part, codec_part, 
+          (unsigned long long) state->matroska_track_audio_channels,
           bit_part, hz_part, state->matroska_track_language);
     }
     else