Merge pull request #6162 from Sir-Boops/weston

weston: update to 2.0.0

common/shlibs

@@ -2807,3 +2807,4 @@ libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.7 libqalculate-0.9.11_1
+libweston-2.so.0 weston-2.0.0_1

srcpkgs/weston/patches/0001-make-error-portable.patch

@@ -1,80 +0,0 @@
-From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH weston] make error() portable
-
-error() is not posix but gnu extension so may not be available on all
-kind of systemsi e.g. musl.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- configure.ac        |  2 ++
- src/weston-error.h  | 20 ++++++++++++++++++++
- src/weston-launch.c |  2 +-
- 3 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 src/weston-error.h
-
-diff --git configure.ac configure.ac
-index 263fc22..f52cd62 100644
---- configure.ac
-+++ configure.ac
-@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
- 	      [[#include <time.h>]])
- AC_CHECK_HEADERS([execinfo.h])
- 
-+AC_CHECK_HEADERS([error.h])
-+
- AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
- 
- COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2"
-diff --git src/weston-error.h src/weston-error.h
-new file mode 100644
-index 0000000..2089d02
---- /dev/null
-+++ src/weston-error.h
-@@ -0,0 +1,20 @@
-+#ifndef _WESTON_ERROR_H
-+#define _WESTON_ERROR_H
-+
-+#if defined(HAVE_ERROR_H)
-+#include <error.h>
-+#else
-+#include <err.h>
-+#include <string.h>
-+#define _weston_error(S, E, F, ...) do { \
-+	if (E) \
-+		err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
-+	else \
-+		err(S, F, ##__VA_ARGS__); \
-+} while(0)
-+
-+#define error _weston_error
-+#endif
-+
-+#endif
-+
-diff --git src/weston-launch.c src/weston-launch.c
-index 10c66de..3e6d30a 100644
---- src/weston-launch.c
-+++ src/weston-launch.c
-@@ -30,7 +30,6 @@
- #include <poll.h>
- #include <errno.h>
- 
--#include <error.h>
- #include <getopt.h>
- 
- #include <sys/types.h>
-@@ -56,6 +55,7 @@
- #endif
- 
- #include "weston-launch.h"
-+#include "weston-error.h"
- 
- #define DRM_MAJOR 226
- 
--- 
-2.1.4
-

srcpkgs/weston/patches/musl.patch

@@ -1,10 +1,41 @@
---- shared/xalloc.h.orig	2016-06-01 07:31:00.671473482 +0200
+--- libweston/weston-launch.c	2016-10-22 10:23:57.000000000 -0600
-+++ shared/xalloc.h	2016-06-01 07:31:13.382610803 +0200
++++ libweston/weston-launch.c	2017-04-11 12:34:26.299944516 -0600
-@@ -32,6 +32,7 @@ extern "C" {
+@@ -33,7 +33,6 @@
+ #include <poll.h>
+ #include <errno.h>
  
- #include <stdlib.h>
+-#include <error.h>
- #include <string.h>
+ #include <getopt.h>
-+#include <inttypes.h>
  
- #include "zalloc.h"
+ #include <sys/types.h>
+@@ -59,6 +58,7 @@
+ #endif
  
+ #include "weston-launch.h"
++#include "src/weston-error.h"
+ 
+ #define DRM_MAJOR 226
+ 
+
+--- /dev/null	2017-04-11 08:58:10.024649386 -0600
++++ src/weston-error.h	2017-04-11 12:38:10.575544091 -0600
+@@ -0,0 +1,19 @@
++#ifndef _WESTON_ERROR_H
++#define _WESTON_ERROR_H
++
++#if defined(HAVE_ERROR_H)
++#include <error.h>
++#else
++#include <err.h>
++#include <string.h>
++#define _weston_error(S, E, F, ...) do { \
++       if (E) \
++               err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
++       else \
++               err(S, F, ##__VA_ARGS__); \
++} while(0)
++
++#define error _weston_error
++#endif
++#endif
++

srcpkgs/weston/template

@@ -1,7 +1,7 @@
 # Template file for 'weston'.
 pkgname=weston
-version=1.11.1
+version=2.0.0
-revision=2
+revision=1
 build_style=gnu-configure
 # XXX enable rdp compositor if freerdp is updated to >=1.1.
 configure_args="--enable-libinput-backend --disable-setuid-install
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://wayland.freedesktop.org/"
 license="MIT"
 distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=548973496a5c8613d6690f9120f21066946a544df65ce4fe0ef153a8dc0bf6de
+checksum=b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8
 
 system_groups="weston-launch"
 lib32disabled=yes
@@ -72,12 +72,12 @@ weston-colord_package() {
 weston-x11_package() {
 	short_desc+=" - x11 backend"
 	pkg_install() {
-		vmove /usr/lib/weston/x11-backend.so
+		vmove /usr/lib/libweston-2/x11-backend.so
 	}
 }
 weston-xwayland_package() {
 	short_desc+=" - xwayland backend"
 	pkg_install() {
-		vmove /usr/lib/weston/xwayland.so
+		vmove /usr/lib/libweston-2/xwayland.so
 	}
 }