summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-01-30 10:28:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 23:59:39 +0000
commit1357d222387b19a84431ae3a24fcb3a18e20faa8 (patch)
treef174a1ab6b439b240b0b577b01a49f8d31be46f0
parent3bb0b9ae97f89507b742cd9b3e03f37c2d928270 (diff)
downloadpoky-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>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc1
-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.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch9
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch17
-rw-r--r--meta/recipes-graphics/tasks/task-poky-clutter.bb4
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 0c3aa9aff0..544c2d3c72 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"
24SRCREV_pn-clutter-gtk-0.8 ??= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" 24SRCREV_pn-clutter-gtk-0.8 ??= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
25SRCREV_pn-clutter-gtk-0.10 ??= "b92329c4c1288019e2dea6567e2b5e98eb0a9992" 25SRCREV_pn-clutter-gtk-0.10 ??= "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
26SRCREV_pn-clutter-gtk-1.0 ??= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8" 26SRCREV_pn-clutter-gtk-1.0 ??= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8"
27SRCREV_pn-clutter-gtk-1.4 ??= "1d19fc17674175f4338c8e2526e911157801e754"
27SRCREV_pn-clutter-mozembed ??= "738d017beb5579b2ff6e4d992d4889b61c974751" 28SRCREV_pn-clutter-mozembed ??= "738d017beb5579b2ff6e4d992d4889b61c974751"
28SRCREV_pn-connman ??= "36e877dece72577a3ae6197eafd505d0e6e0c1d2" 29SRCREV_pn-connman ??= "36e877dece72577a3ae6197eafd505d0e6e0c1d2"
29SRCREV_pn-connman-gnome ??= "b589f4f89bff20d54682cc6b49efa86feac8adb4" 30SRCREV_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 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 @@
1require clutter-gtk.inc 1require clutter-gtk.inc
2 2
3PV = "0.90.0+git${SRCPV}" 3PV = "0.90.0+git${SRCPV}"
4PR = "r2" 4PR = "r0"
5 5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \ 6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \
7 file://disable_deprecated.patch" 7 file://disable_deprecated.patch \
8 file://enable_tests.patch \
9 "
8 10
9LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 11LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
10 12
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+"
7FILESPATH = "${FILE_DIRNAME}/clutter-gtk" 7FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
8 8
9PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" 10FILES_${PN}-examples = "${bindir}/*"
11 11
12inherit autotools pkgconfig gtk-doc 12inherit autotools pkgconfig gtk-doc
13 13
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
7Index: git/clutter-gtk/Makefile.am 7Index: 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 @@
1Install the test binary needed for poky-image-clutter
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Index: 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 \
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index f740d74c54..c5d829d071 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"
26RDEPENDS_task-poky-clutter-core = "\ 26RDEPENDS_task-poky-clutter-core = "\
27 clutter-1.4 \ 27 clutter-1.4 \
28 clutter-gst-1.0 \ 28 clutter-gst-1.0 \
29 clutter-gtk-1.0" 29 clutter-gtk-1.4"
30 30
31RDEPENDS_task-poky-clutter-tests = "\ 31RDEPENDS_task-poky-clutter-tests = "\
32 clutter-gst-1.0-examples \ 32 clutter-gst-1.0-examples \
33 clutter-gtk-1.0-examples" 33 clutter-gtk-1.4-examples"
34 34
35#RDEPENDS_task-poky-clutter-apps = "\ 35#RDEPENDS_task-poky-clutter-apps = "\
36# clutter-box2d " 36# clutter-box2d "