summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2010-08-17 18:33:53 +0100
committerDamien Lespiau <damien.lespiau@intel.com>2010-08-18 11:40:44 +0100
commit1092a5a351aa6837c66b2bf9f024bd04c4fc1789 (patch)
tree347a92a099ba60115ea9e2ceb46cc1644c2fb3e1
parente9f5f6c50647c999c60f7914f31434d9a3fff606 (diff)
downloadclutter-gst-1092a5a351aa6837c66b2bf9f024bd04c4fc1789.tar.gz
build: Make clutter-gst 1.2.x require clutter < 1.3.0
Because of some internal changes in Clutter 1.3.x, clutter-gst 1.2.x only works with clutter < 1.3.0. With clutter < 1.2.x clutter-gst will print some warnings (as it tries to override properties of ClutterMedia that only exist in clutter 1.2.x) but will basically work, so let people build it.
-rw-r--r--clutter-gst.pc.in2
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/clutter-gst.pc.in b/clutter-gst.pc.in
index 27e35f8..db3db52 100644
--- a/clutter-gst.pc.in
+++ b/clutter-gst.pc.in
@@ -8,5 +8,5 @@ Description: Clutter GStreamer integration
Version: @VERSION@
Libs: -L${libdir} -lclutter-gst-@CLUTTER_GST_MAJORMINOR@
Cflags: -I${includedir}/clutter-@CLUTTER_API_VERSION@
-Requires: clutter-@CLUTTER_API_VERSION@ gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10
+Requires: clutter-@CLUTTER_API_VERSION@ < 1.3.0 gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10
Requires.private: gio-2.0
diff --git a/configure.ac b/configure.ac
index 16498b6..2ee3c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
dnl ========================================================================
-pkg_modules="clutter-1.0 >= 1.2.0 gio-2.0"
+pkg_modules="clutter-1.0 < 1.3.0 gio-2.0"
PKG_CHECK_MODULES(CLUTTER_GST, [$pkg_modules])
dnl ========================================================================