diff --git a/.gitignore b/.gitignore
index cf2e17ef529e76a3513731fc46404a97eb868633..3fd539ad085dae39ef7f9cd502759f2232abd531 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
-trunk/xorg-server/
-trunk/pkg/
-trunk/src/
-trunk/*.pkg.tar.xz
-trunk/*.pkg.tar.xz.sig
-version/*/bin/
+a
+b
+patch-prepare.sh
+patch-make.sh
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d04b653d2d37c966774c024b8ee1d52b1781af2c..32a5a00e595353e636913f5c2b17bc22c1248586 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,42 +1,98 @@
+.job_variables: &job_variables
+  variables:
+    GIT_SUBMODULE_STRATEGY: none
+    GIT_DEPTH: 0
+    PKG_TOKEN: ${PKG_TOKEN}
+
+.job_rules_push: &job_rules_push
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_TAG == null'
+
+.job_rules_schedule: &job_rules_schedule
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+
+.job_rules_web: &job_rules_web
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+
+.job_rules_pipeline: &job_rules_pipeline
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "pipeline"'
+
+.copy_files: &copy_files
+    before_script:
+      - mkdir -p /etc/pkg
+      - cp ./pkg.cfg /etc/pkg/pkg.cfg
+      - cp ./pacman.conf.builder /etc/pacman.conf.builder
+
 stages:
-    - build
-    - commit
-    - deploy
+  - update
+  - build
+  - rebuild
+  - deploy
 
-package:
-  stage: build
+update:
+  stage: update
+  <<: *job_variables
+  <<: *job_rules_schedule
+  <<: *copy_files
   script:
-    - mkdir -p /etc/pkg
-    - cp ./pkg.cfg /etc/pkg/pkg.cfg
-    - cp ./pacman.conf.builder /etc/pacman.conf.builder
-    - pkg-prepare.sh
-    - pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
+    - apkg-update.sh
 
+build:
+  stage: build
+  <<: *job_variables
+  <<: *job_rules_push
+  <<: *copy_files
+  script:
+    - apkg-prepare.sh
+    - apkg-build.sh
+    - apkg-tag.sh
   artifacts:
-    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
     paths:
-     - "*.pkg.tar.xz"
+      - "*.pkg.tar.xz"
+      - build.env
 
-  only:
-    changes:
-      - trunk/PKGBUILD
-
-commit:
-  stage: commit
-  only:
-    changes:
-      - trunk/PKGBUILD
+rebuild:from:
+  stage: rebuild
+  <<: *job_variables
+  <<: *job_rules_pipeline
+  <<: *copy_files
+  script:
+    - apkg-rebuild.sh
+  artifacts:
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
+    paths:
+      - "*.pkg.tar.xz"
 
+rebuild:dynamic:
+  stage: rebuild
+  <<: *job_rules_push
+  <<: *copy_files
+  needs: ["build"]
   script:
-    - pkg-commit.sh
+    - apkg-generate.sh > dynamic-config.yml
+  artifacts:
+    paths:
+      - dynamic-config.yml
+
+rebuild:packages:
+  stage: rebuild
+  <<: *job_variables
+  <<: *job_rules_push
+  needs: ["rebuild:dynamic","build"]
+  trigger:
+    include:
+      - artifact: dynamic-config.yml
+        job: rebuild:dynamic
+    strategy: depend
 
 deploy:
+  <<: *job_variables
+  <<: *job_rules_push
   stage: deploy
-  dependencies:
-    - package
+  needs: ["build","rebuild:packages"]
   script:
