diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2011-01-30 10:28:17 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 23:59:39 +0000 |
| commit | 1357d222387b19a84431ae3a24fcb3a18e20faa8 (patch) | |
| tree | f174a1ab6b439b240b0b577b01a49f8d31be46f0 /meta/recipes-graphics/clutter/clutter-gtk | |
| parent | 3bb0b9ae97f89507b742cd9b3e03f37c2d928270 (diff) | |
| download | poky-1357d222387b19a84431ae3a24fcb3a18e20faa8.tar.gz | |
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 <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-gtk')
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch | 9 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch | 17 |
2 files changed, 22 insertions, 4 deletions
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 <sgw@linux.intel.com> | |||
| 6 | 6 | ||
| 7 | Index: git/clutter-gtk/Makefile.am | 7 | Index: git/clutter-gtk/Makefile.am |
| 8 | =================================================================== | 8 | =================================================================== |
| 9 | --- git.orig/clutter-gtk/Makefile.am 2010-11-16 11:04:29.000000000 -0800 | 9 | --- git.orig/clutter-gtk/Makefile.am 2011-01-30 13:10:29.000000000 +0800 |
| 10 | +++ git/clutter-gtk/Makefile.am 2010-11-16 11:06:16.278993999 -0800 | 10 | +++ git/clutter-gtk/Makefile.am 2011-01-30 13:15:09.000000000 +0800 |
| 11 | @@ -16,7 +16,6 @@ | 11 | @@ -15,8 +15,6 @@ |
| 12 | -DCLUTTER_GTK_COMPILATION \ | ||
| 12 | -DG_DISABLE_DEPRECATED \ | 13 | -DG_DISABLE_DEPRECATED \ |
| 13 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ | 14 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ |
| 14 | -DGDK_DISABLE_DEPRECATED \ | 15 | - -DGDK_DISABLE_DEPRECATED \ |
| 15 | - -DGTK_DISABLE_DEPRECATED \ | 16 | - -DGTK_DISABLE_DEPRECATED \ |
| 16 | -DCLUTTER_DISABLE_DEPRECATED \ | 17 | -DCLUTTER_DISABLE_DEPRECATED \ |
| 17 | $(CLUTTER_GTK_DEBUG_CFLAGS) \ | 18 | $(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 @@ | |||
| 1 | Install the test binary needed for poky-image-clutter | ||
| 2 | |||
| 3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | ||
| 4 | |||
| 5 | Index: git/examples/Makefile.am | ||
| 6 | =================================================================== | ||
| 7 | --- git.orig/examples/Makefile.am 2011-01-31 09:58:47.000000000 +0800 | ||
| 8 | +++ git/examples/Makefile.am 2011-01-31 09:59:02.000000000 +0800 | ||
| 9 | @@ -2,7 +2,7 @@ | ||
| 10 | |||
| 11 | NULL = | ||
| 12 | |||
| 13 | -noinst_PROGRAMS = \ | ||
| 14 | +bin_PROGRAMS = \ | ||
| 15 | animated-notebook \ | ||
| 16 | expose-test \ | ||
| 17 | gtk-clutter-events \ | ||