diff options
| author | Tim-Philipp Müller <tpm@src.gnome.org> | 2007-03-05 09:31:17 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tpm@src.gnome.org> | 2007-03-05 09:31:17 +0000 |
| commit | 3d60e141b9aa939f4ae28845cedcd5cbba52087f (patch) | |
| tree | 294782cf3461157c20537a0ed8c05f452c27a53f | |
| parent | 658ca13168a011dcb18df31812d1bce6996084f5 (diff) | |
| download | totem-3d60e141b9aa939f4ae28845cedcd5cbba52087f.tar.gz | |
Fix build against GStreamer gst-plugins-base CVS.
* configure.in:
* src/totem-missing-plugins.c:
(totem_missing_plugins_setup):
Fix build against GStreamer gst-plugins-base CVS.
svn path=/trunk/; revision=4087
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | src/totem-missing-plugins.c | 6 |
3 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2007-03-05 Tim-Philipp Müller <tim at centricular dot net> + + * configure.in: + * src/totem-missing-plugins.c: + (totem_missing_plugins_setup): + Fix build against GStreamer gst-plugins-base CVS. + 2007-03-04 Bastien Nocera <hadess@hadess.net> * src/plparse/test-parser.c: (main): diff --git a/configure.in b/configure.in index 68cd681ca..26814cd2a 100644 --- a/configure.in +++ b/configure.in @@ -121,18 +121,18 @@ if test x$ENABLE_XINE = xno || test x$ENABLE_XINE = xauto; then AC_MSG_RESULT([$enable_easy_codec_installation]) if test "x$enable_easy_codec_installation" != "xno"; then - PKG_CHECK_MODULES(MISSING_PLUGINS, gstreamer-plugins-base-0.10 >= 0.10.11.1, + PKG_CHECK_MODULES(MISSING_PLUGINS, gstreamer-plugins-base-0.10 >= 0.10.11.2, [ dnl this is implicit, but let's spell it out anyway - GST_REQS=0.10.11.1 - GSTPLUG_REQS=0.10.11.1 - MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstbaseutils-0.10" + GST_REQS=0.10.11.2 + GSTPLUG_REQS=0.10.11.2 + MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10" AC_DEFINE([ENABLE_MISSING_PLUGIN_INSTALLATION], 1, [Whether we can and want to do installation of missing plugins]) ], [ dnl if it was requested explicitly, but we can't do it, error out if test "x$enable_easy_codec_installation" = "xyes"; then - AC_MSG_ERROR([GStreamer core/base >= 0.10.11.1 is required + AC_MSG_ERROR([GStreamer core/base >= 0.10.11.2 is required for missing plugin installation support.]) fi ]) diff --git a/src/totem-missing-plugins.c b/src/totem-missing-plugins.c index 8d0c83c92..035b2b659 100644 --- a/src/totem-missing-plugins.c +++ b/src/totem-missing-plugins.c @@ -29,8 +29,8 @@ #include "totem-private.h" #include "bacon-video-widget.h" -#include <gst/utils/base-utils.h> -#include <gst/utils/install-plugins.h> +#include <gst/pbutils/pbutils.h> +#include <gst/pbutils/install-plugins.h> #include <gst/gst.h> /* for gst_registry_update */ @@ -267,7 +267,7 @@ totem_missing_plugins_setup (Totem *totem) G_CALLBACK (totem_on_missing_plugins_event), totem); - gst_base_utils_init (); + gst_pb_utils_init (); GST_INFO ("Set up support for automatic missing plugin installation"); #endif |