From 1cf8d700eb9fee0790bc02e2a24f04c1ca13c2b5 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <st3r4g@protonmail.com>
Date: Wed, 30 Oct 2019 13:36:47 +0100
Subject: [PATCH] weston: update to 7.0.0

---
 common/shlibs                     |  2 +-
 srcpkgs/weston/patches/musl.patch | 41 -------------------------------
 srcpkgs/weston/template           |  6 ++---
 3 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/weston/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index a79ef996138..5a5e1b19030 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2810,7 +2810,7 @@ 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.21 libqalculate-3.0.0_1
-libweston-6.so.0 weston-6.0.0_1
+libweston-7.so.0 weston-7.0.0_1
 libostree-1.so.1 libostree-2017.3_1
 librhash.so.0 rhash-1.3.4_1
 libserialport.so.0 libserialport-0.1.1_1
diff --git a/srcpkgs/weston/patches/musl.patch b/srcpkgs/weston/patches/musl.patch
deleted file mode 100644
index 5c99b8a4976..00000000000
--- a/srcpkgs/weston/patches/musl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- libweston/weston-launch.c	2016-10-22 10:23:57.000000000 -0600
-+++ libweston/weston-launch.c	2017-04-11 12:34:26.299944516 -0600
-@@ -33,7 +33,6 @@
- #include <poll.h>
- #include <errno.h>
- 
--#include <error.h>
- #include <getopt.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
-+
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 17585bc7205..c9aeb093981 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,11 +1,11 @@
 # Template file for 'weston'
 pkgname=weston
-version=6.0.1
+version=7.0.0
 revision=1
 build_style=meson
 configure_args="-Dtest-junit-xml=false -Dbackend-rdp=false -Dsystemd=false
  -Dremoting=false -Dlauncher-logind=$(vopt_if elogind true false)
- -Dbackend-drm-screencast-vaapi=$(vopt_if vaapi true false)"
+ -Dbackend-drm-screencast-vaapi=$(vopt_if vaapi true false) -Dpipewire=false"
 hostmakedepends="pkg-config wayland-devel wayland-protocols"
 makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
  pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=bf2f6d5aae2e11cabb6bd69a76bcf9edb084f8c3e14ca769bea7234a513155b4
+checksum=a00a6d207b6a45f95f4401c604772a307c3767e5e2beecf3d879110c43909a64
 system_groups="weston-launch"
 lib32disabled=yes