From 1357d222387b19a84431ae3a24fcb3a18e20faa8 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Sun, 30 Jan 2011 10:28:17 +0800 Subject: clutter-gtk-1.0: Upgrade to one version prior to 0.90.2 (clutter 1.4 series) 0.90.2 depends on unstable gtk+-2.90.x that is not in poky, so pick up one version prior to it. Also rebase disable_deprecated.patch to keep the API compatibility with gtk+ and install example binary for poky-image-clutter. Signed-off-by: Zhai Edwin --- .../clutter/clutter-gtk/disable_deprecated.patch | 9 +++++---- .../clutter/clutter-gtk/enable_tests.patch | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch (limited to 'meta/recipes-graphics/clutter/clutter-gtk') diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch index fbfaceeefd..df0c52c1d6 100644 --- a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch +++ b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch @@ -6,12 +6,13 @@ Signed-off-by: Saul Wold Index: git/clutter-gtk/Makefile.am =================================================================== ---- git.orig/clutter-gtk/Makefile.am 2010-11-16 11:04:29.000000000 -0800 -+++ git/clutter-gtk/Makefile.am 2010-11-16 11:06:16.278993999 -0800 -@@ -16,7 +16,6 @@ +--- git.orig/clutter-gtk/Makefile.am 2011-01-30 13:10:29.000000000 +0800 ++++ git/clutter-gtk/Makefile.am 2011-01-30 13:15:09.000000000 +0800 +@@ -15,8 +15,6 @@ + -DCLUTTER_GTK_COMPILATION \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ -DCLUTTER_DISABLE_DEPRECATED \ $(CLUTTER_GTK_DEBUG_CFLAGS) \ diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch new file mode 100644 index 0000000000..e91b8272f6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch @@ -0,0 +1,17 @@ +Install the test binary needed for poky-image-clutter + +Signed-off-by: Zhai Edwin + +Index: git/examples/Makefile.am +=================================================================== +--- git.orig/examples/Makefile.am 2011-01-31 09:58:47.000000000 +0800 ++++ git/examples/Makefile.am 2011-01-31 09:59:02.000000000 +0800 +@@ -2,7 +2,7 @@ + + NULL = + +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + animated-notebook \ + expose-test \ + gtk-clutter-events \ -- cgit v1.2.3-54-g00ecf