update to 1.20.6-2

2 files changed, 4 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28d32b2434b5..a115e2bb94bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xorg-server-noudev
 	pkgver = 1.20.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://xorg.freedesktop.org
 	arch = x86_64
 	groups = xorg-noudev
@@ -19,7 +19,6 @@ pkgbase = xorg-server-noudev
 	makedepends = libxrender
 	makedepends = libxi
 	makedepends = libxaw
-	makedepends = libdmx
 	makedepends = libxtst
 	makedepends = libxres
 	makedepends = xorg-xkbcomp
@@ -103,21 +102,6 @@ pkgname = xorg-server-xephyr-noudev
 	conflicts = xorg-server-xephyr
 	replaces = xorg-server-xephyr
 
-pkgname = xorg-server-xdmx-noudev
-	pkgdesc = Distributed Multihead X Server and utilities (without udev support)
-	depends = libxfont2
-	depends = libxi
-	depends = libxaw
-	depends = libxrender
-	depends = libdmx
-	depends = libxfixes
-	depends = pixman
-	depends = xorg-server-common-noudev
-	depends = nettle
-	provides = xorg-server-xdmx
-	conflicts = xorg-server-xdmx
-	replaces = xorg-server-xdmx
-
 pkgname = xorg-server-xvfb-noudev
 	pkgdesc = Virtual framebuffer X server (without udev support)
 	depends = libxfont2
diff --git a/PKGBUILD b/PKGBUILD
index aec0e2d44e50..f38415559992 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,17 @@
 
 pkgbase=xorg-server-noudev
 _pkgbase=xorg-server
-pkgname=('xorg-server-noudev' 'xorg-server-xephyr-noudev' 'xorg-server-xdmx-noudev' 'xorg-server-xvfb-noudev' 'xorg-server-xnest-noudev'
+pkgname=('xorg-server-noudev' 'xorg-server-xephyr-noudev' 'xorg-server-xvfb-noudev' 'xorg-server-xnest-noudev'
          'xorg-server-xwayland-noudev' 'xorg-server-common-noudev' 'xorg-server-devel-noudev')
 pkgver=1.20.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('custom')
 groups=('xorg-noudev')
 url="https://xorg.freedesktop.org"
 makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
              'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
-             'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres'
+             'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres'
              'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy'
              'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
              'libxshmfence' 'libunwind' 'wayland-protocols' 'egl-wayland' 'meson') # 'git')
@@ -66,7 +66,6 @@ build() {
   arch-meson ${_pkgbase}-$pkgver build \
     -D os_vendor="Artix Linux" \
     -D ipv6=true \
-    -D dmx=true \
     -D xvfb=true \
     -D xnest=true \
     -D xcsecurity=true \
@@ -194,21 +193,6 @@ package_xorg-server-xnest-noudev() {
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING
 }
 
-package_xorg-server-xdmx-noudev() {
-  pkgdesc="Distributed Multihead X Server and utilities (without udev support)"
-  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes
-           pixman xorg-server-common-noudev nettle)
-  provides=('xorg-server-xdmx')
-  conflicts=('xorg-server-xdmx')
-  replaces=('xorg-server-xdmx')
-
-  _install fakeinstall/usr/bin/{Xdmx,dmx*,vdltodmx,xdmxconfig}
-  _install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1
-
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING
-}
-
 package_xorg-server-xwayland-noudev() {
   pkgdesc="run X clients under wayland (without udev support)"
   depends=(libxfont2 libepoxy libunwind libgl pixman xorg-server-common-noudev