aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter-1.0-1.14.4
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-1.0-1.14.4')
-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
2 files changed, 0 insertions, 93 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 @@
-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);
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 @@
-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
-