slomo gst-plugins-base: gst-plugins-base/ gst-plugins-base/ext/gio/

--===============6876061677195803053==

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     slomo
Date:           Wed Jan 07 2009  18:36:18 UTC

Log message:
* configure.ac:
* ext/gio/gstgio.c: (plugin_init):
Add plugin dependency for the GIO and GVfs modules.
Fixes bug #566876.

Modified files:
    .               : ChangeLog configure.ac
    ext/gio         : gstgio.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4283&r2=1.4284
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/configure.ac.diff?r1=1.760&r2=1.761
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gio/gstgio.c.diff?r1=1.11&r2=1.12

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4283
retrieving revision 1.4284
diff -u -d -r1.4283 -r1.4284
--- ChangeLog	7 Jan 2009 18:32:32 -0000	1.4283
+++ ChangeLog	7 Jan 2009 18:36:01 -0000	1.4284
@@ -1,6 +1,13 @@
 2009-01-07  Sebastian Dröge  <[email protected]>
 
 	* configure.ac:
+	* ext/gio/gstgio.c: (plugin_init):
+	Add plugin dependency for the GIO and GVfs modules.
+	Fixes bug #566876.
+
+2009-01-07  Sebastian Dröge  <[email protected]>
+	* configure.ac:
 	* ext/gnomevfs/gstgnomevfs.c: (plugin_init):
 	Add plugin dependency for the gnomevfs modules.
 	Fixes bug #566875.
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-base/configure.ac,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -d -r1.760 -r1.761
--- configure.ac	7 Jan 2009 18:32:33 -0000	1.760
+++ configure.ac	7 Jan 2009 18:36:03 -0000	1.761
@@ -484,7 +484,15 @@
 USE_GIO=$BUILD_EXPERIMENTAL
 translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true)
 AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [
-  PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.2, HAVE_GIO="yes", [
+  PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.2, [
+    HAVE_GIO="yes"
+    GIO_MODULE_DIR="`$PKG_CONFIG --variable=giomoduledir gio-2.0`"
+    AC_DEFINE_UNQUOTED(GIO_MODULE_DIR, "$GIO_MODULE_DIR",
+           [The GIO modules directory.])
+    GIO_LIBDIR="`$PKG_CONFIG --variable=libdir gio-2.0`"
+    AC_DEFINE_UNQUOTED(GIO_LIBDIR, "$GIO_LIBDIR",
+           [The GIO library directory.])
+  ], [
     HAVE_GIO="no"
     AC_MSG_RESULT(no)
   ])
Index: gstgio.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gio/gstgio.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gstgio.c	20 Apr 2008 10:11:54 -0000	1.11
+++ gstgio.c	7 Jan 2009 18:36:04 -0000	1.12
@@ -230,6 +230,11 @@
   GST_DEBUG_CATEGORY_INIT (gst_gio_debug, "gio", 0, "GIO elements");
+  gst_plugin_add_dependency_simple (plugin, NULL, GIO_MODULE_DIR, NULL,
+      GST_PLUGIN_DEPENDENCY_FLAG_NONE);
+  gst_plugin_add_dependency_simple (plugin, "LD_LIBRARY_PATH", GIO_LIBDIR,
+      "gvfsd", GST_PLUGIN_DEPENDENCY_FLAG_NONE);
   /* FIXME: Rank is MARGINAL for now, should be at least SECONDARY+1 in the future
    * to replace gnomevfssink/src. For testing purposes PRIMARY+1 one makes sense
    * so it gets autoplugged and preferred over filesrc/sink. */


--===============6876061677195803053==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
--===============6876061677195803053==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

--===============6876061677195803053==--