X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id 136E95C4E2B for ; Tue, 6 Feb 2018 13:55:07 +0000 (GMT) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 9BF4E40066 for ; Tue, 6 Feb 2018 14:54:38 +0100 (CET) Received: from localhost.localdomain (euk-gateway.cs.uni-magdeburg.de [141.44.25.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 285D34005F; Tue, 6 Feb 2018 14:54:38 +0100 (CET) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [alpine-aports] [PATCH] testing/weston: Added weston-launch Date: Tue, 6 Feb 2018 14:55:04 +0100 Message-Id: <20180206135504.24917-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.16.1 X-PMX-Version: 6.4.2.2738846, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2018.2.6.134516, AntiVirus-Engine: 5.46.1.0, AntiVirus-Data: 2018.2.6.5461000 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, URI_WITH_PATH_ONLY 0, __ANY_URI 0, __C230066_P5 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FRAUD_WEBMAIL 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HTTPS_URI 0, __INT_PROD_COMP 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0' X-Spam-Score: Gauge=IIIIIIII X-PMX-consideredAsSpam: no X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/weston/APKBUILD | 17 ++++---- .../weston-launch-custom-error-function.patch | 48 ++++++++++++++++++++++ testing/weston/weston.pre-install | 5 +++ 3 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 testing/weston/weston-launch-custom-error-function.patch create mode 100644 testing/weston/weston.pre-install diff --git a/testing/weston/APKBUILD b/testing/weston/APKBUILD index bf09e29eee..9785f278e2 100644 --- a/testing/weston/APKBUILD +++ b/testing/weston/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Valery Kartel pkgname=weston pkgver=3.0.0 -pkgrel=0 +pkgrel=2 _libname=lib$pkgname _libdir=$_libname-${pkgver%%.*} pkgdesc="The reference Wayland server" @@ -13,6 +13,7 @@ depends="" makedepends="wayland-protocols libxkbcommon-dev xkeyboard-config libinput-dev libunwind-dev mtdev-dev libxcursor-dev glu-dev pango-dev colord-dev freerdp-dev libwebp-dev libva-dev dbus-dev + linux-pam-dev " _cms="cms-colord cms-static" _shell="shell-desktop shell-fullscreen shell-ivi" @@ -28,9 +29,12 @@ subpackages="$pkgname-dev $pkgname-doc $subpackages $pkgname-xwayland $pkgname-desktop-x11:_x11:noarch " source="http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz - timespec.patch" + timespec.patch + weston-launch-custom-error-function.patch" builddir="$srcdir/$pkgname-$pkgver" -options="!check" +# weston-launch requires suid +options="!check suid" +install="$pkgname.pre-install" build() { cd "$builddir" @@ -46,9 +50,7 @@ build() { --enable-screen-sharing \ --enable-vaapi-recorder \ --enable-clients \ - --enable-demo-clients-install \ - --disable-weston-launch \ - --disable-setuid-install + --enable-demo-clients-install make } @@ -128,4 +130,5 @@ _sub() { } sha512sums="b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58 weston-3.0.0.tar.xz -3e596af4bf0a6b06a5d28376043db111fe1c161ead04501fa6d2c667b5a21889cca3354d1bdc4ac794841bef68ed5e1a7a84e44e7d510e947e3673195706caed timespec.patch" +3e596af4bf0a6b06a5d28376043db111fe1c161ead04501fa6d2c667b5a21889cca3354d1bdc4ac794841bef68ed5e1a7a84e44e7d510e947e3673195706caed timespec.patch +3f742a29075fd447995cdda283d12655910925811b22a28fc279bcc7cf5c7c1a888cd391bec42d934b3bad24578504c642882100f15647178f6f6f89a8405916 weston-launch-custom-error-function.patch" diff --git a/testing/weston/weston-launch-custom-error-function.patch b/testing/weston/weston-launch-custom-error-function.patch new file mode 100644 index 0000000000..cd42950e71 --- /dev/null +++ b/testing/weston/weston-launch-custom-error-function.patch @@ -0,0 +1,48 @@ +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 +--- + 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 + #include + +-#include + #include + + #include +@@ -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) + { diff --git a/testing/weston/weston.pre-install b/testing/weston/weston.pre-install new file mode 100644 index 0000000000..0db3c455be --- /dev/null +++ b/testing/weston/weston.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +addgroup -S weston-launch 2>/dev/null + +exit 0 -- 2.16.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---