parent
517e93edc0
commit
de62525708
5 changed files with 0 additions and 238 deletions
|
@ -1,39 +0,0 @@
|
|||
From 7c21c1974c11ce6bf5901e7267104bde0ff00c15 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Smith <ollieparanoid@bitmessage.ch>
|
||||
Date: Wed, 28 Nov 2018 08:19:16 +0100
|
||||
Subject: [PATCH] compositor-fbdev: add support for ABGR
|
||||
|
||||
Thanks to Pablo Castellano for the original patch.
|
||||
---
|
||||
libweston/compositor-fbdev.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
|
||||
index a71b7bdc..44d15077 100644
|
||||
--- a/libweston/compositor-fbdev.c
|
||||
+++ b/libweston/compositor-fbdev.c
|
||||
@@ -234,8 +234,8 @@ calculate_pixman_format(struct fb_var_screeninfo *vinfo,
|
||||
vinfo->blue.msb_right != 0)
|
||||
return 0;
|
||||
|
||||
- /* Work out the format type from the offsets. We only support RGBA and
|
||||
- * ARGB at the moment. */
|
||||
+ /* Work out the format type from the offsets. We only support RGBA, ARGB
|
||||
+ * and ABGR at the moment. */
|
||||
type = PIXMAN_TYPE_OTHER;
|
||||
|
||||
if ((vinfo->transp.offset >= vinfo->red.offset ||
|
||||
@@ -247,6 +247,10 @@ calculate_pixman_format(struct fb_var_screeninfo *vinfo,
|
||||
vinfo->green.offset >= vinfo->blue.offset &&
|
||||
vinfo->blue.offset >= vinfo->transp.offset)
|
||||
type = PIXMAN_TYPE_RGBA;
|
||||
+ else if (vinfo->transp.offset >= vinfo->blue.offset &&
|
||||
+ vinfo->blue.offset >= vinfo->green.offset &&
|
||||
+ vinfo->green.offset >= vinfo->red.offset)
|
||||
+ type = PIXMAN_TYPE_ABGR;
|
||||
|
||||
if (type == PIXMAN_TYPE_OTHER)
|
||||
return 0;
|
||||
--
|
||||
2.17.2
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
# Forked from Alpine until the ABGR patch lands in Alpine's package:
|
||||
# https://gitlab.freedesktop.org/wayland/weston/merge_requests/61
|
||||
pkgname=weston
|
||||
pkgver=9999
|
||||
_pkgver=5.0.0
|
||||
pkgrel=16
|
||||
_libname=lib$pkgname
|
||||
_libdir=$_libname-${_pkgver%%.*}
|
||||
pkgdesc="The reference Wayland server"
|
||||
url="https://wayland.freedesktop.org/"
|
||||
arch="all"
|
||||
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
|
||||
"
|
||||
_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
|
||||
0001-compositor-fbdev-add-support-for-ABGR.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$_pkgver"
|
||||
# weston-launch requires suid
|
||||
options="!check suid"
|
||||
install="$pkgname.pre-install"
|
||||
|
||||
build() {
|
||||
cd "$builddir"
|
||||
./configure \
|
||||
--build=$CBUILD \
|
||||
--host=$CHOST \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var \
|
||||
--libexecdir=/usr/lib/$pkgname \
|
||||
--enable-screen-sharing \
|
||||
--enable-vaapi-recorder \
|
||||
--enable-clients \
|
||||
--enable-demo-clients-install
|
||||
make
|
||||
}
|
||||
|
||||
# Does not run through, see also:
|
||||
# https://github.com/alpinelinux/aports/pull/1689
|
||||
check() {
|
||||
make -C "$builddir" check
|
||||
return 0
|
||||
}
|
||||
|
||||
package() {
|
||||
make -C "$builddir" DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
libs() {
|
||||
depends="xkeyboard-config"
|
||||
default_libs
|
||||
}
|
||||
|
||||
_libd() {
|
||||
pkgdesc="Desktop shells abstraction library for libweston compositors"
|
||||
mkdir -p "$subpkgdir"/usr/lib || return 1
|
||||
mv "$pkgdir"/usr/lib/*desktop* "$subpkgdir"/usr/lib
|
||||
}
|
||||
|
||||
clients() {
|
||||
pkgdesc="Weston example clients"
|
||||
mkdir -p "$subpkgdir"/usr/bin || return 1
|
||||
mv "$pkgdir"/usr/bin/$pkgname-* "$subpkgdir"/usr/bin
|
||||
}
|
||||
|
||||
xwayland() {
|
||||
pkgdesc="Wayland module to run X Clients"
|
||||
mkdir -p "$subpkgdir"/usr/lib/$_libdir || return 1
|
||||
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="b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf weston-5.0.0.tar.xz
|
||||
3e596af4bf0a6b06a5d28376043db111fe1c161ead04501fa6d2c667b5a21889cca3354d1bdc4ac794841bef68ed5e1a7a84e44e7d510e947e3673195706caed timespec.patch
|
||||
3f742a29075fd447995cdda283d12655910925811b22a28fc279bcc7cf5c7c1a888cd391bec42d934b3bad24578504c642882100f15647178f6f6f89a8405916 weston-launch-custom-error-function.patch
|
||||
788e9ea291ce2d3e96965456ff6ca8a15ba2dda18eee37bca744f826a3277d087e9fb637c6d57175036872c2c9c0e052180ab4212af811eac1a232178a23f663 0001-compositor-fbdev-add-support-for-ABGR.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…
Reference in a new issue