summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-11-07 11:55:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 17:31:34 +0000
commit18ada13f7b47b2c00681289a20161452ad4d3fdf (patch)
tree47c5102e454eee5a61657174e64bcf570d8e75c8 /meta/recipes-graphics
parentae03f3161f5b3dbaa35935e09e7dab848de0ba66 (diff)
downloadpoky-18ada13f7b47b2c00681289a20161452ad4d3fdf.tar.gz
clutter: upgrade
Delete fix-wayland-deps.patch, it was a backport from upstream. Delete enable_tests which installed the non-inuititive interactive test suite, instead install the examples. (From OE-Core rev: 927a0065c7ce03465125b5b91258c337d2ac7bd2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch36
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch57
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc8
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch28
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb7
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb8
6 files changed, 39 insertions, 105 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch
deleted file mode 100644
index f97d598090..0000000000
--- a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Make tests installable
2
3The test applications are useful for image testing.
4
5Imported from clutter 1.8 package, git://git.openembedded.org/openembedded,
6commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header.
7
8Upstream-Status: Inappropriate [configuration]
9Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
10
11Index: git/tests/interactive/Makefile.am
12===================================================================
13--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
14+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
15@@ -88,7 +88,7 @@
16
17 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
18
19-noinst_PROGRAMS = test-interactive
20+bin_PROGRAMS = test-interactive
21
22 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
23 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
24Index: git/tests/interactive/test-actors.c
25===================================================================
26--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
27+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
28@@ -178,7 +178,7 @@
29 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
30 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
31
32- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
33+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
34 real_hand = clutter_texture_new_from_file (file, &error);
35 if (real_hand == NULL)
36 g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
deleted file mode 100644
index f5af73c9fc..0000000000
--- a/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba Mon Sep 17 00:00:00 2001
5From: Emmanuele Bassi <ebassi@gnome.org>
6Date: Thu, 27 Jun 2013 16:42:40 +0100
7Subject: [PATCH] build: Enable Cogl support with Wayland
8
9The Wayland backend is based on Cogl, so we need to turn on the
10SUPPORT_COGL flag to avoid breaking the build; this always went
11unnoticed because we usually build the Wayland client backend
12with the X11 backend.
13
14Reported-by: Ross Burton <ross.burton@intel.com>
15(cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27)
16
17Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
18---
19 configure.ac | 6 +++++-
20 1 file changed, 5 insertions(+), 1 deletion(-)
21
22diff --git a/configure.ac b/configure.ac
23index f5afe12..355c95b 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -310,6 +310,7 @@ AS_IF([test "x$enable_wayland" = "xyes"],
27 experimental_backend="yes"
28
29 SUPPORT_WAYLAND=1
30+ SUPPORT_COGL=1
31
32 PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0],
33 [
34@@ -337,7 +338,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"],
35 [
36 PKG_CHECK_EXISTS([wayland-server],
37 [BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], [])
38+
39 SUPPORT_WAYLAND_COMPOSITOR=1
40+ SUPPORT_COGL=1
41+
42 CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
43 #define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1"
44 AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support])
45@@ -359,8 +363,8 @@ AS_IF([test "x$enable_cex100" = "xyes"],
46
47 experimental_backend="yes"
48
49- SUPPORT_COGL=1
50 SUPPORT_CEX100=1
51+ SUPPORT_COGL=1
52
53 have_gdl=no
54 AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes])
55--
561.7.10.4
57
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 1356586fd8..d9311fea4d 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -4,11 +4,8 @@ LICENSE = "LGPLv2.1+"
4 4
5inherit clutter 5inherit clutter
6 6
7SRC_URI += "file://enable_tests.patch \
8 file://fix-wayland-deps.patch"
9
10DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" 7DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
11PACKAGES =+ "${PN}-examples" 8PACKAGE_BEFORE_PN += "${PN}-examples"
12AUTOTOOLS_AUXDIR = "${S}/build" 9AUTOTOOLS_AUXDIR = "${S}/build"
13 10
14EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" 11EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
@@ -39,7 +36,8 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla
39PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 36PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
40 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" 37 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
41 38
42FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 39FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
40FILES_${PN}-examples = "${libdir}/clutter/examples"
43 41
44do_configure_prepend() { 42do_configure_prepend() {
45 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this 43 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
new file mode 100644
index 0000000000..d96b038999
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
@@ -0,0 +1,28 @@
1Install the examples to $libdir/clutter/.
2
3Signed-off-by: Ross Burton <ross.burton@intel.com>
4Upstream-Status: Inappropriate
5
6diff --git a/examples/Makefile.am b/examples/Makefile.am
7index 4b9b449..232cd19 100644
8--- a/examples/Makefile.am
9+++ b/examples/Makefile.am
10@@ -31,7 +31,7 @@ LDADD = \
11 AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
12
13 AM_CPPFLAGS = \
14- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
15+ -DTESTS_DATADIR=\""$(exampledir)"\" \
16 -DG_DISABLE_SINGLE_INCLUDES \
17 -DGLIB_DISABLE_DEPRECATION_WARNINGS \
18 -I$(top_srcdir) \
19@@ -39,6 +39,8 @@ AM_CPPFLAGS = \
20 -I$(top_srcdir)/clutter \
21 -I$(top_builddir)/clutter
22
23-noinst_PROGRAMS = $(all_examples)
24+exampledir = $(pkglibdir)/examples
25+example_PROGRAMS = $(all_examples)
26+example_DATA = $(top_srcdir)/tests/data/redhand.png
27
28 -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
deleted file mode 100644
index 35824c60b5..0000000000
--- a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1
2require clutter-1.0.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5
6SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf"
7SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb
new file mode 100644
index 0000000000..d9dfa59dc6
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.16.0.bb
@@ -0,0 +1,8 @@
1require clutter-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4
5SRC_URI[archive.md5sum] = "873c97b825c366e13e1f281e8e1f549b"
6SRC_URI[archive.sha256sum] = "a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae"
7
8SRC_URI += "file://install-examples.patch"