xorg-server: update to 1.16.0.
Major update with the following features for void: - systemd build option enabled by default. - the X suid wrapper has been moved to the -wrapper subpkg, only required by the non KMS drivers (catalyst, nvidia, others). - glamor enabled by default on x86. - xwayland enabled by default.
This commit is contained in:
Juan RP
parent
3a5373950e
commit
2148e5e0aa
1
srcpkgs/xorg-server-wrapper
Symbolic link
1
srcpkgs/xorg-server-wrapper
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
xorg-server
|
||||
|
|
@ -1,30 +1,31 @@
|
|||
# Template build file for 'xorg-server'.
|
||||
pkgname=xorg-server
|
||||
version=1.15.2
|
||||
revision=2
|
||||
version=1.16.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
|
||||
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
|
||||
--disable-static --disable-config-hal --disable-xfbdev --disable-xfake
|
||||
--disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
|
||||
--enable-config-udev --enable-config-udev-kms --sysconfdir=/etc/X11
|
||||
--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-dga --enable-xorg
|
||||
--enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
|
||||
--enable-kdrive-mouse --enable-xorg --enable-xcsecurity
|
||||
--disable-linux-acpi --disable-linux-apm"
|
||||
--disable-linux-acpi --disable-linux-apm --enable-xwayland
|
||||
--enable-suid-wrapper"
|
||||
short_desc="The X11 server from X.org"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT/X11, BSD"
|
||||
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
|
||||
checksum=3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163
|
||||
checksum=38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b
|
||||
|
||||
lib32disabled=yes
|
||||
|
||||
hostmakedepends="pkg-config perl flex"
|
||||
makedepends="
|
||||
libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.25 presentproto
|
||||
libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.26 presentproto
|
||||
dri2proto>=2.1 dri3proto xf86driproto randrproto videoproto compositeproto scrnsaverproto
|
||||
resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto xcb-util-devel
|
||||
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel libudev-devel>=183
|
||||
|
|
@ -32,53 +33,37 @@ makedepends="
|
|||
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
|
||||
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
|
||||
libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel libxshmfence-devel
|
||||
xkeyboard-config"
|
||||
wayland-devel libepoxy-devel xkeyboard-config"
|
||||
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
|
||||
depends="xkeyboard-config"
|
||||
provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_1"
|
||||
provides="xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_1"
|
||||
|
||||
# Package build options
|
||||
build_options="dri dri2 opengl"
|
||||
# enable dri2 for all platforms via libdri2.
|
||||
build_options_default="dri2"
|
||||
build_options="systemd"
|
||||
build_options_default="systemd"
|
||||
|
||||
if [ "$build_option_systemd" ]; then
|
||||
configure_args+=" --enable-systemd-logind --with-systemd-daemon"
|
||||
makedepends+=" dbus-devel systemd-devel"
|
||||
else
|
||||
configure_args+=" --disable-systemd-logind --without-systemd-daemon"
|
||||
fi
|
||||
|
||||
if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
|
||||
# Enable dri/opengl by default on x86.
|
||||
build_options_default+=" dri opengl"
|
||||
fi
|
||||
|
||||
if [ "$build_option_dri" ]; then
|
||||
configure_args+=" --enable-dri"
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*|x86_64*) makedepends+=" MesaLib-devel>=10.0";;
|
||||
esac
|
||||
# Enable glamor/dri/opengl by default on x86.
|
||||
configure_args+=" --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
|
||||
makedepends+=" MesaLib-devel>=10"
|
||||
else
|
||||
configure_args+=" --disable-dri"
|
||||
fi
|
||||
|
||||
if [ "$build_option_dri2" ]; then
|
||||
configure_args+=" --enable-dri2"
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*|x86_64*) makedepends+=" MesaLib-devel>=10.0";;
|
||||
*) makedepends+=" dri2proto libdri2-devel-git";;
|
||||
esac
|
||||
else
|
||||
configure_args+=" --disable-dri2"
|
||||
fi
|
||||
|
||||
if [ "$build_option_opengl" ]; then
|
||||
configure_args+=" --enable-glx-tls --enable-glx"
|
||||
makedepends+=" MesaLib-devel>=10.0"
|
||||
else
|
||||
configure_args+=" --disable-glx"
|
||||
# Enable dri2 on !x86 via libdri.
|
||||
configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3"
|
||||
makedepends+=" dri2proto libdri2-devel-git"
|
||||
fi
|
||||
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
|
||||
vinstall COPYING 644 usr/share/licenses/${pkgname}
|
||||
|
||||
# Xorg must be setuid.
|
||||
chmod 4755 ${DESTDIR}/usr/bin/Xorg
|
||||
chmod 4755 ${DESTDIR}/usr/libexec/Xorg.wrap
|
||||
|
||||
if [ -e ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so ]; then
|
||||
# Support nvidia and amd binary blobs to provide their own
|
||||
|
|
@ -112,6 +97,13 @@ xorg-server-xvfb_package() {
|
|||
}
|
||||
}
|
||||
|
||||
xorg-server-wrapper_package() {
|
||||
short_desc+=" - suid wrapper for non KMS capable drivers"
|
||||
pkg_install() {
|
||||
vmove usr/libexec/Xorg.wrap
|
||||
}
|
||||
}
|
||||
|
||||
xorg-server-devel_package() {
|
||||
depends="libudev-devel dri2proto>=2.1 dri3proto presentproto glproto xf86driproto randrproto
|
||||
videoproto compositeproto scrnsaverproto resourceproto xineramaproto
|
||||
|
|
|
|||
Loading…
Reference in a new issue