From e2136f561a57ddb31dc8f7106c9d7d0c5b65236b Mon Sep 17 00:00:00 2001 From: Hadrian Wegrzynowski Date: Thu, 19 Jan 2017 21:44:55 +0100 Subject: [PATCH] libGL: make wayland optional --- srcpkgs/libGL/template | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 11db9d680e..af8dff606c 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -7,7 +7,7 @@ build_style=gnu-configure configure_args="--enable-shared-glapi --enable-gbm --enable-gles1 --enable-gles2 --enable-egl --enable-vdpau --enable-xvmc --enable-osmesa --enable-texture-float - --with-egl-platforms=x11,drm,wayland" + --with-egl-platforms=x11,drm,$(vopt_if wayland wayland)" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " homepage="http://www.mesa3d.org/" @@ -16,16 +16,22 @@ distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c hostmakedepends=" - automake libtool flex pkg-config llvm python-Mako libxml2-python wayland-devel" + automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)" makedepends=" glproto dri2proto dri3proto presentproto libXext-devel libXxf86vm-devel eudev-libudev-devel libdrm-devel expat-devel talloc-devel libvdpau-devel libva-devel - libXdamage-devel libXvMC-devel libxshmfence-devel wayland-devel + libXdamage-devel libXvMC-devel libxshmfence-devel $(vopt_if wayland wayland-devel) elfutils-devel ncurses-devel zlib-devel libffi-devel" conf_files="/etc/drirc" +# Package build options +build_options="wayland" + +# Enable all options by default. +build_options_default="wayland" + # Set subpackages manually to set proper rdeps in 32bit pkgs. -subpackages="libglapi libgbm libEGL libGLES libOSMesa libwayland-egl" +subpackages="libglapi libgbm libEGL libGLES libOSMesa $(vopt_if wayland libwayland-egl)" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) @@ -123,7 +129,7 @@ MesaLib-devel_package() { libGL>=${version}_${revision} libGLES>=${version}_${revision} libEGL>=${version}_${revision} libOSMesa>=${version}_${revision} libgbm>=${version}_${revision} - libwayland-egl>=${version}_${revision}" + $(vopt_if wayland libwayland-egl>=${version}_${revision})" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) depends+=" libxatracker>=${version}_${revision}";; esac