From e3f2eef813b8c79fb28077606f0da33d04633c26 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 18 Apr 2017 23:18:56 +0200 Subject: [PATCH] xorg-server: fix crossbuild --- srcpkgs/xorg-server/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 3191312c5e..7c879b7a6f 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,12 +1,12 @@ # Template build file for 'xorg-server'. pkgname=xorg-server version=1.19.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-ipv6 --enable-record --enable-xorg --enable-xnest --enable-xephyr --enable-composite --enable-xvfb --disable-static --disable-config-hal --disable-xfbdev --disable-xfake - --enable-config-udev --enable-config-udev-kms --enable-xwayland + --enable-config-udev --enable-config-udev-kms --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto --disable-dmx --disable-xfree86-utils --enable-kdrive-mouse @@ -39,17 +39,19 @@ makedepends=" depends="xkeyboard-config" provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-23_1 xf86-video-modesetting-1_1" replaces="xf86-video-modesetting>=0" +subpackages="xorg-server-devel xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-server" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) - # Enable glamor/dri/opengl by default on x86. - configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx" + # Enable glamor/dri/opengl/xwayland by default on x86. + configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx --enable-xwayland" makedepends+=" MesaLib-devel" replaces+=" glamor-egl>=0" + subpackages+=" xorg-server-xwayland" ;; *) # Enable dri2 on !x86 via libdri. - configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3" + configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3 --disable-xwayland" makedepends+=" MesaLib-devel dri2proto libdri2-devel-git" ;; esac