-    - pkg-deploy.sh
-
-  only:
-    changes:
-      - trunk/PKGBUILD
+    - apkg-deploy.sh
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..b4dcc61cdd1af145a90f30332b7d8aaf30c7f186
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,5 @@
+[submodule "xorg-server"]
+	path = xorg-server
+	url = https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-server
+	branch = main
+    update = merge
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..c2d31fb227f17769be1d57df50cea4395533afec
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,14 @@
+Copyright (c) 2023 Eric Vidal <eric@obarun.org>
+All rights reserved.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/trunk/Xwrapper.config b/diff/file/Xwrapper.config
similarity index 100%
rename from trunk/Xwrapper.config
rename to diff/file/Xwrapper.config
diff --git a/diff/patch/PKG.patch b/diff/patch/PKG.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0c16ee507f2b1b27e800e5d017bda8be79ec9c16
--- /dev/null
+++ b/diff/patch/PKG.patch
@@ -0,0 +1,101 @@
+diff -uar a/PKGBUILD b/PKGBUILD
+--- a/PKGBUILD
++++ b/PKGBUILD
+@@ -15,13 +15,14 @@
+              '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' 'systemd' 'meson' 'git')
++             'libxshmfence' 'libunwind' 'meson' 'git')
+ #source=(${pkgbase}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/xserver.git#commit=27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56
+ source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
+         xvfb-run # with updates from FC master
+         xvfb-run.1
+         xephyr_Dont_check_for_SeatId_anymore.patch
+         0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
++        Xwrapper.config
+ )
+ validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF'  # Peter Hutterer (Who-T) <office@who-t.net>
+               '67DC86F2623FC5FD4BB5225D14706DBE1E4B4540'  # Olivier Fourdan <fourdan@xfce.org>
+@@ -60,7 +61,7 @@
+     -D glamor=true \
+     -D udev=true \
+     -D dtrace=false \
+-    -D systemd_logind=true \
++    -D systemd_logind=false \
+     -D suid_wrapper=true \
+     -D xkb_dir=/usr/share/X11/xkb \
+     -D xkb_output_dir=/var/lib/xkb \
+@@ -127,7 +128,7 @@
+ 
+ package_xorg-server-xephyr() {
+   pkgdesc="A nested X server that runs as an X application"
+-  depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common
++  depends=(libxfont2 libgl libepoxy libunwind libxv pixman xorg-server-common
+            xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms
+            nettle libtirpc)
+ 
+@@ -140,8 +141,8 @@
+ 
+ package_xorg-server-xvfb() {
+   pkgdesc="Virtual framebuffer X server"
+-  depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth 
+-           libgl nettle libtirpc systemd-libs)
++  depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth
++           libgl nettle libtirpc)
+ 
+   _install fakeinstall/usr/bin/Xvfb
+   _install fakeinstall/usr/share/man/man1/Xvfb.1
+@@ -155,7 +156,7 @@
+ 
+ package_xorg-server-xnest() {
+   pkgdesc="A nested X server that runs as an X application"
+-  depends=(libxfont2 libunwind libxext pixman xorg-server-common nettle libtirpc systemd-libs)
++  depends=(libxfont2 libunwind libxext pixman xorg-server-common nettle libtirpc)
+ 
+   _install fakeinstall/usr/bin/Xnest
+   _install fakeinstall/usr/share/man/man1/Xnest.1
+diff -uar a/xorg-server.install b/xorg-server.install
+--- a/xorg-server.install
++++ b/xorg-server.install
+@@ -1,18 +1,27 @@
+-post_upgrade() {
+-  if (( $(vercmp $2 1.16.0-3) < 0 )); then
+-    post_install
+-  fi
+-}
+-
+ post_install() {
+-  cat <<MSG
+->>> xorg-server has now the ability to run without root rights with
+-    the help of systemd-logind. xserver will fail to run if not launched
+-    from the same virtual terminal as was used to log in.
+-    Without root rights, log files will be in ~/.local/share/xorg/ directory.
+ 
+-    Old behavior can be restored through Xorg.wrap config file.
+-    See Xorg.wrap man page (man xorg.wrap).
++    ## suid permission is not preserved during _install execution, fix it.
++    cat <<MSG
++>>> Applying 4755 mode to /usr/lib/Xorg.wrag
+ MSG
++    chmod u+s /usr/lib/Xorg.wrap
++
++    cat <<MSG
++>>> Xorg-server has now the ability to run without root rights.
++    To be able to use this features, install the package:
++    xorg-server-rootless.
++
++$(tput setaf 3)>>> WARNING: $(tput sgr0)
++    The file /etc/X11/Xwrapper.config,
++    need to be present on your system containing this line :
++
++    needs_root_rights = yes
++
++    See xorg.wrap man page (man xorg.wrap) for futher informations.
++MSG
++}
++
++post_upgrade() {
++        post_install
+ }
+ 
diff --git a/pacman.conf.builder b/pacman.conf.builder
index f11eac852ce664d45bb267a1c07bc719a8b4ac34..602711c8778080671b6c6c4c79aa91ce49816e04 100644
--- a/pacman.conf.builder
+++ b/pacman.conf.builder
@@ -5,11 +5,9 @@
 [options]
 HoldPkg     = pacman glibc
 Architecture = auto
-IgnorePkg   = systemd
-IgnorePkg   = systemd-libs
-NoExtract   = usr/lib/libsystemd*.*
+IgnorePkg   = systemd systemd-libs
+NoExtract   = usr/lib/libsystemd*.* usr/lib/systemd* etc/systemd*
 Color
-CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
 #XferCommand =
@@ -33,22 +31,6 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
 SigLevel = Required
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 
-#[obcommunity-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcommunity]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obmultilib-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obmultilib]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
 #[observice-testing]
 #SigLevel = Required
 #Server = https://cloud.server.obarun.org/$repo/os/$arch/
@@ -57,23 +39,18 @@ Server = https://cloud.server.obarun.org/$repo/os/$arch/
 SigLevel = Required
 Server = https://cloud.server.obarun.org/$repo/os/$arch/
 
-#[testing]
+#[core-testing]
+#SigLevel = DatabaseOptional
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
+SigLevel = DatabaseOptional
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
+#SigLevel = DatabaseOptional
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
+SigLevel = DatabaseOptional
 Include = /etc/pacman.d/mirrorlist
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
diff --git a/trunk/0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch b/trunk/0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
deleted file mode 100644
index a02369bbd5cd87cd581067b9cb9dc52ead7af61a..0000000000000000000000000000000000000000
--- a/trunk/0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b98fc07d3442a289c6bef82df50dd0a2d01de71a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 2 Feb 2023 12:26:27 -0500
-Subject: [PATCH] present: Send a PresentConfigureNotify event for destroyed
- windows
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This enables fixing a deadlock case on the client side, where the client
-ends up blocked waiting for a Present event that will never come because
-the window was destroyed. The new PresentWindowDestroyed flag allows the
-client to avoid blocking indefinitely.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
-See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
-(cherry picked from commit 462b06033e66a32308d940eb5fc47f5e4c914dc0)
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- present/present_event.c  |  5 +++--
- present/present_priv.h   |  7 ++++++-
- present/present_screen.c | 11 ++++++++++-
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/present/present_event.c b/present/present_event.c
-index 435b26b70..849732dc8 100644
---- a/present/present_event.c
-+++ b/present/present_event.c
-@@ -102,7 +102,8 @@ present_event_swap(xGenericEvent *from, xGenericEvent *to)
- }
- 
- void
--present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling)
-+present_send_config_notify(WindowPtr window, int x, int y, int w, int h,
-+                           int bw, WindowPtr sibling, CARD32 flags)
- {
-     present_window_priv_ptr window_priv = present_window_priv(window);
- 
-@@ -122,7 +123,7 @@ present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw,
-             .off_y = 0,
-             .pixmap_width = w,
-             .pixmap_height = h,
--            .pixmap_flags = 0
-+            .pixmap_flags = flags
-         };
-         present_event_ptr event;
- 
-diff --git a/present/present_priv.h b/present/present_priv.h
-index 6ebd009a2..4ad729864 100644
---- a/present/present_priv.h
-+++ b/present/present_priv.h
-@@ -43,6 +43,11 @@
- #define DebugPresent(x)
- #endif
- 
-+/* XXX this belongs in presentproto */
-+#ifndef PresentWindowDestroyed
-+#define PresentWindowDestroyed (1 << 0)
-+#endif
-+
- extern int present_request;
- 
- extern DevPrivateKeyRec present_screen_private_key;
-@@ -307,7 +312,7 @@ void
- present_free_events(WindowPtr window);
- 
- void
--present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling);
-+present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling, CARD32 flags);
- 
- void
- present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 serial, uint64_t ust, uint64_t msc);
-diff --git a/present/present_screen.c b/present/present_screen.c
-index 15684eda4..2c29aafd2 100644
---- a/present/present_screen.c
-+++ b/present/present_screen.c
-@@ -93,6 +93,15 @@ present_destroy_window(WindowPtr window)
-     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
-     present_window_priv_ptr window_priv = present_window_priv(window);
- 
-+    present_send_config_notify(window,
-+                               window->drawable.x,
-+                               window->drawable.y,
-+                               window->drawable.width,
-+                               window->drawable.height,
-+                               window->borderWidth,
-+                               window->nextSib,
-+                               PresentWindowDestroyed);
-+
-     if (window_priv) {
-         present_clear_window_notifies(window);
-         present_free_events(window);
-@@ -123,7 +132,7 @@ present_config_notify(WindowPtr window,
-     ScreenPtr screen = window->drawable.pScreen;
-     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
- 
--    present_send_config_notify(window, x, y, w, h, bw, sibling);
-+    present_send_config_notify(window, x, y, w, h, bw, sibling, 0);
- 
-     unwrap(screen_priv, screen, ConfigNotify);
-     if (screen->ConfigNotify)
--- 
-2.41.0
-
-
diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
deleted file mode 100644
index aef8112e3fb300e24ed41da2a7ce00a7254dbe0d..0000000000000000000000000000000000000000
--- a/trunk/PKGBUILD
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.8
-pkgrel=3
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    xephyr_Dont_check_for_SeatId_anymore.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## FS#73274
-    patch -Np1 -i ../xephyr_Dont_check_for_SeatId_anymore.patch
-    # upstream fix (merged)
-    patch -Np1 -i ../0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-    -D libunwind=true
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF'  # Peter Hutterer (Who-T) <office@who-t.net>
-              '67DC86F2623FC5FD4BB5225D14706DBE1E4B4540'  # Olivier Fourdan <fourdan@xfce.org>
-              'FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
-
-sha256sums=('38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152'
-            'SKIP'
-            '057004ab36d4733e6c275f76bbc3851f6cdb9063305a3ae874f2fd83f14a6dc0'
-            'c438039adbb219f62591d6646791c7aaa1e1c0f9371a01372f81e26295c9724d'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '31367963ef65207cd01f1a352992f0d49d78cad7883732cd6a700f681b174b5a'
-            '1e02dbcce066746acb5de54c816add1d26349ff16b5f1833b6ab48f3b3a8e634')
diff --git a/trunk/xephyr_Dont_check_for_SeatId_anymore.patch b/trunk/xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad3354da0ff62d6aebcefd748ae741f..0000000000000000000000000000000000000000
--- a/trunk/xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-GitLab
-
diff --git a/trunk/xorg-server.install b/trunk/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/trunk/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/trunk/xvfb-run b/trunk/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/trunk/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/trunk/xvfb-run.1 b/trunk/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/trunk/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.10-4/0001-v2-FS-58644.patch b/version/1.20.10-4/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.10-4/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.10-4/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.10-4/0002-fix-libshadow-2.patch b/version/1.20.10-4/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.10-4/PKGBUILD b/version/1.20.10-4/PKGBUILD
deleted file mode 100644
index 6f19bea90092e9fd801a41a51d15caf57bf4c842..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/PKGBUILD
+++ /dev/null
@@ -1,337 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-pkgver=1.20.10
-pkgrel=4
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=commit
-target=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10
-source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-pkgver() {
-    cd xserver
-    git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-    #cd "${pkgbase}-${pkgver}"
-    cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson ${pkgbase}-$pkgver build
-    arch-meson xserver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    #install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.10-4/Xwrapper.config b/version/1.20.10-4/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.10-4/xorg-server.install b/version/1.20.10-4/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.10-4/xserver-autobind-hotplug.patch b/version/1.20.10-4/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.10-4/xvfb-run b/version/1.20.10-4/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.10-4/xvfb-run.1 b/version/1.20.10-4/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.10-4/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.11-2/0001-v2-FS-58644.patch b/version/1.20.11-2/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.11-2/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.11-2/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.11-2/0002-fix-libshadow-2.patch b/version/1.20.11-2/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.11-2/PKGBUILD b/version/1.20.11-2/PKGBUILD
deleted file mode 100644
index 1ddfbe44fdbd5c545e05e629abffcaa9034aef3b..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/PKGBUILD
+++ /dev/null
@@ -1,339 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-pkgver=1.20.11
-pkgrel=2
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=commit
-target=8059bbba8438d44041883de2e3ee35503f3f17f0   # refs/tags/xorg-server-1.20.11
-
-source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-pkgver() {
-    cd xserver
-    git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-    #cd "${pkgbase}-${pkgver}"
-    cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson ${pkgbase}-$pkgver build
-    arch-meson xserver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    #install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-
-sha512sums=('SKIP'
-	'876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-	'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-	'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-	'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-	'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-	'97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8'
-	)
-
diff --git a/version/1.20.11-2/Xwrapper.config b/version/1.20.11-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.11-2/xorg-server.install b/version/1.20.11-2/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.11-2/xserver-autobind-hotplug.patch b/version/1.20.11-2/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.11-2/xvfb-run b/version/1.20.11-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.11-2/xvfb-run.1 b/version/1.20.11-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.11-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.12-2/0001-v2-FS-58644.patch b/version/1.20.12-2/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.12-2/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.12-2/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.12-2/0002-fix-libshadow-2.patch b/version/1.20.12-2/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.12-2/PKGBUILD b/version/1.20.12-2/PKGBUILD
deleted file mode 100644
index 12c28498d028359c301bfb99a90d985c1ea3b322..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/PKGBUILD
+++ /dev/null
@@ -1,328 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=1.20.12
-pkgrel=2
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=
-target="$pkgbase-$pkgver.tar.xz"
-source=("$url/$target"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd "$pkgbase-$pkgver"
-    #cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-_flags=(
-    -Dos_vendor="Obarun"
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dxwayland=true
-    -Dxwayland_eglstream=true
-    -Dglamor=true
-    -Dudev=true
-    -Dsuid_wrapper=true
-    -Dipv6=true
-    -Dsystemd_logind=false
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson  build
-    arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"        
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#----------
-# PACKAGE ]
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406'
-            'SKIP'
-            '876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-            'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
diff --git a/version/1.20.12-2/Xwrapper.config b/version/1.20.12-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.12-2/xorg-server.install b/version/1.20.12-2/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.12-2/xserver-autobind-hotplug.patch b/version/1.20.12-2/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.12-2/xvfb-run b/version/1.20.12-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.12-2/xvfb-run.1 b/version/1.20.12-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.12-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.12-3/0001-v2-FS-58644.patch b/version/1.20.12-3/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.12-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.12-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.12-3/0002-fix-libshadow-2.patch b/version/1.20.12-3/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.12-3/PKGBUILD b/version/1.20.12-3/PKGBUILD
deleted file mode 100644
index 652239ac003101c656177fc6ac930becc72b98e1..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/PKGBUILD
+++ /dev/null
@@ -1,328 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#------------------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=1.20.12
-pkgrel=3
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=
-target="$pkgbase-$pkgver.tar.xz"
-source=("$url/$target"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd "$pkgbase-$pkgver"
-    #cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-_flags=(
-    -Dos_vendor="Obarun"
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dxwayland=true
-    -Dxwayland_eglstream=true
-    -Dglamor=true
-    -Dudev=true
-    -Dsuid_wrapper=true
-    -Dipv6=true
-    -Dsystemd_logind=false
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson  build
-    arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"        
-
-    ## Print config
-    meson configure build
-    meson compile -C build
-
-    ## fake installation to be seperated into packages
-    meson install -C build --destdir "${srcdir}/fakeinstall"
-}
-
-#----------
-# PACKAGE ]
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406'
-            'SKIP'
-            '876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-            'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
diff --git a/version/1.20.12-3/Xwrapper.config b/version/1.20.12-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.12-3/xorg-server.install b/version/1.20.12-3/xorg-server.install
deleted file mode 100644
index b52eab79164dc20ec3a61522e586642945abac8d..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/xorg-server.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.12-3/xserver-autobind-hotplug.patch b/version/1.20.12-3/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.12-3/xvfb-run b/version/1.20.12-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.12-3/xvfb-run.1 b/version/1.20.12-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.12-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.12-4/0001-v2-FS-58644.patch b/version/1.20.12-4/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.12-4/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.12-4/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.12-4/0002-fix-libshadow-2.patch b/version/1.20.12-4/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.12-4/PKGBUILD b/version/1.20.12-4/PKGBUILD
deleted file mode 100644
index b68d54470256ce62af1d163cb22efe598a65a014..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/PKGBUILD
+++ /dev/null
@@ -1,328 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#------------------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=1.20.12
-pkgrel=4
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=
-target="$pkgbase-$pkgver.tar.xz"
-source=("$url/$target"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd "$pkgbase-$pkgver"
-    #cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-_flags=(
-    -Dos_vendor="Obarun"
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dxwayland=true
-    -Dxwayland_eglstream=true
-    -Dglamor=true
-    -Dudev=true
-    -Dsuid_wrapper=true
-    -Dipv6=true
-    -Dsystemd_logind=false
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson  build
-    arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"        
-
-    ## Print config
-    meson configure build
-    meson compile -C build
-
-    ## fake installation to be seperated into packages
-    meson install -C build --destdir "${srcdir}/fakeinstall"
-}
-
-#----------
-# PACKAGE ]
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406'
-            'SKIP'
-            '876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-            'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
diff --git a/version/1.20.12-4/Xwrapper.config b/version/1.20.12-4/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.12-4/xorg-server.install b/version/1.20.12-4/xorg-server.install
deleted file mode 100644
index af6deb8027d230d995ef927454fce703011dc4de..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/xorg-server.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_upgrade() {
-        post_install
-}
-
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.12-4/xserver-autobind-hotplug.patch b/version/1.20.12-4/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.12-4/xvfb-run b/version/1.20.12-4/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.12-4/xvfb-run.1 b/version/1.20.12-4/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.12-4/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.12-5/0001-v2-FS-58644.patch b/version/1.20.12-5/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.12-5/0002-fix-libshadow-2.patch b/version/1.20.12-5/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.12-5/PKGBUILD b/version/1.20.12-5/PKGBUILD
deleted file mode 100644
index 86b1fbff7b5491f23c42fe75515804124dfff858..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/PKGBUILD
+++ /dev/null
@@ -1,328 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#------------------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=1.20.12
-pkgrel=5
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=
-target="$pkgbase-$pkgver.tar.xz"
-source=("$url/$target"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd "$pkgbase-$pkgver"
-    #cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-_flags=(
-    -Dos_vendor="Obarun"
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dxwayland=true
-    -Dxwayland_eglstream=true
-    -Dglamor=true
-    -Dudev=true
-    -Dsuid_wrapper=true
-    -Dipv6=true
-    -Dsystemd_logind=false
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson  build
-    arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    meson compile -C build
-
-    ## fake installation to be seperated into packages
-    meson install -C build --destdir "${srcdir}/fakeinstall"
-}
-
-#----------
-# PACKAGE ]
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406'
-            'SKIP'
-            '876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-            'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
diff --git a/version/1.20.12-5/Xwrapper.config b/version/1.20.12-5/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.12-5/xorg-server.install b/version/1.20.12-5/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/1.20.12-5/xserver-autobind-hotplug.patch b/version/1.20.12-5/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.12-5/xvfb-run b/version/1.20.12-5/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.12-5/xvfb-run.1 b/version/1.20.12-5/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.12-5/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.13-2/0001-v2-FS-58644.patch b/version/1.20.13-2/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.13-2/0002-fix-libshadow-2.patch b/version/1.20.13-2/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.13-2/PKGBUILD b/version/1.20.13-2/PKGBUILD
deleted file mode 100644
index a1ab58dfa9ea3351434f09775a27266b126346bd..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/PKGBUILD
+++ /dev/null
@@ -1,328 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://git.obarun.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#------------------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=1.20.13
-pkgrel=2
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=
-target="$pkgbase-$pkgver.tar.xz"
-source=("$url/$target"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd "$pkgbase-$pkgver"
-    #cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-_flags=(
-    -Dos_vendor="Obarun"
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dxwayland=true
-    -Dxwayland_eglstream=true
-    -Dglamor=true
-    -Dudev=true
-    -Dsuid_wrapper=true
-    -Dipv6=true
-    -Dsystemd_logind=false
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson  build
-    arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    meson compile -C build
-
-    ## fake installation to be seperated into packages
-    meson install -C build --destdir "${srcdir}/fakeinstall"
-}
-
-#----------
-# PACKAGE ]
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3'
-            'SKIP'
-            '876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-            'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
diff --git a/version/1.20.13-2/Xwrapper.config b/version/1.20.13-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.13-2/xorg-server.install b/version/1.20.13-2/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/1.20.13-2/xserver-autobind-hotplug.patch b/version/1.20.13-2/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.13-2/xvfb-run b/version/1.20.13-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.13-2/xvfb-run.1 b/version/1.20.13-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.13-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.13-3/0001-v2-FS-58644.patch b/version/1.20.13-3/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.13-3/0002-fix-libshadow-2.patch b/version/1.20.13-3/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.13-3/PKGBUILD b/version/1.20.13-3/PKGBUILD
deleted file mode 100644
index d95d44bc622e82cdfc3a550fc5be4f6c575cf781..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/PKGBUILD
+++ /dev/null
@@ -1,329 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://git.obarun.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#------------------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=1.20.13
-pkgrel=3
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=
-target="$pkgbase-$pkgver.tar.xz"
-source=("$url/$target"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=(x86_64)
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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'
-    'meson'
-    'git'
-    'wayland-protocols'
-    'egl-wayland')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd "$pkgbase-$pkgver"
-    #cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_path=(
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-_flags=(
-    -Dos_vendor="Obarun"
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dxwayland=true
-    -Dxwayland_eglstream=true
-    -Dglamor=true
-    -Dudev=true
-    -Dsuid_wrapper=true
-    -Dipv6=true
-    -Dsystemd_logind=false
-)
-
-#--------
-# BUILD ]
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson  build
-    arch-meson $pkgbase-$pkgver build "${_path[@]}" "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    meson compile -C build
-
-    ## fake installation to be seperated into packages
-    meson install -C build --destdir "${srcdir}/fakeinstall"
-}
-
-#----------
-# PACKAGE ]
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     cp -av "${src}" "${dir}/"
-     rm -rf "${src}"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgbase-$pkgver"/COPYING
-
-    ## make sure there are no files left to install
-    rm fakeinstall/usr/bin/Xwayland
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3'
-            'SKIP'
-            '876e17d65f35714c75eced72ac67609f7fd83c7c6d3a842c011d3b3adbcda75447721024f49ce164cefbbe698d00b291af6f21d6f081879986cca7e447784f86'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            'f9b22b91acdebedc0e485ba99bfeab107bced5706693d16ba66aa4a6ea1f6b39d835b5dba6eda38da02bc2dca16150ccceae42e18e6563eff3fac4e4195aa328'
-            'c1da07f0040f52ffcfec4c9b96d80c07738db6451c149c36a5636f28307dfcffa46c2f2490a52691c6fbffa7cc45565b552da87d6ef487b5198f00f4482257be'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
diff --git a/version/1.20.13-3/Xwrapper.config b/version/1.20.13-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.13-3/xorg-server.install b/version/1.20.13-3/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/1.20.13-3/xserver-autobind-hotplug.patch b/version/1.20.13-3/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.13-3/xvfb-run b/version/1.20.13-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.13-3/xvfb-run.1 b/version/1.20.13-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.13-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.5-4/0001-v2-FS-58644.patch b/version/1.20.5-4/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.5-4/0002-fix-libshadow-2.patch b/version/1.20.5-4/0002-fix-libshadow-2.patch
deleted file mode 100644
index b0b0440871a4f4010714b0976105111d6fb570a7..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Fri, 25 May 2018 20:17:35 +0200
-Subject: [PATCH] fix libshadow
-
----
- hw/xfree86/dixmods/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..6bd8029b6 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -38,6 +38,7 @@ shared_module(
- 
-     install: true,
-     install_dir: module_dir,
-+    install_rpath: '$ORIGIN/./',
- )
- 
- if build_glx
--- 
-2.17.0
diff --git a/version/1.20.5-4/PKGBUILD b/version/1.20.5-4/PKGBUILD
deleted file mode 100644
index 249a5e22cb38ed482fd4791c5fdf2a5f792d698a..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/PKGBUILD
+++ /dev/null
@@ -1,331 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb'
-         'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.20.5
-pkgrel=4
-arch=('x86_64')
-license=('CUSTOM')
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-    'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-groups=(
-    'xorg')
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxmu'
-    'libxrender'
-    'libxi'
-    'libxaw'
-    'libdmx'
-    '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')
-
-#--------------------------------------------------------------------------------------
-prepare() {
-    cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
-
-    cd "${pkgbase}-${pkgver}"
-
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106656
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-}
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102 
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson ${pkgbase}-$pkgver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D dmx=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-    
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xdmx() {
-    pkgdesc="Distributed Multihead X Server and utilities"
-    depends=(
-        'libxfont2'
-        'libxi'
-        'libxaw'
-        'libxrender'
-        'libdmx'
-        'libxfixes'
-        'pixman'
-        'xorg-server-common'
-        'nettle')
-
-    _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() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#--------------------------------------------------------------------------------------
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-)
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.5-4/Xwrapper.config b/version/1.20.5-4/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.5-4/xorg-server.install b/version/1.20.5-4/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.5-4/xserver-autobind-hotplug.patch b/version/1.20.5-4/xserver-autobind-hotplug.patch
deleted file mode 100644
index 86b96a23e4bf454b4362e0e0acc5687b60b887e4..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
-
diff --git a/version/1.20.5-4/xvfb-run b/version/1.20.5-4/xvfb-run
deleted file mode 100644
index 9d088c1c28ec13649eaef4deb24b75a0039c19a1..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.5-4/xvfb-run.1 b/version/1.20.5-4/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.5-4/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.5-5/0001-v2-FS-58644.patch b/version/1.20.5-5/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.5-5/0002-fix-libshadow-2.patch b/version/1.20.5-5/0002-fix-libshadow-2.patch
deleted file mode 100644
index b0b0440871a4f4010714b0976105111d6fb570a7..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Fri, 25 May 2018 20:17:35 +0200
-Subject: [PATCH] fix libshadow
-
----
- hw/xfree86/dixmods/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..6bd8029b6 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -38,6 +38,7 @@ shared_module(
- 
-     install: true,
-     install_dir: module_dir,
-+    install_rpath: '$ORIGIN/./',
- )
- 
- if build_glx
--- 
-2.17.0
diff --git a/version/1.20.5-5/PKGBUILD b/version/1.20.5-5/PKGBUILD
deleted file mode 100644
index 842f4a623ca0c3c2b69070609bff1d975e1fcc5f..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/PKGBUILD
+++ /dev/null
@@ -1,334 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb'
-         'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.20.5
-pkgrel=5
-arch=('x86_64')
-license=('CUSTOM')
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-    'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxmu'
-    'libxrender'
-    'libxi'
-    'libxaw'
-    'libdmx'
-    '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')
-
-#--------------------------------------------------------------------------------------
-prepare() {
-    cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
-
-    cd "${pkgbase}-${pkgver}"
-
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106656
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-}
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102 
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson ${pkgbase}-$pkgver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D dmx=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-    
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xdmx() {
-    pkgdesc="Distributed Multihead X Server and utilities"
-    depends=(
-        'libxfont2'
-        'libxi'
-        'libxaw'
-        'libxrender'
-        'libdmx'
-        'libxfixes'
-        'pixman'
-        'xorg-server-common'
-        'nettle')
-
-    _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() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#--------------------------------------------------------------------------------------
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-)
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.5-5/Xwrapper.config b/version/1.20.5-5/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.5-5/xorg-server.install b/version/1.20.5-5/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.5-5/xserver-autobind-hotplug.patch b/version/1.20.5-5/xserver-autobind-hotplug.patch
deleted file mode 100644
index 86b96a23e4bf454b4362e0e0acc5687b60b887e4..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
-
diff --git a/version/1.20.5-5/xvfb-run b/version/1.20.5-5/xvfb-run
deleted file mode 100644
index 9d088c1c28ec13649eaef4deb24b75a0039c19a1..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.5-5/xvfb-run.1 b/version/1.20.5-5/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.5-5/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.7-2/0001-v2-FS-58644.patch b/version/1.20.7-2/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.7-2/0002-fix-libshadow-2.patch b/version/1.20.7-2/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.7-2/PKGBUILD b/version/1.20.7-2/PKGBUILD
deleted file mode 100644
index 9898f43655c5c93a137dcd515149639d44aa7b26..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/PKGBUILD
+++ /dev/null
@@ -1,337 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-	'xorg-server'
-	'xorg-server-xephyr'
-	'xorg-server-xvfb'
-	'xorg-server-xnest'
-	'xorg-server-xwayland'
-	'xorg-server-common'
-	'xorg-server-devel')
-
-pkgver=1.20.7
-pkgrel=2
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-    cd "${pkgbase}-${pkgver}"
-
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-	patch -Np1 -i ../0002-fix-libshadow-2.patch
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102 
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson ${pkgbase}-$pkgver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-    
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xwayland() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-    
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.7-2/Xwrapper.config b/version/1.20.7-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.7-2/xorg-server.install b/version/1.20.7-2/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.7-2/xserver-autobind-hotplug.patch b/version/1.20.7-2/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.7-2/xvfb-run b/version/1.20.7-2/xvfb-run
deleted file mode 100644
index 6aa4f3548bc7f5077b600c5bb8e0ae4f8943dfd9..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.7-2/xvfb-run.1 b/version/1.20.7-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.7-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.8-2/0001-v2-FS-58644.patch b/version/1.20.8-2/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.8-2/0002-fix-libshadow-2.patch b/version/1.20.8-2/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.8-2/PKGBUILD b/version/1.20.8-2/PKGBUILD
deleted file mode 100644
index 07f641bb25f89bcf277a2af70ea1eadef3422072..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/PKGBUILD
+++ /dev/null
@@ -1,337 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-	'xorg-server'
-	'xorg-server-xephyr'
-	'xorg-server-xvfb'
-	'xorg-server-xnest'
-	'xorg-server-xwayland'
-	'xorg-server-common'
-	'xorg-server-devel')
-
-pkgver=1.20.8
-pkgrel=2
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-    cd "${pkgbase}-${pkgver}"
-
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-	patch -Np1 -i ../0002-fix-libshadow-2.patch
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102 
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson ${pkgbase}-$pkgver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-    
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xwayland() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-    
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.8-2/Xwrapper.config b/version/1.20.8-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.8-2/xorg-server.install b/version/1.20.8-2/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.8-2/xserver-autobind-hotplug.patch b/version/1.20.8-2/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.8-2/xvfb-run b/version/1.20.8-2/xvfb-run
deleted file mode 100644
index 6aa4f3548bc7f5077b600c5bb8e0ae4f8943dfd9..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.8-2/xvfb-run.1 b/version/1.20.8-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.8-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.8-3/0001-v2-FS-58644.patch b/version/1.20.8-3/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.8-3/0002-fix-libshadow-2.patch b/version/1.20.8-3/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.8-3/PKGBUILD b/version/1.20.8-3/PKGBUILD
deleted file mode 100644
index f4bb095f4db07014741474a2c5b972a4bf918b1e..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/PKGBUILD
+++ /dev/null
@@ -1,337 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-	'xorg-server'
-	'xorg-server-xephyr'
-	'xorg-server-xvfb'
-	'xorg-server-xnest'
-	'xorg-server-xwayland'
-	'xorg-server-common'
-	'xorg-server-devel')
-
-pkgver=1.20.8
-pkgrel=3
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-    cd "${pkgbase}-${pkgver}"
-
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-	patch -Np1 -i ../0002-fix-libshadow-2.patch
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102 
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson ${pkgbase}-$pkgver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-    
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xwayland() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-    
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.8-3/Xwrapper.config b/version/1.20.8-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.8-3/xorg-server.install b/version/1.20.8-3/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.8-3/xserver-autobind-hotplug.patch b/version/1.20.8-3/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.8-3/xvfb-run b/version/1.20.8-3/xvfb-run
deleted file mode 100644
index 6aa4f3548bc7f5077b600c5bb8e0ae4f8943dfd9..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.8-3/xvfb-run.1 b/version/1.20.8-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.8-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.9-3/0001-v2-FS-58644.patch b/version/1.20.9-3/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.9-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.9-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.9-3/0002-fix-libshadow-2.patch b/version/1.20.9-3/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.9-3/PKGBUILD b/version/1.20.9-3/PKGBUILD
deleted file mode 100644
index 7d025ecae809759e4cb02aacf3ff3da960716cca..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/PKGBUILD
+++ /dev/null
@@ -1,341 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-	'xorg-server'
-	'xorg-server-xephyr'
-	'xorg-server-xvfb'
-	'xorg-server-xnest'
-	'xorg-server-xwayland'
-	'xorg-server-common'
-	'xorg-server-devel')
-
-pkgver=1.20.9
-pkgrel=3
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config'
-    '0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-prepare() {
-    cd "${pkgbase}-${pkgver}"
-
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-	patch -Np1 -i ../0002-fix-libshadow-2.patch
-	
-	# Fix FS#67774 - merged upstream
-	patch -Np1 -i ../0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102 
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson ${pkgbase}-$pkgver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-    
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xwayland() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-    
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.9-3/Xwrapper.config b/version/1.20.9-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.9-3/xorg-server.install b/version/1.20.9-3/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.9-3/xserver-autobind-hotplug.patch b/version/1.20.9-3/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.9-3/xvfb-run b/version/1.20.9-3/xvfb-run
deleted file mode 100644
index 6aa4f3548bc7f5077b600c5bb8e0ae4f8943dfd9..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.9-3/xvfb-run.1 b/version/1.20.9-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.9-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/1.20.9.r21.g5c400cae1-3/0001-v2-FS-58644.patch b/version/1.20.9.r21.g5c400cae1-3/0001-v2-FS-58644.patch
deleted file mode 100644
index 9146e8231842c95c90e64206183a8357df47fb1e..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/0001-v2-FS-58644.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17584285d296acaa80f131ca0e8b75eff675962b Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sun, 20 May 2018 14:30:43 +0200
-Subject: [PATCH] v2 FS#58644
-
----
- hw/xfree86/common/meson.build | 13 +++++++++++++
- hw/xfree86/meson.build        | 12 +++++++-----
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
-index 514999ff6..0eff6e488 100644
---- a/hw/xfree86/common/meson.build
-+++ b/hw/xfree86/common/meson.build
-@@ -1,3 +1,16 @@
-+if get_option('suid_wrapper')
-+    x_sh = configure_file(
-+        input: '../Xorg.sh.in',
-+        output: 'Xorg',
-+        configuration: conf_data,
-+    )
-+    install_data(
-+       x_sh,
-+       install_mode: 'rwxr-xr-x',
-+       install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+    )
-+endif
-+
- srcs_xorg_common = [
-     'xf86fbBus.c',
-     'xf86noBus.c',
-diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
-index cacf56d4c..d1295d404 100644
---- a/hw/xfree86/meson.build
-+++ b/hw/xfree86/meson.build
-@@ -145,11 +145,13 @@ if get_option('suid_wrapper')
-         install_dir: get_option('libexecdir'),
-         # install_mode: ['r-sr-xr-x', 0, 0],
-     )
--    configure_file(
--        input: 'Xorg.sh.in',
--        output: 'Xorg',
--        configuration: conf_data,
--        install_dir: join_paths(get_option('prefix'), get_option('bindir')),
-+     meson.add_install_script(
-+        'sh', '-c',
-+        'chmod u+s @0@@1@/@2@'.format(
-+            '${DESTDIR}',
-+            join_paths(get_option('prefix'), get_option('libexecdir')),
-+            'Xorg.wrap'
-+        )
-     )
- endif
- 
--- 
-2.17.0
diff --git a/version/1.20.9.r21.g5c400cae1-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch b/version/1.20.9.r21.g5c400cae1-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
deleted file mode 100644
index bcecf8c7e63ad53f9e8d3e79302aa27a7034c9a9..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/0001-xfree86-Take-second-reference-for-SavedCursor-in-xf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
-Date: Mon, 31 Aug 2020 12:10:43 +0200
-Subject: [PATCH] xfree86: Take second reference for SavedCursor in
- xf86CursorSetCursor
-
-The same pointer is kept in CurrentCursor as well, therefore two
-RefCursor calls are needed.
-
-Fixes use-after-free after switching VTs.
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
-index 9aa3de97b..c8362d169 100644
---- a/hw/xfree86/ramdac/xf86CursorRD.c
-+++ b/hw/xfree86/ramdac/xf86CursorRD.c
-@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
-         ScreenPriv->HotY = cursor->bits->yhot;
-
-         if (!infoPtr->pScrn->vtSema) {
-+            cursor = RefCursor(cursor);
-+            if (ScreenPriv->SavedCursor)
-+                FreeCursor(ScreenPriv->SavedCursor, None);
-             ScreenPriv->SavedCursor = cursor;
-             return;
-         }
--- 
-2.28.0
-
diff --git a/version/1.20.9.r21.g5c400cae1-3/0002-fix-libshadow-2.patch b/version/1.20.9.r21.g5c400cae1-3/0002-fix-libshadow-2.patch
deleted file mode 100644
index 137384f7742e276e29302a32c40fbad5f06a34e9..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/0002-fix-libshadow-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Apr 2019 18:01:27 -0400
-Subject: [PATCH] meson: Fix libshadow.so linkage
-
-Don't link against fb, it's the driver's responsibility to load that
-first. Underlinking like this is unpleasant but this matches what
-autotools does.
-
-Fixes: xorg/xserver#540
----
- hw/xfree86/dixmods/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
-index 835d23215..0562b630f 100644
---- a/hw/xfree86/dixmods/meson.build
-+++ b/hw/xfree86/dixmods/meson.build
-@@ -34,7 +34,7 @@ shared_module(
-     c_args: xorg_c_args,
-     dependencies: common_dep,
-     link_whole: libxserver_miext_shadow,
--    link_with: [fb, e],
-+    link_with: e,
- 
-     install: true,
-     install_dir: module_dir,
--- 
-2.22.0
diff --git a/version/1.20.9.r21.g5c400cae1-3/PKGBUILD b/version/1.20.9.r21.g5c400cae1-3/PKGBUILD
deleted file mode 100644
index b7965a6f842e3afc770e349f69c1184dbe2b936e..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/PKGBUILD
+++ /dev/null
@@ -1,356 +0,0 @@
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Obarun PkgSrc : https://framagit.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Maintainer    : AndyRTR <andyrtr@archlinux.org>
-# Maintainer    : Jan de Groot <jgc@archlinux.org>
-# Arch PkgSrc   : https://www.archlinux.org/packages/extra/x86_64/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#--------------------------------------------------------------------------------------
-
-pkgbase=xorg-server
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-xwayland'
-    'xorg-server-common'
-    'xorg-server-devel')
-
-pkgver=1.20.9.r21.g5c400cae1
-pkgrel=3
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-track=commit
-target=5c400cae1f9817045378966effa6bca91e45aead # server-1.20-branch 2020-11-09
-source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
-    'xserver-autobind-hotplug.patch'
-    '0001-v2-FS-58644.patch'
-    '0002-fix-libshadow-2.patch'
-    'xvfb-run' ## with updates from FC master
-    'xvfb-run.1'
-    'Xwrapper.config')
-
-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
-
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    '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')
-
-#--------------------------------------| BUILD PREPARATION |------------------------------------
-
-pkgver() {
-    cd xserver
-    git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-    #cd "${pkgbase}-${pkgver}"
-    cd xserver
-    ## patch from Fedora, not yet merged
-    patch -Np1 -i ../xserver-autobind-hotplug.patch
-
-    ## https://bugs.freedesktop.org/show_bug.cgi?id=106588
-    patch -Np1 -i ../0001-v2-FS-58644.patch
-
-    ## Fix libshadow.so: libfb.so => not found - FS#58731
-    patch -Np1 -i ../0002-fix-libshadow-2.patch
-
-}
-
-#--------------------------------------------| BUILD |------------------------------------------
-
-build() {
-
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## https://bugs.archlinux.org/task/55102
-    ## https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-   # arch-meson ${pkgbase}-$pkgver build
-    arch-meson xserver build \
-        -D os_vendor="Obarun" \
-        -D ipv6=true \
-        -D xvfb=true \
-        -D xnest=true \
-        -D xcsecurity=true \
-        -D xorg=true \
-        -D xephyr=true \
-        -D xwayland=true \
-        -D xwayland_eglstream=true \
-        -D glamor=true \
-        -D udev=true \
-        -D suid_wrapper=true \
-        -D xkb_dir=/usr/share/X11/xkb \
-        -D xkb_output_dir=/var/lib/xkb \
-        -D systemd_logind=false
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-#--------------------------------------------| CHECK |------------------------------------------
-
-
-
-#-------------------------------------------| PACKAGE |-----------------------------------------
-
-_install() {
-    local src f dir
-    for src; do
-     f="${src#fakeinstall/}"
-     dir="${pkgdir}/${f%/*}"
-     install -m755 -d "${dir}"
-     mv -v "${src}" "${dir}/"
-    done
-}
-
-package_xorg-server-common() {
-    pkgdesc="Xorg server common files"
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap')
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    #install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-    install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence') ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=24.0'
-        'X-ABI-XINPUT_VERSION=24.1'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server')
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting')
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting')
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{Xorg,cvt,gtf}
-    ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-    install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-xwayland() {
-    pkgdesc="run X clients under wayland"
-    depends=(
-        'libxfont2'
-        'libepoxy'
-        'libunwind'
-        'libgl'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc')
-
-    _install fakeinstall/usr/bin/Xwayland
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros') ## not technically required but almost every Xorg pkg needs it to build
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    #install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-
-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
-
-arch=('x86_64')
-
-groups=(
-    'xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
-
-license=('CUSTOM')
-
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2'
-              '3BB639E56F861FA2E86505690FDD682D974CA72A')
-
-sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
-            'SKIP'
-            'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
-            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
-            'f05c18354a3cf5b5b0fa97c4a887cfd688297e39d7ddc93b5900357119a689a060321019aeec9ca9c1366ea4b65b7875b2a9cadb84e46d2c193c15e6df22fcd8'
-            '9cb9a979dfc2de4fac384a1044b368bb97c8b0b524523aa2a96ef55c673ab5350c50cc79ad103655f40c2e0002cdcc2e1646fade3ac78641616d182e7c500be7'
-            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
-            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            '97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8')
-
diff --git a/version/1.20.9.r21.g5c400cae1-3/Xwrapper.config b/version/1.20.9.r21.g5c400cae1-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/1.20.9.r21.g5c400cae1-3/xorg-server.install b/version/1.20.9.r21.g5c400cae1-3/xorg-server.install
deleted file mode 100644
index 0154b36aab6e681bed6e51cc08cdbd5e589b25e4..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/xorg-server.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_upgrade() {
-    if (( $(vercmp $2 1.16.0-3) < 0 )); then
-        post_install
-    fi
-}
-
-post_install() {
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
diff --git a/version/1.20.9.r21.g5c400cae1-3/xserver-autobind-hotplug.patch b/version/1.20.9.r21.g5c400cae1-3/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/1.20.9.r21.g5c400cae1-3/xvfb-run b/version/1.20.9.r21.g5c400cae1-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/1.20.9.r21.g5c400cae1-3/xvfb-run.1 b/version/1.20.9.r21.g5c400cae1-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/1.20.9.r21.g5c400cae1-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.1-3/PKGBUILD b/version/21.1.1-3/PKGBUILD
deleted file mode 100644
index e78d456286f55e06cd7de7708a205f52650363f2..0000000000000000000000000000000000000000
--- a/version/21.1.1-3/PKGBUILD
+++ /dev/null
@@ -1,288 +0,0 @@
-# Maintainer    : Obarun Packagers <pkg@obarun.org>
-# Obarun PkgSrc : https://git.obarun.org/obarun-pkgbuild-extra/xorg-server
-#----------------
-# Website       : http://xorg.freedesktop.org
-#------------------------------------------------------------------------
-# DESCRIPTION ]
-pkgbase=xorg-server
-pkgver=21.1.1
-pkgrel=3
-
-pkgname=(
-	'xorg-server'
-	'xorg-server-xephyr'
-	'xorg-server-xvfb'
-	'xorg-server-xnest'
-	'xorg-server-common'
-	'xorg-server-devel')
-
-url="https://xorg.freedesktop.org/releases/individual/xserver"
-
-#source=(${pkgbase}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/xserver.git#commit=27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56
-source=($url/${pkgbase}-${pkgver}.tar.xz{,.sig}
-	xvfb-run # with updates from FC master
-	xvfb-run.1
-	Xwrapper.config)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-arch=('x86_64')
-groups=('xorg')
-
-backup=(
-    'etc/X11/Xwrapper.config')
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-	'xorgproto'
-	'pixman'
-	'libx11'
-	'mesa'
-	'xtrans'
-	'libxkbfile'
-	'libxfont2'
-	'libpciaccess'
-	'libxv'
-	'libxcvt'
-	'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'
-	'meson')
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-  cd "${pkgbase}-${pkgver}"
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-build() {
-  # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-  # With them, module fail to load with undefined symbol.
-  # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-  export CFLAGS=${CFLAGS/-fno-plt}
-  export CXXFLAGS=${CXXFLAGS/-fno-plt}
-  export LDFLAGS=${LDFLAGS/,-z,now}
-
-  arch-meson ${pkgbase}-$pkgver build \
-    -D xkb_dir=/usr/share/X11/xkb \
-    -D xkb_output_dir=/var/lib/xkb \
-    -D ipv6=true \
-    -D xvfb=true \
-    -D xnest=true \
-    -D xcsecurity=true \
-    -D xorg=true \
-    -D xephyr=true \
-    -D glamor=true \
-    -D udev=true \
-    -D dtrace=false \
-    -D systemd_logind=false \
-    -D suid_wrapper=true \
-    -D xkb_dir=/usr/share/X11/xkb \
-    -D xkb_output_dir=/var/lib/xkb
-
-  # Print config
-  meson configure build
-#  ninja -C build
-  meson compile -C build
-
-  # fake installation to be seperated into packages
-  # DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-    meson install -C build --destdir "${srcdir}/fakeinstall"
-}
-
-_install() {
-  local src f dir
-  for src; do
-    f="${src#fakeinstall/}"
-    dir="${pkgdir}/${f%/*}"
-    install -m755 -d "${dir}"
-    # use copy so a new file is created and fakeroot can track properties such as setuid
-    cp -av "${src}" "${dir}/"
-    rm -rf "${src}"
-  done
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=(
-	xkeyboard-config
-	xorg-xkbcomp
-	xorg-setxkbmap)
-
-  _install fakeinstall/usr/lib/xorg/protocol.txt
-  _install fakeinstall/usr/share/man/man1/Xserver.1
-
-  install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(
-	libepoxy
-	libxfont2
-	pixman
-	xorg-server-common
-	libunwind
-	dbus
-	libgl
-	xf86-input-libinput
-	nettle
-	libpciaccess
-	libdrm
-	libxshmfence # FS#52949
-	libxcvt) 
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=(
-	'X-ABI-VIDEODRV_VERSION=25.2'
-	'X-ABI-XINPUT_VERSION=24.4'
-	'X-ABI-EXTENSION_VERSION=10.0'
-	'x-server')
-  conflicts=(
-	'nvidia-utils<=331.20'
-	'glamor-egl'
-	'xf86-video-modesetting')
-  replaces=(
-	'glamor-egl'
-	'xf86-video-modesetting')
-#  install=xorg-server.install
-
-  _install fakeinstall/usr/bin/{X,Xorg,gtf}
-  _install fakeinstall/usr/lib/Xorg{,.wrap}
-  _install fakeinstall/usr/lib/xorg/modules/*
-  _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-  _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-  _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-  _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-  # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "${pkgdir}"/etc/X11/Xwrapper.config
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-	depends=(
-	libxfont2
-	libgl
-	libepoxy
-	libunwind
-	libxv
-	pixman
-	xorg-server-common
-	xcb-util-image
-	xcb-util-renderutil
-	xcb-util-wm
-	xcb-util-keysyms
-	nettle
-	libtirpc)
-
-  _install fakeinstall/usr/bin/Xephyr
-  _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(
-	libxfont2
-	libunwind
-	pixman
-	xorg-server-common
-	xorg-xauth
-	libgl
-	nettle
-	libtirpc)
-
-  _install fakeinstall/usr/bin/Xvfb
-  _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
-
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(
-	libxfont2
-	libxext 
-	pixman 
-	xorg-server-common 
-	nettle 
-	libtirpc)
-
-  _install fakeinstall/usr/bin/Xnest
-  _install fakeinstall/usr/share/man/man1/Xnest.1
-
-  ## license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(
-	'xorgproto'
-	'mesa'
-	'libpciaccess'
-	# not technically required but almost every Xorg pkg needs it to build
-	'xorg-util-macros')
-
-  _install fakeinstall/usr/include/xorg/*
-  _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-  _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-  # license
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-  # make sure there are no files left to install
-  #  rm fakeinstall/usr/bin/Xwayland  ## no such file
-  find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-license=('custom')
-
-validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
-
-sha512sums=('8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d' #  xorg-server-21.1.1.tar.xz
-	'360669d336d26095dc8f46cfb45a2c25c6a50318726719146de4f81d8ea94e3422cb21a394c23eee8de55179f7b3007edc9ec7e1c615ec86033177922c0e6257' #  xorg-server-21.1.1.tar.xz.sig
-	'4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514' #  xvfb-run
-	'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22' #  xvfb-run.1
-	'97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8') #  Xwrapper.config
diff --git a/version/21.1.1-3/Xwrapper.config b/version/21.1.1-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.1-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.1-3/xorg-server.install b/version/21.1.1-3/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.1-3/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.1-3/xserver-autobind-hotplug.patch b/version/21.1.1-3/xserver-autobind-hotplug.patch
deleted file mode 100644
index 1b952fae35860b405c438aa25048e07e9d673c0e..0000000000000000000000000000000000000000
--- a/version/21.1.1-3/xserver-autobind-hotplug.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
diff --git a/version/21.1.1-3/xvfb-run b/version/21.1.1-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.1-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.1-3/xvfb-run.1 b/version/21.1.1-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.1-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.1-4/0001_revert_dpi_calculation.patch b/version/21.1.1-4/0001_revert_dpi_calculation.patch
deleted file mode 100644
index 20babdfc829114145e8ef4b66823c5d141b07f10..0000000000000000000000000000000000000000
--- a/version/21.1.1-4/0001_revert_dpi_calculation.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
-index 0389945a7cf0e18545cbe101639b62cd01f1e276..d03382d263399bba67dc77f6525480f751674bcc 100644
---- a/hw/xfree86/common/xf86Helper.c
-+++ b/hw/xfree86/common/xf86Helper.c
-@@ -55,6 +55,7 @@
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
- #include "mivalidate.h"
-+#include "xf86Crtc.h"
- 
- /* For xf86GetClocks */
- #if defined(CSRG_BASED) || defined(__GNU__)
-@@ -851,8 +852,9 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
- {
-     MessageType from = X_DEFAULT;
-     xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC);
--    int ddcWidthmm, ddcHeightmm;
-+    int probedWidthmm, probedHeightmm;
-     int widthErr, heightErr;
-+    xf86OutputPtr compat = xf86CompatOutput(pScrn);
- 
-     /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */
-     pScrn->widthmm = pScrn->monitor->widthmm;
-@@ -862,11 +864,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
-         /* DDC gives display size in mm for individual modes,
-          * but cm for monitor
-          */
--        ddcWidthmm = DDC->features.hsize * 10;  /* 10mm in 1cm */
--        ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
-+        probedWidthmm = DDC->features.hsize * 10;  /* 10mm in 1cm */
-+        probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
-+    }
-+    else if (compat && compat->mm_width > 0 && compat->mm_height > 0) {
-+        probedWidthmm = compat->mm_width;
-+        probedHeightmm = compat->mm_height;
-     }
-     else {
--        ddcWidthmm = ddcHeightmm = 0;
-+        probedWidthmm = probedHeightmm = 0;
-     }
- 
-     if (monitorResolution > 0) {
-@@ -892,15 +898,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
-                    pScrn->widthmm, pScrn->heightmm);
- 
-         /* Warn if config and probe disagree about display size */
--        if (ddcWidthmm && ddcHeightmm) {
-+        if (probedWidthmm && probedHeightmm) {
-             if (pScrn->widthmm > 0) {
--                widthErr = abs(ddcWidthmm - pScrn->widthmm);
-+                widthErr = abs(probedWidthmm - pScrn->widthmm);
-             }
-             else {
-                 widthErr = 0;
-             }
-             if (pScrn->heightmm > 0) {
--                heightErr = abs(ddcHeightmm - pScrn->heightmm);
-+                heightErr = abs(probedHeightmm - pScrn->heightmm);
-             }
-             else {
-                 heightErr = 0;
-@@ -909,17 +915,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
-                 /* Should include config file name for monitor here */
-                 xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-                            "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
--                           ddcWidthmm, ddcHeightmm, pScrn->widthmm,
-+                           probedWidthmm, probedHeightmm, pScrn->widthmm,
-                            pScrn->heightmm);
-             }
-         }
-     }
--    else if (ddcWidthmm && ddcHeightmm) {
-+    else if (probedWidthmm && probedHeightmm) {
-         from = X_PROBED;
-         xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
--                   ddcWidthmm, ddcHeightmm);
--        pScrn->widthmm = ddcWidthmm;
--        pScrn->heightmm = ddcHeightmm;
-+                   probedWidthmm, probedHeightmm);
-+        pScrn->widthmm = probedWidthmm;
-+        pScrn->heightmm = probedHeightmm;
-         if (pScrn->widthmm > 0) {
-             pScrn->xDpi =
-                 (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index c6e89e66f690cd7e2a26a3d4b663f9f146cd84e0..202791774b31d6c349f27ed692c1b4ea7f1fdca4 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3256,8 +3256,10 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon)
-     free(output->MonInfo);
- 
-     output->MonInfo = edid_mon;
--    output->mm_width = 0;
--    output->mm_height = 0;
-+    if (edid_mon) {
-+        output->mm_width = 0;
-+        output->mm_height = 0;
-+    }
- 
-     if (debug_modes) {
-         xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
-diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 50cbd043edc8380a3307dfcd5dee9cb280a50ba9..d4651f4e856f9fbe8b87086405401e4c0989b409 100644
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -806,6 +806,12 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen)
-                 mmWidth = output->conf_monitor->mon_width;
-                 mmHeight = output->conf_monitor->mon_height;
-             }
-+            else if (output &&
-+                (output->mm_width > 0 &&
-+                 output->mm_height > 0)) {
-+                mmWidth = output->mm_width;
-+                mmHeight = output->mm_height;
-+            }
-             else {
-                 /*
-                  * Otherwise, just set the screen to DEFAULT_DPI
diff --git a/version/21.1.1-4/PKGBUILD b/version/21.1.1-4/PKGBUILD
deleted file mode 100644
index dd89020bd61746ac6907dafde5adfc0956dd9ba1..0000000000000000000000000000000000000000
--- a/version/21.1.1-4/PKGBUILD
+++ /dev/null
@@ -1,319 +0,0 @@
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#----------------
-#--------------------------------------------------------------
-# DESCRIPTION ]
-pkgbase=xorg-server
-pkgver=21.1.1
-pkgrel=4
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-url='https://xorg.freedesktop.org'
-
-track=releases/individual/xserver
-target=$pkgbase-$pkgver
-source=(
-    https://xorg.freedesktop.org/$track/$target.tar.xz{,.sig}
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-    0001_revert_dpi_calculation.patch
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## revert dpi calculation that leads to unwanted miscalculation results
-    ## https://gitlab.freedesktop.org/xorg/xserver/-/issues/1241
-    ## https://bugs.archlinux.org/task/72661
-    patch -Rp1 -i ../0001_revert_dpi_calculation.patch
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=(' ')
diff --git a/version/21.1.1-4/Xwrapper.config b/version/21.1.1-4/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.1-4/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.1-4/xorg-server.install b/version/21.1.1-4/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.1-4/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.1-4/xvfb-run b/version/21.1.1-4/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.1-4/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.1-4/xvfb-run.1 b/version/21.1.1-4/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.1-4/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.2-2/PKGBUILD b/version/21.1.2-2/PKGBUILD
deleted file mode 100644
index 6143785bab8255d2bbcc5c887b522fde3cd5a4b6..0000000000000000000000000000000000000000
--- a/version/21.1.2-2/PKGBUILD
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.2
-pkgrel=2
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#--------------------
-# BUILD PREPARATION ]
-
-#prepare() {
-#    cd $pkgbase-$pkgver
-#}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=('')
diff --git a/version/21.1.2-2/Xwrapper.config b/version/21.1.2-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.2-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.2-2/xorg-server.install b/version/21.1.2-2/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.2-2/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.2-2/xvfb-run b/version/21.1.2-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.2-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.2-2/xvfb-run.1 b/version/21.1.2-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.2-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.2-3/PKGBUILD b/version/21.1.2-3/PKGBUILD
deleted file mode 100644
index 2439b24e9b0ac54eee5423b0843dbf5922fb7e4a..0000000000000000000000000000000000000000
--- a/version/21.1.2-3/PKGBUILD
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Maintainer    : YianIris <yianiris At disroot Dot org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.2
-pkgrel=3
-url="https://xorg.freedesktop.org"
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=('')
diff --git a/version/21.1.2-3/Xwrapper.config b/version/21.1.2-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.2-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.2-3/xorg-server.install b/version/21.1.2-3/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.2-3/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.2-3/xvfb-run b/version/21.1.2-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.2-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.2-3/xvfb-run.1 b/version/21.1.2-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.2-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.3-2/PKGBUILD b/version/21.1.3-2/PKGBUILD
deleted file mode 100644
index 7713008912060772c919cde458fca304a47c08e1..0000000000000000000000000000000000000000
--- a/version/21.1.3-2/PKGBUILD
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.3
-pkgrel=2
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=('')
diff --git a/version/21.1.3-2/Xwrapper.config b/version/21.1.3-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.3-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.3-2/xorg-server.install b/version/21.1.3-2/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.3-2/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.3-2/xvfb-run b/version/21.1.3-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.3-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.3-2/xvfb-run.1 b/version/21.1.3-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.3-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.3-3/0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch b/version/21.1.3-3/0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
deleted file mode 100644
index 3e71d0b07d171088eec3f109af22e52946bc77dd..0000000000000000000000000000000000000000
--- a/version/21.1.3-3/0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 0217cc6e0cf5013366105a90f5f91ccc4bab5425 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Wed, 26 Jan 2022 00:05:55 +0100
-Subject: [PATCH] xkb: fix XkbSetMap when changing a keysym without changing a
- keytype
-
-As the comment says:
-
-"symsPerKey/mapWidths must be filled regardless of client-side flags"
-
-so we always have to call CheckKeyTypes which will notably fill mapWidths
-and nTypes. That is needed for CheckKeySyms to work since it checks the
-width. Without it, any request with XkbKeySymsMask but not
-XkbKeyTypesMask will fail because of the missing width information, for
-instance this:
-
-  XkbDescPtr xkb;
-  if (!(xkb = XkbGetMap (dpy, XkbKeyTypesMask|XkbKeySymsMask, XkbUseCoreKbd))) {
-    fprintf (stderr, "ERROR getting map\n");
-    exit(1);
-  }
-  XFlush (dpy);
-  XSync (dpy, False);
-
-  XkbMapChangesRec changes = { .changed = 0 };
-  int oneGroupType[XkbNumKbdGroups] = { XkbOneLevelIndex };
-
-  if (XkbChangeTypesOfKey(xkb, keycode, 1, XkbGroup1Mask, oneGroupType, &changes)) {
-    fprintf(stderr, "ERROR changing type of key\n");
-    exit(1);
-  }
-  XkbKeySymEntry(xkb,keycode,0,0) = keysym;
-
-  if (!XkbChangeMap(dpy,xkb,&changes)) {
-    fprintf(stderr, "ERROR changing map\n");
-    exit(1);
-  }
-
-  XkbFreeKeyboard (xkb, 0, TRUE);
-  XFlush (dpy);
-  XSync (dpy, False);
-
-This had being going under the radar since about ever until commit
-de940e06f8733d87bbb857aef85d830053442cfe ("xkb: fix key type index check
-in _XkbSetMapChecks") fixed checking the values of kt_index, which was
-previously erroneously ignoring errors and ignoring all other checks, just
-because nTypes was not set, precisely because CheckKeyTypes was not called.
-
-Note: yes, CheckKeyTypes is meant to be callable without XkbKeyTypesMask, it
-does properly check for that and just fills nTypes and mapWidths in that
-case.
-
-Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- xkb/xkb.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/xkb/xkb.c b/xkb/xkb.c
-index bfc21de00..820cd7166 100644
---- a/xkb/xkb.c
-+++ b/xkb/xkb.c
-@@ -2511,16 +2511,15 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req,
-         }
-     }
- 
--    if (!(req->present & XkbKeyTypesMask)) {
--        nTypes = xkb->map->num_types;
--    }
--    else if (!CheckKeyTypes(client, xkb, req, (xkbKeyTypeWireDesc **) &values,
--			       &nTypes, mapWidths, doswap)) {
-+    /* nTypes/mapWidths/symsPerKey must be filled for further tests below,
-+     * regardless of client-side flags */
-+
-+    if (!CheckKeyTypes(client, xkb, req, (xkbKeyTypeWireDesc **) &values,
-+		       &nTypes, mapWidths, doswap)) {
- 	    client->errorValue = nTypes;
- 	    return BadValue;
-     }
- 
--    /* symsPerKey/mapWidths must be filled regardless of client-side flags */
-     map = &xkb->map->key_sym_map[xkb->min_key_code];
-     for (i = xkb->min_key_code; i < xkb->max_key_code; i++, map++) {
-         register int g, ng, w;
--- 
-2.35.1
-
diff --git a/version/21.1.3-3/PKGBUILD b/version/21.1.3-3/PKGBUILD
deleted file mode 100644
index 4dc40633877c794bb6c4730b1259f23197f44b99..0000000000000000000000000000000000000000
--- a/version/21.1.3-3/PKGBUILD
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.3
-pkgrel=3
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## merged in main
-    patch -Np1 -i ../0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=('')
diff --git a/version/21.1.3-3/Xwrapper.config b/version/21.1.3-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.3-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.3-3/xorg-server.install b/version/21.1.3-3/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.3-3/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.3-3/xvfb-run b/version/21.1.3-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.3-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.3-3/xvfb-run.1 b/version/21.1.3-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.3-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.3-7/0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch b/version/21.1.3-7/0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
deleted file mode 100644
index 3e71d0b07d171088eec3f109af22e52946bc77dd..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 0217cc6e0cf5013366105a90f5f91ccc4bab5425 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Wed, 26 Jan 2022 00:05:55 +0100
-Subject: [PATCH] xkb: fix XkbSetMap when changing a keysym without changing a
- keytype
-
-As the comment says:
-
-"symsPerKey/mapWidths must be filled regardless of client-side flags"
-
-so we always have to call CheckKeyTypes which will notably fill mapWidths
-and nTypes. That is needed for CheckKeySyms to work since it checks the
-width. Without it, any request with XkbKeySymsMask but not
-XkbKeyTypesMask will fail because of the missing width information, for
-instance this:
-
-  XkbDescPtr xkb;
-  if (!(xkb = XkbGetMap (dpy, XkbKeyTypesMask|XkbKeySymsMask, XkbUseCoreKbd))) {
-    fprintf (stderr, "ERROR getting map\n");
-    exit(1);
-  }
-  XFlush (dpy);
-  XSync (dpy, False);
-
-  XkbMapChangesRec changes = { .changed = 0 };
-  int oneGroupType[XkbNumKbdGroups] = { XkbOneLevelIndex };
-
-  if (XkbChangeTypesOfKey(xkb, keycode, 1, XkbGroup1Mask, oneGroupType, &changes)) {
-    fprintf(stderr, "ERROR changing type of key\n");
-    exit(1);
-  }
-  XkbKeySymEntry(xkb,keycode,0,0) = keysym;
-
-  if (!XkbChangeMap(dpy,xkb,&changes)) {
-    fprintf(stderr, "ERROR changing map\n");
-    exit(1);
-  }
-
-  XkbFreeKeyboard (xkb, 0, TRUE);
-  XFlush (dpy);
-  XSync (dpy, False);
-
-This had being going under the radar since about ever until commit
-de940e06f8733d87bbb857aef85d830053442cfe ("xkb: fix key type index check
-in _XkbSetMapChecks") fixed checking the values of kt_index, which was
-previously erroneously ignoring errors and ignoring all other checks, just
-because nTypes was not set, precisely because CheckKeyTypes was not called.
-
-Note: yes, CheckKeyTypes is meant to be callable without XkbKeyTypesMask, it
-does properly check for that and just fills nTypes and mapWidths in that
-case.
-
-Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- xkb/xkb.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/xkb/xkb.c b/xkb/xkb.c
-index bfc21de00..820cd7166 100644
---- a/xkb/xkb.c
-+++ b/xkb/xkb.c
-@@ -2511,16 +2511,15 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req,
-         }
-     }
- 
--    if (!(req->present & XkbKeyTypesMask)) {
--        nTypes = xkb->map->num_types;
--    }
--    else if (!CheckKeyTypes(client, xkb, req, (xkbKeyTypeWireDesc **) &values,
--			       &nTypes, mapWidths, doswap)) {
-+    /* nTypes/mapWidths/symsPerKey must be filled for further tests below,
-+     * regardless of client-side flags */
-+
-+    if (!CheckKeyTypes(client, xkb, req, (xkbKeyTypeWireDesc **) &values,
-+		       &nTypes, mapWidths, doswap)) {
- 	    client->errorValue = nTypes;
- 	    return BadValue;
-     }
- 
--    /* symsPerKey/mapWidths must be filled regardless of client-side flags */
-     map = &xkb->map->key_sym_map[xkb->min_key_code];
-     for (i = xkb->min_key_code; i < xkb->max_key_code; i++, map++) {
-         register int g, ng, w;
--- 
-2.35.1
-
diff --git a/version/21.1.3-7/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/version/21.1.3-7/0002-xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad3354da0ff62d6aebcefd748ae741f..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/0002-xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-GitLab
-
diff --git a/version/21.1.3-7/0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch b/version/21.1.3-7/0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
deleted file mode 100644
index 9ccbd58ebbc45d9cc79cff4c51d3913ba1bbcda9..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6ef5c05728f8b18170fbc8415d7502495a08670b Mon Sep 17 00:00:00 2001
-From: Povilas Kanapickas <povilas@radix.lt>
-Date: Sun, 23 Jan 2022 22:18:52 +0200
-Subject: [PATCH] dix: Correctly save replayed event into GrabInfoRec
-
-When processing events we operate on InternalEvent pointers. They may
-actually refer to a an instance of DeviceEvent, GestureEvent or any
-other event that comprises the InternalEvent union. This works well in
-practice because we always look into event type before doing anything,
-except in the case of copying the event.
-
-*dst_event = *src_event would copy whole InternalEvent event and would
-cause out of bounds read in case the pointed to event was not
-InternalEvent but e.g. DeviceEvent.
-
-This regression has been introduced in
-23a8b62d34344575f9df9d057fb74bfefa94a77b.
-
-Fixes https://gitlab.freedesktop.org/xorg/xserver/-/issues/1261
-
-Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
----
- Xi/exevents.c   |  2 +-
- dix/events.c    | 18 ++++++++++++++++--
- include/input.h |  1 +
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 94b9983bd..217baa956 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -1524,7 +1524,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
-             g = AllocGrab(devgrab);
-             BUG_WARN(!g);
- 
--            *dev->deviceGrab.sync.event = *ev;
-+            CopyPartialInternalEvent(dev->deviceGrab.sync.event, ev);
- 
-             /* The listener array has a sequence of grabs and then one event
-              * selection. Implicit grab activation occurs through delivering an
-diff --git a/dix/events.c b/dix/events.c
-index 341c746d4..28d7d177c 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -467,6 +467,20 @@ WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent *ev)
-     return xi2mask_isset(inputMasks->xi2mask, dev, evtype);
- }
- 
-+/**
-+ * When processing events we operate on InternalEvent pointers. They may actually refer to a
-+ * an instance of DeviceEvent, GestureEvent or any other event that comprises the InternalEvent
-+ * union. This works well in practice because we always look into event type before doing anything,
-+ * except in the case of copying the event. Any copying of InternalEvent should use this function
-+ * instead of doing *dst_event = *src_event whenever it's not clear whether source event actually
-+ * points to full InternalEvent instance.
-+ */
-+void
-+CopyPartialInternalEvent(InternalEvent* dst_event, const InternalEvent* src_event)
-+{
-+    memcpy(dst_event, src_event, src_event->any.length);
-+}
-+
- Mask
- GetEventMask(DeviceIntPtr dev, xEvent *event, InputClients * other)
- {
-@@ -3873,7 +3887,7 @@ void ActivateGrabNoDelivery(DeviceIntPtr dev, GrabPtr grab,
- 
-     if (grabinfo->sync.state == FROZEN_NO_EVENT)
-         grabinfo->sync.state = FROZEN_WITH_EVENT;
--    *grabinfo->sync.event = *real_event;
-+    CopyPartialInternalEvent(grabinfo->sync.event, real_event);
- }
- 
- static BOOL
-@@ -4455,7 +4469,7 @@ FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev, InternalEvent *event)
-     case FREEZE_NEXT_EVENT:
-         grabinfo->sync.state = FROZEN_WITH_EVENT;
-         FreezeThaw(thisDev, TRUE);
--        *grabinfo->sync.event = *event;
-+        CopyPartialInternalEvent(grabinfo->sync.event, event);
-         break;
-     }
- }
-diff --git a/include/input.h b/include/input.h
-index b1aef3663..cdb5d5a90 100644
---- a/include/input.h
-+++ b/include/input.h
-@@ -676,6 +676,7 @@ extern void GestureEmitGestureEndToOwner(DeviceIntPtr dev, GestureInfoPtr gi);
- extern void ProcessGestureEvent(InternalEvent *ev, DeviceIntPtr dev);
- 
- /* misc event helpers */
-+extern void CopyPartialInternalEvent(InternalEvent* dst_event, const InternalEvent* src_event);
- extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients);
- extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
- extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent *ev);
--- 
-GitLab
-
diff --git a/version/21.1.3-7/0004-present_Check_for_NULL_to_prevent_crash.patch b/version/21.1.3-7/0004-present_Check_for_NULL_to_prevent_crash.patch
deleted file mode 100644
index edc147bae8d3c708edc6fef49234c4a055a57da1..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/0004-present_Check_for_NULL_to_prevent_crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 69774044716039fa70655b3bc6dd6a4ff4535cfd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
-Date: Thu, 13 Jan 2022 00:47:27 +0100
-Subject: [PATCH] present: Check for NULL to prevent crash
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
-Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
-Tested-by: Aaron Plattner <aplattner@nvidia.com>
-(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
----
- present/present_scmd.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/present/present_scmd.c b/present/present_scmd.c
-index da836ea6b..239055bc1 100644
---- a/present/present_scmd.c
-+++ b/present/present_scmd.c
-@@ -158,6 +158,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
-     if (!screen_priv->info)
-         return NULL;
- 
-+    if (!screen_priv->info->get_crtc)
-+        return NULL;
-+
-     return (*screen_priv->info->get_crtc)(window);
- }
- 
-@@ -196,6 +199,9 @@ present_flush(WindowPtr window)
-     if (!screen_priv->info)
-         return;
- 
-+    if (!screen_priv->info->flush)
-+        return;
-+
-     (*screen_priv->info->flush) (window);
- }
- 
--- 
-GitLab
-
diff --git a/version/21.1.3-7/PKGBUILD b/version/21.1.3-7/PKGBUILD
deleted file mode 100644
index f48ea44253f271c0d9b8323ffc213149298db66a..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/PKGBUILD
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.3
-pkgrel=7
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
-    0002-xephyr_Dont_check_for_SeatId_anymore.patch
-    0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-    0004-present_Check_for_NULL_to_prevent_crash.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## merged in main
-    patch -Np1 -i ../0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
-    ## FS#73274
-    patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
-    ## FS#73875
-    patch -Np1 -i ../0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-    ## FS#73895
-    patch -Np1 -i ../0004-present_Check_for_NULL_to_prevent_crash.patch
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=('')
diff --git a/version/21.1.3-7/Xwrapper.config b/version/21.1.3-7/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.3-7/xorg-server.install b/version/21.1.3-7/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.3-7/xvfb-run b/version/21.1.3-7/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.3-7/xvfb-run.1 b/version/21.1.3-7/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.3-7/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.4-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/version/21.1.4-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad3354da0ff62d6aebcefd748ae741f..0000000000000000000000000000000000000000
--- a/version/21.1.4-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-GitLab
-
diff --git a/version/21.1.4-2/PKGBUILD b/version/21.1.4-2/PKGBUILD
deleted file mode 100644
index 4d3efbe93c75fd25937b605c98162b29dca1ebc8..0000000000000000000000000000000000000000
--- a/version/21.1.4-2/PKGBUILD
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.4
-pkgrel=2
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    0002-xephyr_Dont_check_for_SeatId_anymore.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## FS#73274
-    patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-    -D libunwind=true
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=(
-    'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
-)
-
-sha512sums=('')
diff --git a/version/21.1.4-2/Xwrapper.config b/version/21.1.4-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.4-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.4-2/xorg-server.install b/version/21.1.4-2/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.4-2/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.4-2/xvfb-run b/version/21.1.4-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.4-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.4-2/xvfb-run.1 b/version/21.1.4-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.4-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.7-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/version/21.1.7-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad3354da0ff62d6aebcefd748ae741f..0000000000000000000000000000000000000000
--- a/version/21.1.7-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-GitLab
-
diff --git a/version/21.1.7-2/PKGBUILD b/version/21.1.7-2/PKGBUILD
deleted file mode 100644
index f66477c5a7cc3e58b93b88bbc93790edd8722f34..0000000000000000000000000000000000000000
--- a/version/21.1.7-2/PKGBUILD
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.7
-pkgrel=2
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    0002-xephyr_Dont_check_for_SeatId_anymore.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## FS#73274
-    patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-    -D libunwind=true
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF'  # Peter Hutterer (Who-T) <office@who-t.net>
-              '67DC86F2623FC5FD4BB5225D14706DBE1E4B4540'  # Olivier Fourdan <fourdan@xfce.org>
-              'FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
-
-sha512sums=('')
diff --git a/version/21.1.7-2/Xwrapper.config b/version/21.1.7-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.7-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.7-2/xorg-server.install b/version/21.1.7-2/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.7-2/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.7-2/xvfb-run b/version/21.1.7-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.7-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.7-2/xvfb-run.1 b/version/21.1.7-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.7-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.8-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch b/version/21.1.8-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad3354da0ff62d6aebcefd748ae741f..0000000000000000000000000000000000000000
--- a/version/21.1.8-2/0002-xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-GitLab
-
diff --git a/version/21.1.8-2/PKGBUILD b/version/21.1.8-2/PKGBUILD
deleted file mode 100644
index 25473e87944623ef572187c6d96f1aa80551e68c..0000000000000000000000000000000000000000
--- a/version/21.1.8-2/PKGBUILD
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.8
-pkgrel=2
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    0002-xephyr_Dont_check_for_SeatId_anymore.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## FS#73274
-    patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-    -D libunwind=true
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF'  # Peter Hutterer (Who-T) <office@who-t.net>
-              '67DC86F2623FC5FD4BB5225D14706DBE1E4B4540'  # Olivier Fourdan <fourdan@xfce.org>
-              'FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
-
-sha512sums=('')
diff --git a/version/21.1.8-2/Xwrapper.config b/version/21.1.8-2/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.8-2/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.8-2/xorg-server.install b/version/21.1.8-2/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.8-2/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.8-2/xvfb-run b/version/21.1.8-2/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.8-2/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.8-2/xvfb-run.1 b/version/21.1.8-2/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.8-2/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/version/21.1.8-3/0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch b/version/21.1.8-3/0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
deleted file mode 100644
index a02369bbd5cd87cd581067b9cb9dc52ead7af61a..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b98fc07d3442a289c6bef82df50dd0a2d01de71a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 2 Feb 2023 12:26:27 -0500
-Subject: [PATCH] present: Send a PresentConfigureNotify event for destroyed
- windows
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This enables fixing a deadlock case on the client side, where the client
-ends up blocked waiting for a Present event that will never come because
-the window was destroyed. The new PresentWindowDestroyed flag allows the
-client to avoid blocking indefinitely.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
-See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
-(cherry picked from commit 462b06033e66a32308d940eb5fc47f5e4c914dc0)
-Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
----
- present/present_event.c  |  5 +++--
- present/present_priv.h   |  7 ++++++-
- present/present_screen.c | 11 ++++++++++-
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/present/present_event.c b/present/present_event.c
-index 435b26b70..849732dc8 100644
---- a/present/present_event.c
-+++ b/present/present_event.c
-@@ -102,7 +102,8 @@ present_event_swap(xGenericEvent *from, xGenericEvent *to)
- }
- 
- void
--present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling)
-+present_send_config_notify(WindowPtr window, int x, int y, int w, int h,
-+                           int bw, WindowPtr sibling, CARD32 flags)
- {
-     present_window_priv_ptr window_priv = present_window_priv(window);
- 
-@@ -122,7 +123,7 @@ present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw,
-             .off_y = 0,
-             .pixmap_width = w,
-             .pixmap_height = h,
--            .pixmap_flags = 0
-+            .pixmap_flags = flags
-         };
-         present_event_ptr event;
- 
-diff --git a/present/present_priv.h b/present/present_priv.h
-index 6ebd009a2..4ad729864 100644
---- a/present/present_priv.h
-+++ b/present/present_priv.h
-@@ -43,6 +43,11 @@
- #define DebugPresent(x)
- #endif
- 
-+/* XXX this belongs in presentproto */
-+#ifndef PresentWindowDestroyed
-+#define PresentWindowDestroyed (1 << 0)
-+#endif
-+
- extern int present_request;
- 
- extern DevPrivateKeyRec present_screen_private_key;
-@@ -307,7 +312,7 @@ void
- present_free_events(WindowPtr window);
- 
- void
--present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling);
-+present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling, CARD32 flags);
- 
- void
- present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 serial, uint64_t ust, uint64_t msc);
-diff --git a/present/present_screen.c b/present/present_screen.c
-index 15684eda4..2c29aafd2 100644
---- a/present/present_screen.c
-+++ b/present/present_screen.c
-@@ -93,6 +93,15 @@ present_destroy_window(WindowPtr window)
-     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
-     present_window_priv_ptr window_priv = present_window_priv(window);
- 
-+    present_send_config_notify(window,
-+                               window->drawable.x,
-+                               window->drawable.y,
-+                               window->drawable.width,
-+                               window->drawable.height,
-+                               window->borderWidth,
-+                               window->nextSib,
-+                               PresentWindowDestroyed);
-+
-     if (window_priv) {
-         present_clear_window_notifies(window);
-         present_free_events(window);
-@@ -123,7 +132,7 @@ present_config_notify(WindowPtr window,
-     ScreenPtr screen = window->drawable.pScreen;
-     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
- 
--    present_send_config_notify(window, x, y, w, h, bw, sibling);
-+    present_send_config_notify(window, x, y, w, h, bw, sibling, 0);
- 
-     unwrap(screen_priv, screen, ConfigNotify);
-     if (screen->ConfigNotify)
--- 
-2.41.0
-
-
diff --git a/version/21.1.8-3/PKGBUILD b/version/21.1.8-3/PKGBUILD
deleted file mode 100644
index aef8112e3fb300e24ed41da2a7ce00a7254dbe0d..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/PKGBUILD
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright     : Obarun
-#------------------------
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-#----------------
-# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
-#--------------------------------------------------------------
-# DESCRIPTION ]
-
-pkgbase=xorg-server
-pkgver=21.1.8
-pkgrel=3
-url='https://xorg.freedesktop.org'
-
-pkgname=(
-    'xorg-server'
-    'xorg-server-xephyr'
-    'xorg-server-xvfb'
-    'xorg-server-xnest'
-    'xorg-server-common'
-    'xorg-server-devel'
-)
-
-track="releases/individual/xserver"
-target="$pkgbase-$pkgver"
-source=(
-    "https://xorg.freedesktop.org/${track}/${target}.tar.xz"{,.sig}
-    xephyr_Dont_check_for_SeatId_anymore.patch
-    xvfb-run # with updates from FC master
-    xvfb-run.1
-    0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
-    Xwrapper.config
-)
-
-#----------------------
-# BUILD CONFIGURATION ]
-
-makedepends=(
-    'xorgproto'
-    'pixman'
-    'libx11'
-    'mesa'
-    'mesa-libgl'
-    'xtrans'
-    'libxkbfile'
-    'libxfont2'
-    'libpciaccess'
-    'libxv'
-    'libxcvt'
-    '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'
-    'meson'
-)
-
-#------------------------
-# INSTALL CONFIGURATION ]
-
-groups=(
-    'xorg'
-)
-
-backup=(
-    'etc/X11/Xwrapper.config'
-)
-
-#----------------
-# BUILD PREPARE ]
-
-prepare() {
-    cd $pkgbase-$pkgver
-
-    ## FS#73274
-    patch -Np1 -i ../xephyr_Dont_check_for_SeatId_anymore.patch
-    # upstream fix (merged)
-    patch -Np1 -i ../0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
-
-}
-
-#----------------
-# BUILD CONTROL ]
-
-_flags=(
-    -Dipv6=true
-    -Dxvfb=true
-    -Dxnest=true
-    -Dxcsecurity=true
-    -Dxorg=true
-    -Dxephyr=true
-    -Dglamor=true
-    -Dudev=true
-    -Ddtrace=false
-    -Dsystemd_logind=false
-    -Dsuid_wrapper=true
-    -Dxkb_dir=/usr/share/X11/xkb
-    -Dxkb_output_dir=/var/lib/xkb
-    -D libunwind=true
-)
-
-#--------
-# BUILD ]
-
-build() {
-    ## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
-    ## With them, module fail to load with undefined symbol.
-    ## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
-    export CFLAGS=${CFLAGS/-fno-plt}
-    export CXXFLAGS=${CXXFLAGS/-fno-plt}
-    export LDFLAGS=${LDFLAGS/,-z,now}
-
-    arch-meson $pkgbase-$pkgver build "${_flags[@]}"
-
-    ## Print config
-    meson configure build
-    ninja -C build
-
-    ## fake installation to be seperated into packages
-    DESTDIR="$srcdir/fakeinstall" ninja -C build install
-}
-
-_install() {
-    local src f dir
-        for src; do
-            f="${src#fakeinstall/}"
-            dir="${pkgdir}/${f%/*}"
-            install -m755 -d "${dir}"
-            ## use copy so a new file is created and fakeroot
-            ## can track properties such as setuid.
-            cp -av "${src}" "${dir}/"
-            rm -rf "${src}"
-        done
-}
-
-package_xorg-server-common() {
-    pkgdesc='Xorg server common files'
-
-    depends=(
-        'xkeyboard-config'
-        'xorg-xkbcomp'
-        'xorg-setxkbmap'
-    )
-
-    _install fakeinstall/usr/lib/xorg/protocol.txt
-    _install fakeinstall/usr/share/man/man1/Xserver.1
-
-    install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server() {
-    pkgdesc="Xorg X server"
-
-    depends=(
-        'libepoxy'
-        'libxfont2'
-        'pixman'
-        'xorg-server-common'
-        'libunwind'
-        'dbus'
-        'libgl'
-        'xf86-input-libinput'
-        'nettle'
-        'libpciaccess'
-        'libdrm'
-        'libxshmfence'
-        'libxcvt'
-    )   ## FS#52949
-
-    ## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
-    ## we provide major numbers that drivers can depend on
-    ## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-    provides=(
-        'X-ABI-VIDEODRV_VERSION=25.2'
-        'X-ABI-XINPUT_VERSION=24.4'
-        'X-ABI-EXTENSION_VERSION=10.0'
-        'x-server'
-    )
-    conflicts=(
-        'nvidia-utils<=331.20'
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-    replaces=(
-        'glamor-egl'
-        'xf86-video-modesetting'
-    )
-
-    install=xorg-server.install
-
-    _install fakeinstall/usr/bin/{X,Xorg,gtf}
-    _install fakeinstall/usr/lib/Xorg{,.wrap}
-    _install fakeinstall/usr/lib/xorg/modules/*
-    _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
-    _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
-    _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
-    _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
-
-    ## distro specific files must be installed in /usr/share/X11/xorg.conf.d
-    install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
-
-    ## Xwrapper.config
-    install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xephyr() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libgl'
-        'libepoxy'
-        'libunwind'
-        'libxv'
-        'pixman'
-        'xorg-server-common'
-        'xcb-util-image'
-        'xcb-util-renderutil'
-        'xcb-util-wm'
-        'xcb-util-keysyms'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xephyr
-    _install fakeinstall/usr/share/man/man1/Xephyr.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xvfb() {
-    pkgdesc="Virtual framebuffer X server"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'pixman'
-        'xorg-server-common'
-        'xorg-xauth'
-        'libgl'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xvfb
-    _install fakeinstall/usr/share/man/man1/Xvfb.1
-
-    install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
-    install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-xnest() {
-    pkgdesc="A nested X server that runs as an X application"
-
-    depends=(
-        'libxfont2'
-        'libunwind'
-        'libxext'
-        'pixman'
-        'xorg-server-common'
-        'nettle'
-        'libtirpc'
-    )
-
-    _install fakeinstall/usr/bin/Xnest
-    _install fakeinstall/usr/share/man/man1/Xnest.1
-
-    ## license
-    install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
-}
-
-package_xorg-server-devel() {
-    pkgdesc="Development files for the X.Org X server"
-
-    depends=(
-        'xorgproto'
-        'mesa'
-        'libpciaccess'
-        'xorg-util-macros'
-    )   ## not technically required but almost every Xorg pkg needs it to build.
-
-    _install fakeinstall/usr/include/xorg/*
-    _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
-    _install fakeinstall/usr/share/aclocal/xorg-server.m4
-
-    ## license
-    install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
-
-    ## make sure there are no files left to install
-    find fakeinstall -depth -print0 | xargs -0 rmdir
-}
-
-#---------------------------
-# LICENSE AND VERIFICATION ]
-
-arch=(x86_64)
-license=(custom)
-
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF'  # Peter Hutterer (Who-T) <office@who-t.net>
-              '67DC86F2623FC5FD4BB5225D14706DBE1E4B4540'  # Olivier Fourdan <fourdan@xfce.org>
-              'FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
-
-sha256sums=('38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152'
-            'SKIP'
-            '057004ab36d4733e6c275f76bbc3851f6cdb9063305a3ae874f2fd83f14a6dc0'
-            'c438039adbb219f62591d6646791c7aaa1e1c0f9371a01372f81e26295c9724d'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '31367963ef65207cd01f1a352992f0d49d78cad7883732cd6a700f681b174b5a'
-            '1e02dbcce066746acb5de54c816add1d26349ff16b5f1833b6ab48f3b3a8e634')
diff --git a/version/21.1.8-3/Xwrapper.config b/version/21.1.8-3/Xwrapper.config
deleted file mode 100644
index 8cbb26160587d772efae70ce78f328969d353267..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/Xwrapper.config
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/X11/Xwrapper.config
-
-needs_root_rights = yes
diff --git a/version/21.1.8-3/xephyr_Dont_check_for_SeatId_anymore.patch b/version/21.1.8-3/xephyr_Dont_check_for_SeatId_anymore.patch
deleted file mode 100644
index f0158bfe1ad3354da0ff62d6aebcefd748ae741f..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/xephyr_Dont_check_for_SeatId_anymore.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Tue, 11 Jan 2022 18:41:42 -0500
-Subject: [PATCH] xephyr: Don't check for SeatId anymore
-
-After a change for the xserver to automatically determine the seat
-based on the XDG_SEAT variable, xephyr stopped working. This was
-because of an old feature where xephyr used to handle evdev
-directly. This was dropped some time ago, and now this check is
-not needed
----
- hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
-index 020461db2..09cd28cb3 100644
---- a/hw/kdrive/ephyr/ephyrinit.c
-+++ b/hw/kdrive/ephyr/ephyrinit.c
-@@ -70,25 +70,23 @@ InitInput(int argc, char **argv)
-     KdKeyboardInfo *ki;
-     KdPointerInfo *pi;
- 
--    if (!SeatId) {
--        KdAddKeyboardDriver(&EphyrKeyboardDriver);
--        KdAddPointerDriver(&EphyrMouseDriver);
--
--        if (!kdHasKbd) {
--            ki = KdNewKeyboard();
--            if (!ki)
--                FatalError("Couldn't create Xephyr keyboard\n");
--            ki->driver = &EphyrKeyboardDriver;
--            KdAddKeyboard(ki);
--        }
-+    KdAddKeyboardDriver(&EphyrKeyboardDriver);
-+    KdAddPointerDriver(&EphyrMouseDriver);
-+
-+    if (!kdHasKbd) {
-+        ki = KdNewKeyboard();
-+        if (!ki)
-+            FatalError("Couldn't create Xephyr keyboard\n");
-+        ki->driver = &EphyrKeyboardDriver;
-+        KdAddKeyboard(ki);
-+    }
- 
--        if (!kdHasPointer) {
--            pi = KdNewPointer();
--            if (!pi)
--                FatalError("Couldn't create Xephyr pointer\n");
--            pi->driver = &EphyrMouseDriver;
--            KdAddPointer(pi);
--        }
-+    if (!kdHasPointer) {
-+        pi = KdNewPointer();
-+        if (!pi)
-+            FatalError("Couldn't create Xephyr pointer\n");
-+        pi->driver = &EphyrMouseDriver;
-+        KdAddPointer(pi);
-     }
- 
-     KdInitInput();
--- 
-GitLab
-
diff --git a/version/21.1.8-3/xorg-server.install b/version/21.1.8-3/xorg-server.install
deleted file mode 100644
index 53ee4d2777937c665a281828fdca28a2112551af..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/xorg-server.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-
-    ## suid permission is not preserved during _install execution, fix it.
-    cat <<MSG
->>> Applying 4755 mode to /usr/lib/Xorg.wrag
-MSG
-    chmod u+s /usr/lib/Xorg.wrap
-
-    cat <<MSG
->>> Xorg-server has now the ability to run without root rights.
-    To be able to use this features, install the package:
-    xorg-server-rootless.
-
-$(tput setaf 3)>>> WARNING: $(tput sgr0)
-    The file /etc/X11/Xwrapper.config,
-    need to be present on your system containing this line :
-
-    needs_root_rights = yes
-
-    See xorg.wrap man page (man xorg.wrap) for futher informations.
-MSG
-}
-
-post_upgrade() {
-        post_install
-}
diff --git a/version/21.1.8-3/xvfb-run b/version/21.1.8-3/xvfb-run
deleted file mode 100644
index 8ed9254fb6f86d51ab656c04a125d305b7a5b973..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/xvfb-run
+++ /dev/null
@@ -1,200 +0,0 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# T2 SDE: package/.../xorg-server/xvfb-run.sh
-# Copyright (C) 2005 The T2 SDE Project
-# Copyright (C) XXXX - 2005 Debian
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-# $Id$
-# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x24"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num (deprecated, use --auto-display
-                                    instead)
--d        --auto-display            use the X server to find a display number
-                                    automatically
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -d|--auto-display) AUTO_DISPLAY=1 ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! type xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# Set up the temp dir for the pid and X authorization file
-XVFB_RUN_TMPDIR="$(mktemp --directory --tmpdir $PROGNAME.XXXXXX)"
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    AUTHFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXX)
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-
-if [ -z "$AUTO_DISPLAY" ]; then
-  # Old style using a pre-computed SERVERNUM
-  XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-  XVFBPID=$!
-else
-  # New style using Xvfb to provide a free display
-  PIDFILE=$(mktemp -p "$XVFB_RUN_TMPDIR" pid.XXXXXX)
-  SERVERNUM=$(XAUTHORITY=$AUTHFILE Xvfb -displayfd 1 $XVFBARGS $LISTENTCP \
-  2>"$ERRORFILE" & echo $! > $PIDFILE)
-  XVFBPID=$(cat $PIDFILE)
-fi
-sleep "$STARTWAIT"
-
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@"
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Clean up.
-XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1
-if [ -n "$XVFB_RUN_TMPDIR" ]; then
-    if ! rm -r "$XVFB_RUN_TMPDIR"; then
-        error "problem while cleaning up temporary directory"
-        exit 5
-    fi
-fi
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/version/21.1.8-3/xvfb-run.1 b/version/21.1.8-3/xvfb-run.1
deleted file mode 100644
index 137d3a1967e5530e6fabb1086ffdfe903b41af48..0000000000000000000000000000000000000000
--- a/version/21.1.8-3/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/xorg-server b/xorg-server
new file mode 160000
index 0000000000000000000000000000000000000000..565a9db535a0245669f98f9acaff23032807fd03
--- /dev/null
+++ b/xorg-server
@@ -0,0 +1 @@
+Subproject commit 565a9db535a0245669f98f9acaff23032807fd03