diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | clutter-gst/Makefile.am | 2 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-util.h | 2 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 1 | ||||
| -rw-r--r-- | configure.ac | 4 |
6 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,14 @@ +2008-10-31 Emmanuele Bassi <ebassi@linux.intel.com> + + * configure.ac: + * Makefile.am: + * clutter-gst/Makefile.am: Bump to 0.9 and require Clutter + from trunk. + + * clutter-gst/clutter-gst-video-sink.c: + * clutter-gst/clutter-gst-util.c: Include <clutter/clutter.h> + and not sub-headers, now that we can't. + 2008-10-2 Robert Bragg <robert@linux.intel.com> * clutter-gst/doc/reference/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 57e82d1..7a7ebed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,15 +6,15 @@ endif DIST_SUBDIRS = clutter-gst examples doc -clutter-gst-0.8.pc: clutter-gst.pc - @cp -f clutter-gst.pc clutter-gst-0.8.pc +clutter-gst-0.9.pc: clutter-gst.pc + @cp -f clutter-gst.pc clutter-gst-0.9.pc -pkgconfig_DATA = clutter-gst-0.8.pc +pkgconfig_DATA = clutter-gst-0.9.pc pkgconfigdir = $(libdir)/pkgconfig EXTRA_DIST = clutter-gst.pc.in -CLEANFILES = clutter-gst-0.8.pc +CLEANFILES = clutter-gst-0.9.pc DISTCLEANFILES = clutter-gst.pc diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 9164306..c168893 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -30,5 +30,5 @@ lib_LTLIBRARIES = libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LIBADD = @CLUTTER_GST_LIBS@ $(GST_LIBS) libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_LDFLAGS = @CLUTTER_GST_LT_LDFLAGS@ -cluttergstheadersdir = $(includedir)/clutter-0.8/clutter-gst +cluttergstheadersdir = $(includedir)/clutter-0.9/clutter-gst cluttergstheaders_HEADERS = $(source_h) clutter-gst.h diff --git a/clutter-gst/clutter-gst-util.h b/clutter-gst/clutter-gst-util.h index b86967e..ebf5ec4 100644 --- a/clutter-gst/clutter-gst-util.h +++ b/clutter-gst/clutter-gst-util.h @@ -28,7 +28,7 @@ #ifndef _HAVE_CLUTTER_GST_UTIL_H #define _HAVE_CLUTTER_GST_UTIL_H -#include <clutter/clutter-main.h> +#include <clutter/clutter.h> G_BEGIN_DECLS diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 617baea..58a80f0 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -46,7 +46,6 @@ #include <gst/riff/riff-ids.h> #include <glib.h> -#include <clutter/clutter.h> #include <string.h> static gchar *ayuv_to_rgba_shader = \ diff --git a/configure.ac b/configure.ac index b509995..249df8a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # An odd micro number indicates in-progress developmen # An even micro number indicates a released version. m4_define(clutter_gst_major_version, 0) -m4_define(clutter_gst_minor_version, 8) +m4_define(clutter_gst_minor_version, 9) m4_define(clutter_gst_micro_version, 0) m4_define([clutter_gst_version], @@ -74,7 +74,7 @@ AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) dnl ======================================================================== -pkg_modules="clutter-0.8 >= 0.8.0" +pkg_modules="clutter-0.9 >= 0.9.0" PKG_CHECK_MODULES(CLUTTER_GST, [$pkg_modules]) dnl ======================================================================== |