snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xorg-server: disable glx-tls on musl to match mesa.

This commit is contained in:
Juan RP 2015-05-15 08:07:17 +02:00
parent e198a5a925
commit 2b108b00d5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
srcpkgs/xorg-server/template
View File

@ -1,18 +1,17 @@
# Template build file for 'xorg-server'. # Template build file for 'xorg-server'.
pkgname=xorg-server pkgname=xorg-server
version=1.17.1 version=1.17.1
revision=9 revision=10
build_pie=yes build_pie=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record configure_args="--enable-ipv6 --enable-record --enable-xorg
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
--disable-static --disable-config-hal --disable-xfbdev --disable-xfake --disable-static --disable-config-hal --disable-xfbdev --disable-xfake
--enable-libunwind --enable-config-udev --enable-config-udev-kms --enable-libunwind --enable-config-udev --enable-config-udev-kms
--with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
--with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
--disable-dmx --disable-xfree86-utils --enable-dga --enable-xorg --disable-dmx --disable-xfree86-utils --enable-kdrive-mouse
--enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
--enable-kdrive-mouse --enable-xorg --enable-xcsecurity
--disable-linux-acpi --disable-linux-apm --enable-xwayland --disable-linux-acpi --disable-linux-apm --enable-xwayland
--enable-suid-wrapper --with-shared-memory-dir=/dev/shm --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
$(vopt_enable systemd systemd-logind) $(vopt_with systemd systemd-daemon)" $(vopt_enable systemd systemd-logind) $(vopt_with systemd systemd-daemon)"
@ -45,12 +44,18 @@ replaces="xf86-video-modesetting>=0"
build_options="systemd" build_options="systemd"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) i686|x86_64)
# Enable glamor/dri/opengl by default on x86. # Enable glx-tls/glamor/dri/opengl by default on x86/glibc.
configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx" configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
makedepends+=" MesaLib-devel" makedepends+=" MesaLib-devel"
replaces+=" glamor-egl>=0" replaces+=" glamor-egl>=0"
;; ;;
i686-musl|x86_64-musl)
# Enable glx/glamor/dri/opengl by default on x86/musl.
configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --disable-glx-tls --enable-glx"
makedepends+=" MesaLib-devel"
replaces+=" glamor-egl>=0"
;;
*) *)
# Enable dri2 on !x86 via libdri. # 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"