From 535caa8ad3b9e69e1c5e9b9a5eeb11728d12cd1a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 10 May 2018 20:40:41 +0200 Subject: [PATCH] main/weston: fix build This makes weston build again on x86_64. (It still won't build for armhf and aarch64, because Alpine's mesa binary package is currently stuck there, I'll look into that as well.) Detailed fixes: 1. New makedepends needed, because mesa-libwayland-egl does not exist anymore (see Alpine's aports commits 257a236 and 4f8b36b): wayland-libs-egl wayland-dev This fixes configure errors: checking for EGL_TESTS... no configure: error: Package requirements (egl glesv2 wayland-client wayland-egl) were not met: Package 'wayland-client', required by 'virtual:world', not found Package 'wayland-egl', required by 'virtual:world', not found 2. Disable RDP backend, because Weston source is incompatible with freerdp 2.0.0. This avoids compilation errors like this one: libweston/compositor-rdp.c:193:5: error: 'SURFACE_BITS_COMMAND {aka struct _SURFACE_BITS_COMMAND}' has no member named 'bpp'; --- aports/main/weston/APKBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/aports/main/weston/APKBUILD b/aports/main/weston/APKBUILD index 647c3e41..db391bee 100644 --- a/aports/main/weston/APKBUILD +++ b/aports/main/weston/APKBUILD @@ -1,13 +1,9 @@ -# Based on the upstream weston aport -# Changes: -# - framebuffer no 0 hz patch for lg-mako, upstreamed here (this will be in the next weston release \o/): -# https://patchwork.freedesktop.org/patch/150943/ -# - APKBUILD arch changed to "all", upstreaming here: -# https://github.com/alpinelinux/aports/pull/1689 +# Forked from Alpine to add patches that make it work with weird framebuffer drivers +# from downstream kernels pkgname=weston pkgver=9999 _pkgver=3.0.0 -pkgrel=12 +pkgrel=13 _libname=lib$pkgname _libdir=$_libname-${_pkgver%%.*} pkgdesc="The reference Wayland server" @@ -15,11 +11,14 @@ url="http://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 freerdp-dev libwebp-dev libva-dev dbus-dev linux-pam-dev" +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-libs-egl 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-rdp backend-x11 backend-wayland" +_backend="backend-drm backend-fbdev backend-headless backend-x11 backend-wayland" options="!check suid" for _sub in $_cms $_shell $_client $_backend; do @@ -50,7 +49,6 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ - --enable-rdp-compositor \ --enable-screen-sharing \ --enable-vaapi-recorder \ --enable-clients \