aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-08-23 22:40:25 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-08-23 23:35:41 -0300
commit4a31b325d3c12cd80ce00431cd02312e7d51d436 (patch)
tree79f160fd191984a335d8a05a26bfdcc36cd28d9e
parenta9a403ab7f14e25e9e2ce11f85062e3e898d678b (diff)
downloadaports-4a31b325d3c12cd80ce00431cd02312e7d51d436.tar.bz2
aports-4a31b325d3c12cd80ce00431cd02312e7d51d436.tar.xz
testing/weston: upgrade to 7.0.0
-rw-r--r--testing/weston/APKBUILD16
-rw-r--r--testing/weston/weston-launch-custom-error-function.patch48
2 files changed, 7 insertions, 57 deletions
diff --git a/testing/weston/APKBUILD b/testing/weston/APKBUILD
index ac9c18b8e7..f552dad6c5 100644
--- a/testing/weston/APKBUILD
+++ b/testing/weston/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Valery Kartel <valery.kartel@gmail.com>
pkgname=weston
-pkgver=6.0.1
-pkgrel=1
+pkgver=7.0.0
+pkgrel=0
_libname=lib$pkgname
_libdir=$_libname-${pkgver%%.*}
pkgdesc="The reference Wayland server"
@@ -14,13 +14,13 @@ makedepends="wayland-protocols libxkbcommon-dev xkeyboard-config
pango-dev colord-dev libwebp-dev libva-dev dbus-dev
linux-pam-dev wayland-dev libevdev-dev libjpeg-turbo-dev
freerdp-dev lcms2-dev gstreamer-dev gst-plugins-base-dev meson
- elogind-dev
+ elogind-dev pipewire-dev
"
_cms="cms-colord cms-static"
_shell="shell-desktop shell-fullscreen shell-ivi"
_client="info terminal wcap-decode"
_backend="backend-drm backend-fbdev backend-headless
- backend-x11 backend-wayland
+ backend-x11 backend-wayland backend-rdp
"
for _sub in $_cms $_shell $_client $_backend; do
subpackages="$subpackages $pkgname-$_sub:_sub"
@@ -29,9 +29,8 @@ subpackages="$pkgname-dev $pkgname-doc $subpackages
$pkgname-clients $_libname-desktop:_libd $_libname:libs
$pkgname-xwayland $pkgname-desktop-x11:_x11:noarch
"
-source="https://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz
+source="https://wayland.freedesktop.org/releases/weston-$pkgver.tar.xz
timespec.patch
- weston-launch-custom-error-function.patch
"
# weston-launch requires suid
options="!check suid"
@@ -124,6 +123,5 @@ _sub() {
mv "$pkgdir"/$path/$name "$subpkgdir"/$path
}
-sha512sums="3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9 weston-6.0.1.tar.xz
-3e596af4bf0a6b06a5d28376043db111fe1c161ead04501fa6d2c667b5a21889cca3354d1bdc4ac794841bef68ed5e1a7a84e44e7d510e947e3673195706caed timespec.patch
-3f742a29075fd447995cdda283d12655910925811b22a28fc279bcc7cf5c7c1a888cd391bec42d934b3bad24578504c642882100f15647178f6f6f89a8405916 weston-launch-custom-error-function.patch"
+sha512sums="fa14467ab89fb12175830d9cf29d89dc04899fd21d801e60e85836e8e52e17e144be78098b3eedfab6c51b7fb055ecfabb456a8a74f4e40485134da59ac58ea3 weston-7.0.0.tar.xz
+3e596af4bf0a6b06a5d28376043db111fe1c161ead04501fa6d2c667b5a21889cca3354d1bdc4ac794841bef68ed5e1a7a84e44e7d510e947e3673195706caed timespec.patch"
diff --git a/testing/weston/weston-launch-custom-error-function.patch b/testing/weston/weston-launch-custom-error-function.patch
deleted file mode 100644
index cd42950e71..0000000000
--- a/testing/weston/weston-launch-custom-error-function.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://patchwork.freedesktop.org/patch/112884/
-
-error.h is a gnu extension and not available in other
-popular libcs like musl. This patch provides a replacement.
-
-Signed-off-by: Murray Calavera <murray.calavera@gmail.com>
----
- libweston/weston-launch.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 140fde1..84f7d60 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -33,7 +33,6 @@
- #include <poll.h>
- #include <errno.h>
-
--#include <error.h>
- #include <getopt.h>
-
- #include <sys/types.h>
-@@ -112,6 +111,25 @@ struct weston_launch {
-
- union cmsg_data { unsigned char b[4]; int fd; };
-
-+static void
-+error(int status, int errnum, const char *msg, ...)
-+{
-+ va_list args;
-+
-+ fputs("weston-launch: ", stderr);
-+ va_start(args, msg);
-+ vfprintf(stderr, msg, args);
-+ va_end(args);
-+
-+ if (errnum)
-+ fprintf(stderr, ": %s\n", strerror(errnum));
-+ else
-+ fputc('\n', stderr);
-+
-+ if (status)
-+ exit(status);
-+}
-+
- static gid_t *
- read_groups(void)
- {