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>
This commit is contained in:
Ross Burton
Richard Purdie
parent
ae03f3161f
commit
18ada13f7b
|
|
@ -1,36 +0,0 @@
|
|||
Make tests installable
|
||||
|
||||
The test applications are useful for image testing.
|
||||
|
||||
Imported from clutter 1.8 package, git://git.openembedded.org/openembedded,
|
||||
commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
|
||||
|
||||
Index: git/tests/interactive/Makefile.am
|
||||
===================================================================
|
||||
--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
|
||||
+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
|
||||
|
||||
-noinst_PROGRAMS = test-interactive
|
||||
+bin_PROGRAMS = test-interactive
|
||||
|
||||
test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
|
||||
test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
|
||||
Index: git/tests/interactive/test-actors.c
|
||||
===================================================================
|
||||
--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
|
||||
+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
|
||||
@@ -178,7 +178,7 @@
|
||||
oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
|
||||
oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
|
||||
|
||||
- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
|
||||
+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
|
||||
real_hand = clutter_texture_new_from_file (file, &error);
|
||||
if (real_hand == NULL)
|
||||
g_error ("image load failed: %s", error->message);
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From 74f9d8a597acf0fd8458e3d6cb0475b8d9a0a6ba Mon Sep 17 00:00:00 2001
|
||||
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||
Date: Thu, 27 Jun 2013 16:42:40 +0100
|
||||
Subject: [PATCH] build: Enable Cogl support with Wayland
|
||||
|
||||
The Wayland backend is based on Cogl, so we need to turn on the
|
||||
SUPPORT_COGL flag to avoid breaking the build; this always went
|
||||
unnoticed because we usually build the Wayland client backend
|
||||
with the X11 backend.
|
||||
|
||||
Reported-by: Ross Burton <ross.burton@intel.com>
|
||||
(cherry picked from commit 1fb0295ba162507fb798b2b7030f0f45ff252f27)
|
||||
|
||||
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
|
||||
---
|
||||
configure.ac | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f5afe12..355c95b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -310,6 +310,7 @@ AS_IF([test "x$enable_wayland" = "xyes"],
|
||||
experimental_backend="yes"
|
||||
|
||||
SUPPORT_WAYLAND=1
|
||||
+ SUPPORT_COGL=1
|
||||
|
||||
PKG_CHECK_EXISTS([wayland-client wayland-cursor xkbcommon gdk-pixbuf-2.0],
|
||||
[
|
||||
@@ -337,7 +338,10 @@ AS_IF([test "x$enable_wayland_compositor" = "xyes"],
|
||||
[
|
||||
PKG_CHECK_EXISTS([wayland-server],
|
||||
[BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-server"], [])
|
||||
+
|
||||
SUPPORT_WAYLAND_COMPOSITOR=1
|
||||
+ SUPPORT_COGL=1
|
||||
+
|
||||
CLUTTER_CONFIG_DEFINES="$CLUTTER_CONFIG_DEFINES
|
||||
#define CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT 1"
|
||||
AC_DEFINE([HAVE_CLUTTER_WAYLAND_COMPOSITOR], [1], [Have Wayland compositor support])
|
||||
@@ -359,8 +363,8 @@ AS_IF([test "x$enable_cex100" = "xyes"],
|
||||
|
||||
experimental_backend="yes"
|
||||
|
||||
- SUPPORT_COGL=1
|
||||
SUPPORT_CEX100=1
|
||||
+ SUPPORT_COGL=1
|
||||
|
||||
have_gdl=no
|
||||
AC_CHECK_HEADERS([libgdl.h], [have_gdl=yes])
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
@ -4,11 +4,8 @@ LICENSE = "LGPLv2.1+"
|
|||
|
||||
inherit clutter
|
||||
|
||||
SRC_URI += "file://enable_tests.patch \
|
||||
file://fix-wayland-deps.patch"
|
||||
|
||||
DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
|
||||
PACKAGES =+ "${PN}-examples"
|
||||
PACKAGE_BEFORE_PN += "${PN}-examples"
|
||||
AUTOTOOLS_AUXDIR = "${S}/build"
|
||||
|
||||
EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
|
||||
|
|
@ -39,7 +36,8 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla
|
|||
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
|
||||
${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
|
||||
|
||||
FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
|
||||
FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
|
||||
FILES_${PN}-examples = "${libdir}/clutter/examples"
|
||||
|
||||
do_configure_prepend() {
|
||||
# see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
Install the examples to $libdir/clutter/.
|
||||
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
diff --git a/examples/Makefile.am b/examples/Makefile.am
|
||||
index 4b9b449..232cd19 100644
|
||||
--- a/examples/Makefile.am
|
||||
+++ b/examples/Makefile.am
|
||||
@@ -31,7 +31,7 @@ LDADD = \
|
||||
AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
|
||||
+ -DTESTS_DATADIR=\""$(exampledir)"\" \
|
||||
-DG_DISABLE_SINGLE_INCLUDES \
|
||||
-DGLIB_DISABLE_DEPRECATION_WARNINGS \
|
||||
-I$(top_srcdir) \
|
||||
@@ -39,6 +39,8 @@ AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/clutter \
|
||||
-I$(top_builddir)/clutter
|
||||
|
||||
-noinst_PROGRAMS = $(all_examples)
|
||||
+exampledir = $(pkglibdir)/examples
|
||||
+example_PROGRAMS = $(all_examples)
|
||||
+example_DATA = $(top_srcdir)/tests/data/redhand.png
|
||||
|
||||
-include $(top_srcdir)/build/autotools/Makefile.am.gitignore
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
|
||||
require clutter-1.0.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI[archive.md5sum] = "c072e4c27e69368f2b877ea4f6da2cdf"
|
||||
SRC_URI[archive.sha256sum] = "c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c"
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
require clutter-1.0.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI[archive.md5sum] = "873c97b825c366e13e1f281e8e1f549b"
|
||||
SRC_URI[archive.sha256sum] = "a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae"
|
||||
|
||||
SRC_URI += "file://install-examples.patch"
|
||||
Loading…
Reference in New Issue