xorg-server: update to 21.1.2

srcpkgs/xorg-server/template

@@ -1,22 +1,21 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.14
+version=21.1.2
 revision=1
 build_style=meson
 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
+ -Dxkb_output_dir=/var/lib/xkb -Ddefault_font_path=/usr/share/fonts/X11
+ -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
- -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
- -Dxwayland=false"
+ -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true"
 hostmakedepends="pkg-config xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
  libxkbui-devel libxshmfence-devel pixman-devel xcb-util-image-devel
  xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp
- nettle-devel $(vopt_if elogind 'dbus-devel')"
+ nettle-devel libxcvt-devel $(vopt_if elogind 'dbus-devel')"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
 depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
 checkdepends="xkeyboard-config"
@@ -25,7 +24,7 @@ maintainer="Leah Neukirchen <[email protected]>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=5cc5b70b9be89443e2594b93656c60bd5e82cd7f01deb4ce4faf81dcf546a16b
+checksum=c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"
@@ -37,8 +36,8 @@ desc_option_elogind="Rootless Xorg support with elogind"
 
 # disable VBE on non-x86 systems
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*) configure_args+=" -Dint10=x86emu -Dvbe=true" ;;
-	*) configure_args+=" -Dint10=false -Dvbe=false" ;;
+	x86_64*|i686*) configure_args+=" -Dint10=x86emu" ;;
+	*) configure_args+=" -Dint10=false" ;;
 esac
 
 # gcc10 needs to be hinted when symbols have multiple definitions
@@ -64,17 +63,6 @@ post_install() {
 	chmod 4755 ${DESTDIR}/usr/libexec/Xorg.wrap
 
 	find "${DESTDIR}"/usr/share/man -type f -iname '*[1-5].gz' -exec gunzip '{}' \;
-
-	# Readd old symlink
-	ln -s Xorg ${DESTDIR}/usr/bin/X
-}
-
-xorg-server-xdmx_package() {
-	short_desc="Distributed multihead X server and utilities"
-	pkg_install() {
-		vmove usr/bin/*dmx*
-		vmove usr/share/man/man1/*dmx*
-	}
 }
 
 xorg-server-xnest_package() {