Commit 95ba4c51 authored by Oliver Smith's avatar Oliver Smith

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';
parent e96e183c
# Based on the upstream weston aport # Forked from Alpine to add patches that make it work with weird framebuffer drivers
# Changes: # from downstream kernels
# - 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
pkgname=weston pkgname=weston
pkgver=9999 pkgver=9999
_pkgver=3.0.0 _pkgver=3.0.0
pkgrel=12 pkgrel=13
_libname=lib$pkgname _libname=lib$pkgname
_libdir=$_libname-${_pkgver%%.*} _libdir=$_libname-${_pkgver%%.*}
pkgdesc="The reference Wayland server" pkgdesc="The reference Wayland server"
...@@ -15,11 +11,14 @@ url="http://wayland.freedesktop.org" ...@@ -15,11 +11,14 @@ url="http://wayland.freedesktop.org"
arch="all" arch="all"
license="MIT" license="MIT"
depends="" 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" _cms="cms-colord cms-static"
_shell="shell-desktop shell-fullscreen shell-ivi" _shell="shell-desktop shell-fullscreen shell-ivi"
_client="info terminal wcap-decode" _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" options="!check suid"
for _sub in $_cms $_shell $_client $_backend; do for _sub in $_cms $_shell $_client $_backend; do
...@@ -50,7 +49,6 @@ build() { ...@@ -50,7 +49,6 @@ build() {
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--localstatedir=/var \ --localstatedir=/var \
--libexecdir=/usr/lib/$pkgname \ --libexecdir=/usr/lib/$pkgname \
--enable-rdp-compositor \
--enable-screen-sharing \ --enable-screen-sharing \
--enable-vaapi-recorder \ --enable-vaapi-recorder \
--enable-clients \ --enable-clients \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment