temp/weston: remove, changes have been upstreamed (!421)
This commit is contained in:
parent
2e31fbb242
commit
30e708c0f7
4 changed files with 0 additions and 191 deletions
|
|
@ -1,128 +0,0 @@
|
|||
# Forked from Alpine to enable logind support
|
||||
# https://github.com/alpinelinux/aports/pull/8035
|
||||
pkgname=weston
|
||||
pkgver=6.0.0
|
||||
pkgrel=1
|
||||
_libname=lib$pkgname
|
||||
_libdir=$_libname-${pkgver%%.*}
|
||||
pkgdesc="The reference Wayland server"
|
||||
url="https://wayland.freedesktop.org/"
|
||||
arch="all !s390x !ppc64le"
|
||||
license="MIT"
|
||||
depends=""
|
||||
makedepends="wayland-protocols libxkbcommon-dev xkeyboard-config
|
||||
libinput-dev libunwind-dev mtdev-dev libxcursor-dev glu-dev
|
||||
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"
|
||||
_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
|
||||
"
|
||||
for _sub in $_cms $_shell $_client $_backend; do
|
||||
subpackages="$subpackages $pkgname-$_sub:_sub"
|
||||
done
|
||||
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
|
||||
timespec.patch
|
||||
weston-launch-custom-error-function.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
# weston-launch requires suid
|
||||
options="!check suid"
|
||||
install="$pkgname.pre-install"
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
meson \
|
||||
-Dprefix=/usr \
|
||||
-Dlauncher-logind=true \
|
||||
-Dsystemd=false \
|
||||
-Dsimple-dmabuf-drm=auto \
|
||||
build
|
||||
ninja -C build
|
||||
}
|
||||
|
||||
# Does not run through, see also:
|
||||
# https://github.com/alpinelinux/aports/pull/1689
|
||||
check() {
|
||||
ninja -C "$builddir"/build test
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" ninja -C "$builddir"/build install
|
||||
}
|
||||
|
||||
libs() {
|
||||
depends="xkeyboard-config"
|
||||
default_libs
|
||||
}
|
||||
|
||||
_libd() {
|
||||
pkgdesc="Desktop shells abstraction library for libweston compositors"
|
||||
mkdir -p "$subpkgdir"/usr/lib
|
||||
mv "$pkgdir"/usr/lib/*desktop* "$subpkgdir"/usr/lib
|
||||
}
|
||||
|
||||
clients() {
|
||||
pkgdesc="Weston example clients"
|
||||
mkdir -p "$subpkgdir"/usr/bin
|
||||
mv "$pkgdir"/usr/bin/$pkgname-* "$subpkgdir"/usr/bin
|
||||
}
|
||||
|
||||
xwayland() {
|
||||
pkgdesc="Wayland module to run X Clients"
|
||||
mkdir -p "$subpkgdir"/usr/lib/$_libdir
|
||||
mv "$pkgdir"/usr/lib/$_libdir/xwayland.so \
|
||||
"$subpkgdir"/usr/lib/$_libdir
|
||||
}
|
||||
|
||||
_x11() {
|
||||
pkgdesc="Weston desktop helper pack (x11 backend)"
|
||||
depends="$pkgname $pkgname-shell-desktop $pkgname-xwayland
|
||||
$pkgname-backend-x11 $pkgname-terminal"
|
||||
mkdir -p "$subpkgdir"
|
||||
}
|
||||
|
||||
_sub() {
|
||||
local name path
|
||||
case $subpkgname in
|
||||
*-cms-*)
|
||||
name=${subpkgname#$pkgname-cms-}
|
||||
path=/usr/lib/$pkgname
|
||||
pkgdesc="Weston CMS module: $name"
|
||||
name=cms-$name.so
|
||||
;;
|
||||
*-shell-*)
|
||||
name=${subpkgname#$pkgname-shell-}
|
||||
path=/usr/lib/$pkgname
|
||||
pkgdesc="Weston shell: $name"
|
||||
name=*$name-shell*
|
||||
;;
|
||||
*-backend-*)
|
||||
name=${subpkgname#$pkgname-backend-}
|
||||
path=/usr/lib/$_libdir
|
||||
pkgdesc="Weston backend: $name"
|
||||
name=$name-backend.so
|
||||
grep -q cairo "$pkgdir"/$path/$name && depends="mesa-dri-swrast"
|
||||
;;
|
||||
*)
|
||||
name=$subpkgname
|
||||
path=/usr/bin
|
||||
[ -x "$pkgdir"/$path/$name ] || name=${subpkgname#$pkgname-}
|
||||
pkgdesc="Weston client: $name"
|
||||
;;
|
||||
esac
|
||||
mkdir -p "$subpkgdir"/$path || return 1
|
||||
mv "$pkgdir"/$path/$name "$subpkgdir"/$path
|
||||
}
|
||||
|
||||
sha512sums="127ab64b689f202acca4d9461e4decfd42357e4bbb63493af257b3b20b693a8ab4207b3c6b97663cefeed200505aad5f32b6a064db2e53fa1e201877613b394f weston-6.0.0.tar.xz
|
||||
3e596af4bf0a6b06a5d28376043db111fe1c161ead04501fa6d2c667b5a21889cca3354d1bdc4ac794841bef68ed5e1a7a84e44e7d510e947e3673195706caed timespec.patch
|
||||
3f742a29075fd447995cdda283d12655910925811b22a28fc279bcc7cf5c7c1a888cd391bec42d934b3bad24578504c642882100f15647178f6f6f89a8405916 weston-launch-custom-error-function.patch"
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/tests/timespec-test.c
|
||||
+++ b/tests/timespec-test.c
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include <time.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
addgroup -S weston-launch 2>/dev/null
|
||||
|
||||
exit 0
|
||||
Loading…
Add table
Add a link
Reference in a new issue