[gst-cvs] thomasvs gstreamer: gstreamer/ gstreamer/gst/registries/ gstreamer/tools/

[Thomas V. S. <tho...@pd...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     thomasvs
Date:           Sun Mar 14 2004  09:54:34 PST

Log message:
g_error fix, m/m version fix

Modified files:
    .               : ChangeLog
    gst/registries  : gstxmlregistry.c
    tools           : gst-feedback-m.m gst-indent

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.319&r2=1.320
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/registries/gstxmlregistry.c.diff?r1=1.49&r2=1.50
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tools/gst-feedback-m.m.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tools/gst-indent.diff?r1=1.1&r2=1.2

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- a/ChangeLog	14 Mar 2004 16:40:23 -0000	1.319
+++ b/ChangeLog	14 Mar 2004 17:54:21 -0000	1.320
@@ -1,5 +1,14 @@
 2004-03-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* gst/registries/gstxmlregistry.c: (gst_xml_registry_load_plugin):
+          g_error_free the g_error
+	* tools/gst-feedback-m.m:
+          check for other versions of gstreamer
+	* tools/gst-indent:
+          use sh, not bash
+
+2004-03-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 	* tools/gst-register.c: do not spill paths when registries are not
           writable, until we fix the "user running gst-register" case.
Index: gstxmlregistry.c
RCS file: /cvs/gstreamer/gstreamer/gst/registries/gstxmlregistry.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- a/gstxmlregistry.c	13 Mar 2004 15:26:53 -0000	1.49
+++ b/gstxmlregistry.c	14 Mar 2004 17:54:22 -0000	1.50
@@ -141,6 +141,7 @@
       (GInstanceInitFunc) gst_xml_registry_init,
       NULL
     };
     xml_registry_type = g_type_register_static (GST_TYPE_REGISTRY,
 	"GstXMLRegistry", &xml_registry_info, 0);
   }
@@ -638,6 +639,7 @@
     if (error) {
       g_warning ("could not load plugin %s: %s", plugin->desc.name,
 	  error->message);
+      g_error_free (error);
     }
     return GST_REGISTRY_PLUGIN_LOAD_ERROR;
   } else if (loaded_plugin != plugin) {
Index: gst-feedback-m.m
RCS file: /cvs/gstreamer/gstreamer/tools/gst-feedback-m.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/gst-feedback-m.m	9 Mar 2004 17:50:43 -0000	1.1
+++ b/gst-feedback-m.m	14 Mar 2004 17:54:22 -0000	1.2
@@ -36,14 +36,18 @@
 echo
 echo "+   PKG-CONFIG INFORMATION"
-command_output "pkg-config --version"
-command_output "pkg-config gstreamer --modversion"
-command_output "pkg-config gstreamer --cflags"
-command_output "pkg-config gstreamer --libs"
-command_output "pkg-config gstreamer-libs --modversion"
-command_output "pkg-config gstreamer-libs --cflags"
-command_output "pkg-config gstreamer-libs --libs"
-echo
+for mm in 0.6 0.7 0.8
+do
+  echo "+   $mm"
+  command_output "pkg-config --version"
+  command_output "pkg-config gstreamer-$mm --modversion"
+  command_output "pkg-config gstreamer-$mm --cflags"
+  command_output "pkg-config gstreamer-$mm --libs"
+  command_output "pkg-config gstreamer-libs-$mm --modversion"
+  command_output "pkg-config gstreamer-libs-$mm --cflags"
+  command_output "pkg-config gstreamer-libs-$mm --libs"
+  echo
+done
 echo "+   GSTREAMER INFORMATION"
 command_output "which gst-register"
@@ -53,13 +57,13 @@
 command_output "gst-launch fakesrc num_buffers=5 ! fakesink"
 echo "++  looking for gstreamer libraries in common locations"
-for dirs in /usr/lib /usr/local/lib /home; do
+for dirs in /usr/lib /usr/local/lib; do
   if test -d $dirs; then
     find $dirs -name libgstreamer* | grep so
   fi
 done
 echo "++  looking for gstreamer headers in common locations"
-for dirs in /usr/include /usr/local/include /home; do
+for dirs in /usr/include /usr/local/include; do
     find $dirs -name gst.h
@@ -69,13 +73,13 @@
 command_output "gst-inspect volume"
 echo "++  looking for gstreamer volume plugin in common locations"
     find $dirs -name libgstvolume* | grep so
     find $dirs -name audio.h
Index: gst-indent
RCS file: /cvs/gstreamer/gstreamer/tools/gst-indent,v
--- a/gst-indent	13 Mar 2004 15:17:30 -0000	1.1
+++ b/gst-indent	14 Mar 2004 17:54:22 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 indent \
   --braces-on-if-line \
   --blank-lines-after-declarations \