diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0')
4 files changed, 158 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch new file mode 100644 index 000000000..c4edff395 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch @@ -0,0 +1,105 @@ +From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi <ebassi@gnome.org> +Date: Thu, 18 Feb 2016 17:19:09 +0000 +Subject: [PATCH] build: Use AC_COMPILE_IFELSE + +Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf. +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 33 insertions(+), 33 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d72e0c..8ca3f94 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno], + # We need to manually check for Wayland support in Cogl because + # the windowing systems are not exposed in the pkg-config file + saved_CFLAGS="${CFLAGS}" +- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" ++ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" + + AC_MSG_CHECKING([for Wayland Cogl backend]) +- AC_TRY_COMPILE([#include <cogl/cogl.h>], +- [ +- #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT +- #error "No Wayland support in Cogl" +- #endif +- int main (void) { return 0; } +- ], +- [ +- AC_MSG_RESULT(yes) +- have_cogl_wayland=yes +- ], +- [ +- AC_MSG_RESULT(no) +- have_cogl_wayland=no +- ]) ++ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <cogl/cogl.h> ++]], ++[[ ++#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT ++#error Cogl compiled without Wayland support ++#endif ++]])], [ ++ AC_MSG_RESULT(yes) ++ have_cogl_wayland=yes ++ ], [ ++ AC_MSG_RESULT(no) ++ have_cogl_wayland=no ++ ]) ++ + CFLAGS="${saved_CFLAGS}" + AS_IF([test "x$have_cogl_wayland" = xyes], + [ +@@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"], + # We need to manually check for Mir support in Cogl because + # the windowing systems are not exposed in the pkg-config file + saved_CFLAGS="${CFLAGS}" +- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" ++ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" + + AC_MSG_CHECKING([for Mir Cogl backend]) +- AC_TRY_COMPILE([#include <cogl/cogl.h>], +- [ +- #ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT +- #error "No Mir support in Cogl" +- #endif +- int main (void) { return 0; } +- ], +- [ +- AC_MSG_RESULT(yes) +- have_cogl_mir=yes +- ], +- [ +- AC_MSG_RESULT(no) +- have_cogl_mir=no +- ]) + +- CFLAGS="${saved_CFLAGS}" ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <cogl/cogl.h> ++]], ++[[ ++#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT ++#error Cogl compiled without Mir support ++#endif ++]])], [ ++ AC_MSG_RESULT(yes) ++ have_cogl_mir=yes ++ ], [ ++ AC_MSG_RESULT(no) ++ have_cogl_mir=no ++ ]) ++ + AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")]) + + PKG_CHECK_EXISTS([mirclient], +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch new file mode 100644 index 000000000..3b6a70ef0 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -0,0 +1,18 @@ +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 +@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) + + EXTRA_DIST = redhand.png diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 000000000..f5c18c582 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -0,0 +1,32 @@ +From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 27 Apr 2015 20:12:33 +0300 +Subject: [PATCH] Run installed tests with tap output + +Configure output from installed-tests to be TAP compliant such that +gnome-desktop-testing-runner properly interprets the results. + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> +--- + build/autotools/glib-tap.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk +index 7c5f82b..844e17e 100644 +--- a/build/autotools/glib-tap.mk ++++ b/build/autotools/glib-tap.mk +@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) + %.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ +- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + + CLEANFILES += $(installed_test_meta_DATA) +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 000000000..98877e522 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter |
