From 8e151f76c3b0eb3d7a383d1ad5a4b95e873fd36d Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 17 Nov 2018 18:31:02 -0200 Subject: [PATCH] xorg-server: add elogind build_option --- srcpkgs/xorg-server/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 9ec7bf27b74..1acaa99c3eb 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -7,16 +7,17 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb -Dxkb_output_dir=/var/lib/xkb -Dfont_root_dir=/usr/share/fonts/X11 -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true - -Dsystemd_logind=false -Dxcsecurity=true -Dos_vendor=Void" + -Dxcsecurity=true -Dsystem_logind=$(vopt_if elogind true false) + -Dos_vendor=Void" hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip" makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel libxkbui-devel pixman-devel wayland-devel wayland-protocols xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel - xcb-util-wm-devel nettle-devel" + xcb-util-wm-devel nettle-devel $(vopt_if elogind 'dbus-devel')" # See hw/xfree86/common/xf86Module.h. Only care for the major version. -depends="xkeyboard-config" +depends="xkeyboard-config $(vopt_if elogind 'elogind')" short_desc="The X11 server from X.org" maintainer="Juan RP " license="MIT, BSD-3-Clause" @@ -29,6 +30,9 @@ replaces="xf86-video-modesetting>=0" subpackages="xorg-server-devel xorg-server-xdmx xorg-server-xephyr xorg-server-xnest xorg-server-xvfb xorg-server" conf_files="/etc/X11/Xwrapper.config" +build_options="elogind" +desc_option_elogind="Rootless Xorg support with elogind" + case "$XBPS_TARGET_MACHINE" in i686*|x86_64*|aarch64*) # Enable glamor/dri/opengl/xwayland by default on x86. @@ -67,7 +71,6 @@ post_install() { case "$XBPS_TARGET_MACHINE" in *-musl) vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d;; esac - vinstall ${FILESDIR}/Xwrapper.config 644 etc/X11 vlicense COPYING