From 823299e5a7a30377d3e5f6b60883c4eedb656965 Mon Sep 17 00:00:00 2001 From: Petter Mabäcker Date: Thu, 17 Oct 2013 16:58:49 +0200 Subject: clutter: remove usage of FILESPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. However in clutter the default paths solves the problem if we put all patches in ${BP} directory instead. (From OE-Core rev: cc41cb61707da1b4ae029de70c922802067166c2) Signed-off-by: Petter Mabäcker Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../clutter/clutter-1.0-1.14.4/enable_tests.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch (limited to 'meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch') 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 new file mode 100644 index 0000000000..f97d598090 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch @@ -0,0 +1,36 @@ +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 + +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); -- cgit v1.2.3-54-g00ecf