weston: Upgrade weston_1.6.0.bb -> weston_1.8.0.bb

Make error() portable, Fix build on musl

copyright year changed for weston compositor.c

- * Copyright © 2012 Collabora, Ltd.
+ * Copyright © 2012-2015 Collabora, Ltd.

(From OE-Core rev: 4f401540b2055fd6fb8a5edac6811199379dba90)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 12 insertions, 8 deletions

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
index 062da5cee5..68ba38ba8e 100644
--- a/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
+++ b/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch
@@ -1,13 +1,17 @@
-Index: weston-1.5.0/configure.ac
+Index: git/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])
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -501,12 +501,6 @@ if test "x$have_lcms" = xyes; then
  fi
+ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
  
--PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
-+#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
- 
+-AC_PATH_PROG([wayland_scanner], [wayland-scanner])
+-if test x$wayland_scanner = x; then
+-       PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
+-       wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
+-fi
+-
  AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
  
+ AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])