summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/weston
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-05-22 09:02:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-27 16:11:54 +0100
commit0882d265d83bcf816c1513cf594cdd35a309af8c (patch)
treec6c57740a267d8e4e8808d0533c37912d2de9cb5 /meta/recipes-graphics/wayland/weston
parent87e2ce604e6fbe2814a923e5077ad4d0a562e790 (diff)
downloadpoky-0882d265d83bcf816c1513cf594cdd35a309af8c.tar.gz
weston: upgrade to 1.5.0
* replace 0001-remove-dependence-on-wayland-scanner-flags.patch with disable-wayland-scanner-pkg-check.patch * add make-lcms-configureable.patch (WIP... needs work) = fix for JaMa test-dependencies (From OE-Core rev: 7c40efb62f34f866c98a0b2df50d66c60d76143a) Signed-off-by: Tim Orling <TicoTimo@gmail.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/wayland/weston')
-rw-r--r--meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch30
-rw-r--r--meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch13
-rw-r--r--meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch22
3 files changed, 35 insertions, 30 deletions
diff --git a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch b/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch
deleted file mode 100644
index 14606c86c3..0000000000
--- a/meta/recipes-graphics/wayland/weston/0001-remove-dependence-on-wayland-scanner-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From a0335393ddde2228c84eda1081b5d7b175f78a94 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com>
3Date: Fri, 7 Feb 2014 16:59:58 +0200
4Subject: [PATCH] remove dependence on wayland-scanner flags
5
6weston doesn't make use of wayland-scanner flags,
7it only uses the -native- wayland-scanner for protocol.
8
9Upstream-Status: Pending
10Signed-off-by: Valentin Popa <valentin.popa@intel.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index cce1850..8775eb9 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -482,7 +482,7 @@ if test x$wayland_scanner = x; then
20 AC_MSG_ERROR([wayland-scanner is needed to compile weston])
21 fi
22
23-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
24+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
25 AC_PATH_PROG(XMLLINT, xmllint)
26 AC_ARG_WITH([dtddir],
27 AS_HELP_STRING([--with-dtddir],
28--
291.8.3.2
30
diff --git a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
new file mode 100644
index 0000000000..062da5cee5
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
@@ -0,0 +1,13 @@
1Index: weston-1.5.0/configure.ac
2===================================================================
3--- weston-1.5.0.orig/configure.ac
4+++ weston-1.5.0/configure.ac
5@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then
6 AC_MSG_ERROR([wayland-scanner is needed to compile weston])
7 fi
8
9-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
10+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
11
12 AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
13
diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
new file mode 100644
index 0000000000..817ac70a15
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
@@ -0,0 +1,22 @@
1Index: weston-1.5.0/configure.ac
2===================================================================
3--- weston-1.5.0.orig/configure.ac
4+++ weston-1.5.0/configure.ac
5@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install,
6 enable_demo_clients_install=no)
7 AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
8
9+AC_ARG_ENABLE(lcms,
10+ AS_HELP_STRING([--disable-lcms],
11+ [disable lcms support]),,
12+ enable_lcms=yes)
13+
14+AS_IF([test "x$enable_lcms" != "no"], [
15 PKG_CHECK_MODULES(LCMS, lcms2,
16- [have_lcms=yes], [have_lcms=no])
17+ [have_lcms=yes], [have_lcms=no])],
18+ [have_lcms=no])
19+
20 if test "x$have_lcms" = xyes; then
21 AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
22 fi