make --disable-index work (#342564)

Original commit message from CVS:
* gst/gstregistry.h:
* gst/gstregistryxml.c: (load_feature),
(gst_registry_xml_read_cache), (gst_registry_xml_save_feature):
* win32/common/config.h:
make --disable-index work (#342564)

diff --git a/ChangeLog b/ChangeLog
index 9ee6b6c..41172d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-18  Stefan Kost  <ensonic@users.sf.net>
+
+       * gst/gstregistry.h:
+       * gst/gstregistryxml.c: (load_feature),
+       (gst_registry_xml_read_cache), (gst_registry_xml_save_feature):
+       * win32/common/config.h:
+        make --disable-index work (#342564)
+
 2006-07-18  Wim Taymans  <wim@fluendo.com>
 
        Patch by: Peter Kjellerstedt <pkj at axis dot com>

diff --git a/gst/gstregistry.h b/gst/gstregistry.h
index 9ac1f03..3c65e00 100644 (file)
--- a/gst/gstregistry.h
+++ b/gst/gstregistry.h
@@ -25,6 +25,7 @@
 #define __GST_REGISTRY_H__
 
 #include <stdio.h> /* FIXME: because of cache_file below */
+#include <gst/gstconfig.h>
 #include <gst/gstplugin.h>
 #include <gst/gstpluginfeature.h>
 

diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c
index a427e77..d313dad 100644 (file)
--- a/gst/gstregistryxml.c
+++ b/gst/gstregistryxml.c
@@ -352,11 +352,13 @@ load_feature (xmlTextReaderPtr reader)
             g_free (s);
           }
         }
+#ifndef GST_DISABLE_INDEX
       } else if (GST_IS_INDEX_FACTORY (feature)) {
         GstIndexFactory *factory = GST_INDEX_FACTORY (feature);
 
         if (g_str_equal (tag, "longdesc"))
           read_string (reader, &factory->longdesc, TRUE);
+#endif
       }
     }
   }
@@ -497,7 +499,9 @@ gst_registry_xml_read_cache (GstRegistry * registry, const char *location)
   /* make sure these types exist */
   GST_TYPE_ELEMENT_FACTORY;
   GST_TYPE_TYPE_FIND_FACTORY;
+#ifndef GST_DISABLE_INDEX
   GST_TYPE_INDEX_FACTORY;
+#endif
 
   timer = g_timer_new ();
 
@@ -743,10 +747,12 @@ gst_registry_xml_save_feature (GstRegistry * registry,
         i++;
       }
     }
+#ifndef GST_DISABLE_INDEX
   } else if (GST_IS_INDEX_FACTORY (feature)) {
     if (!gst_registry_save_escaped (registry, "  ", "longdesc",
             GST_INDEX_FACTORY (feature)->longdesc))
       return FALSE;
+#endif
   }
   return TRUE;
 }

diff --git a/win32/common/config.h b/win32/common/config.h
index d19587e..3719e6f 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -24,7 +24,7 @@
 /* #undef GST_GCOV_ENABLED */
 
 /* Default errorlevel to use */
-#define GST_LEVEL_DEFAULT GST_LEVEL_NONE
+#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR
 
 /* GStreamer license */
 #define GST_LICENSE "LGPL"
@@ -33,7 +33,7 @@
 #define GST_MAJORMINOR "0.10"
 
 /* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer source release"
+#define GST_PACKAGE_NAME "GStreamer CVS/prerelease"
 
 /* package origin */
 #define GST_PACKAGE_ORIGIN "Unknown package origin"
@@ -197,13 +197,13 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 0.10.9"
+#define PACKAGE_STRING "GStreamer 0.10.9.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.9"
+#define PACKAGE_VERSION "0.10.9.1"
 
 /* Define the plugin directory */
 #ifdef _DEBUG
@@ -219,7 +219,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "0.10.9"
+#define VERSION "0.10.9.1"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */