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 | |
| parent | 3bb0b9ae97f89507b742cd9b3e03f37c2d928270 (diff) | |
| download | openembedded-core-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')
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb (renamed from meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb) | 8 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk.inc | 2 | ||||
| -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 |
4 files changed, 28 insertions, 8 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb index ddb7d5aaaf..3822b31d5e 100644 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb @@ -1,10 +1,12 @@ require clutter-gtk.inc PV = "0.90.0+git${SRCPV}" -PR = "r2" +PR = "r0" -SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \ - file://disable_deprecated.patch" +SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \ + file://disable_deprecated.patch \ + file://enable_tests.patch \ + " LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" diff --git a/meta/recipes-graphics/clutter/clutter-gtk.inc b/meta/recipes-graphics/clutter/clutter-gtk.inc index 25b5200ca2..8492d9f53f 100644 --- a/meta/recipes-graphics/clutter/clutter-gtk.inc +++ b/meta/recipes-graphics/clutter/clutter-gtk.inc @@ -7,7 +7,7 @@ DEPENDS = "gtk+" FILESPATH = "${FILE_DIRNAME}/clutter-gtk" PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" +FILES_${PN}-examples = "${bindir}/*" inherit autotools pkgconfig gtk-doc 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> 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 <edwin.zhai@intel.com> + +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 \ |