diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 1 | ||||
| -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 | ||||
| -rw-r--r-- | meta/recipes-graphics/tasks/task-poky-clutter.bb | 4 |
6 files changed, 31 insertions, 10 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 0c3aa9aff..544c2d3c7 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -24,6 +24,7 @@ SRCREV_pn-clutter-gtk-0.6 ??= "2ba362a1a223c2b28541030a80aa11191615340a" SRCREV_pn-clutter-gtk-0.8 ??= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" SRCREV_pn-clutter-gtk-0.10 ??= "b92329c4c1288019e2dea6567e2b5e98eb0a9992" SRCREV_pn-clutter-gtk-1.0 ??= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8" +SRCREV_pn-clutter-gtk-1.4 ??= "1d19fc17674175f4338c8e2526e911157801e754" SRCREV_pn-clutter-mozembed ??= "738d017beb5579b2ff6e4d992d4889b61c974751" SRCREV_pn-connman ??= "36e877dece72577a3ae6197eafd505d0e6e0c1d2" SRCREV_pn-connman-gnome ??= "b589f4f89bff20d54682cc6b49efa86feac8adb4" 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 ddb7d5aaa..3822b31d5 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 25b5200ca..8492d9f53 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 fbfaceeef..df0c52c1d 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 000000000..e91b8272f --- /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 \ diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb index f740d74c5..c5d829d07 100644 --- a/meta/recipes-graphics/tasks/task-poky-clutter.bb +++ b/meta/recipes-graphics/tasks/task-poky-clutter.bb @@ -26,11 +26,11 @@ ALLOW_EMPTY = "1" RDEPENDS_task-poky-clutter-core = "\ clutter-1.4 \ clutter-gst-1.0 \ - clutter-gtk-1.0" + clutter-gtk-1.4" RDEPENDS_task-poky-clutter-tests = "\ clutter-gst-1.0-examples \ - clutter-gtk-1.0-examples" + clutter-gtk-1.4-examples" #RDEPENDS_task-poky-clutter-apps = "\ # clutter-box2d " |