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 @@
-From a0335393ddde2228c84eda1081b5d7b175f78a94 Mon Sep 17 00:00:00 2001
-From: Valentin Popa <valentin.popa@intel.com>
-Date: Fri, 7 Feb 2014 16:59:58 +0200
-Subject: [PATCH] remove dependence on wayland-scanner flags
-
-weston doesn't make use of wayland-scanner flags,
-it only uses the -native- wayland-scanner for protocol.
-
-Upstream-Status: Pending
-Signed-off-by: Valentin Popa <valentin.popa@intel.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cce1850..8775eb9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -482,7 +482,7 @@ if test x$wayland_scanner = x; then
-        AC_MSG_ERROR([wayland-scanner is needed to compile weston])
- fi
- 
--PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
-+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
- AC_PATH_PROG(XMLLINT, xmllint)
- AC_ARG_WITH([dtddir],
-            AS_HELP_STRING([--with-dtddir],
--- 
-1.8.3.2
-
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 @@
+Index: weston-1.5.0/configure.ac
+===================================================================
+--- weston-1.5.0.orig/configure.ac
++++ weston-1.5.0/configure.ac
+@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then
+        AC_MSG_ERROR([wayland-scanner is needed to compile weston])
+ fi
+ 
+-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
++#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
+ 
+ AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
+ 
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 @@
+Index: weston-1.5.0/configure.ac
+===================================================================
+--- weston-1.5.0.orig/configure.ac
++++ weston-1.5.0/configure.ac
+@@ -491,8 +491,16 @@ AC_ARG_ENABLE(demo-clients-install,
+                             enable_demo_clients_install=no)
+ AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
+ 
++AC_ARG_ENABLE(lcms,
++              AS_HELP_STRING([--disable-lcms],
++                             [disable lcms support]),,
++              enable_lcms=yes)
++
++AS_IF([test "x$enable_lcms" != "no"], [
+ PKG_CHECK_MODULES(LCMS, lcms2,
+-                  [have_lcms=yes], [have_lcms=no])
++                  [have_lcms=yes], [have_lcms=no])],
++                  [have_lcms=no])
++
+ if test "x$have_lcms" = xyes; then
+        AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
+ fi