From aedde5eb94fc56155bb4604042a7066a33617142 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 May 2015 15:35:14 +0200 Subject: [PATCH] weston: update for musl. --- srcpkgs/weston/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 4186267b80..1bb481ae0a 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -1,7 +1,7 @@ # Template file for 'weston'. pkgname=weston version=1.7.0 -revision=3 +revision=4 build_style=gnu-configure # XXX enable rdp compositor if freerdp is updated to >=1.1. configure_args="--enable-libinput-backend --disable-setuid-install @@ -27,14 +27,10 @@ makedepends="libpng-devel wayland-devel libxkbcommon-devel # Package build options build_options="backtrace dbus systemd vaapi" -build_options_default="backtrace dbus" - -if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - build_options_default+=" vaapi" -fi +build_options_default="dbus" case "$XBPS_TARGET_MACHINE" in -armv[67]l) # Assume RPi for now. +armv[67]l*) # Assume RPi for now. CFLAGS="-I${XBPS_CROSS_BASE}/opt/vc/include" LDFLAGS="-Wl,-R/opt/vc/lib" makedepends+=" rpi-firmware rpi-firmware-pcfiles" @@ -45,7 +41,8 @@ armv[67]l) # Assume RPi for now. --disable-setuid-install --disable-resize-optimization --enable-weston-launch WESTON_NATIVE_BACKEND=rpi-backend.so" ;; -x86_64|i686) +x86_64*|i686*) + build_options_default+=" vaapi" makedepends+=" glu-devel libva-devel" configure_args+=" --enable-vaapi-recorder" ;;