upgpkg: xorg-server 1.20.0-2

6 files changed, 195 insertions, 1058 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce1b9e19e14c..a619f8dc4609 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,23 @@
 pkgbase = xorg-server-bug865
-	pkgver = 1.19.6+13+gd0d1a694f
-	pkgrel = 1
+	pkgver = 1.20.0
+	pkgrel = 2
 	url = http://xorg.freedesktop.org
 	arch = x86_64
 	groups = xorg
 	license = custom
+	makedepends = xorgproto
 	makedepends = pixman
 	makedepends = libx11
 	makedepends = mesa
 	makedepends = mesa-libgl
-	makedepends = xf86driproto
-	makedepends = xcmiscproto
 	makedepends = xtrans
-	makedepends = bigreqsproto
-	makedepends = randrproto
-	makedepends = inputproto
-	makedepends = fontsproto
-	makedepends = videoproto
-	makedepends = presentproto
-	makedepends = compositeproto
-	makedepends = recordproto
-	makedepends = scrnsaverproto
-	makedepends = resourceproto
-	makedepends = xineramaproto
 	makedepends = libxkbfile
 	makedepends = libxfont2
-	makedepends = renderproto
 	makedepends = libpciaccess
 	makedepends = libxv
-	makedepends = xf86dgaproto
 	makedepends = libxmu
 	makedepends = libxrender
 	makedepends = libxi
-	makedepends = dmxproto
 	makedepends = libxaw
 	makedepends = libdmx
 	makedepends = libxtst
@@ -40,23 +25,20 @@ pkgbase = xorg-server-bug865
 	makedepends = xorg-xkbcomp
 	makedepends = xorg-util-macros
 	makedepends = xorg-font-util
-	makedepends = glproto
-	makedepends = dri2proto
-	makedepends = libgcrypt
 	makedepends = libepoxy
 	makedepends = xcb-util
 	makedepends = xcb-util-image
 	makedepends = xcb-util-renderutil
 	makedepends = xcb-util-wm
 	makedepends = xcb-util-keysyms
-	makedepends = dri3proto
 	makedepends = libxshmfence
 	makedepends = libunwind
 	makedepends = systemd
 	makedepends = wayland-protocols
-	makedepends = git
-	source = git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=d0d1a694f967af770fba0d36043fd5218ff20984
-	source = nvidia-add-modulepath-support.patch
+	makedepends = meson
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.0.tar.bz2
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.0.tar.bz2.sig
+	source = xwayland-config.h.meson.in
 	source = xserver-autobind-hotplug.patch
 	source = xvfb-run
 	source = xvfb-run.1
@@ -65,12 +47,13 @@ pkgbase = xorg-server-bug865
 	validpgpkeys = C383B778255613DFDB409D91DB221A6900000011
 	validpgpkeys = DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3
 	validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2
-	sha256sums = SKIP
-	sha256sums = 914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8
-	sha256sums = fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57
-	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
-	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
-	sha256sums = 460615227a7e42d124639d4ae02e55d1b2a250c7bdf539e018b46de71230364f
+	sha512sums = 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
+	sha512sums = SKIP
+	sha512sums = 4ed2a66dd98697accef34f84d44490594bf071232fa74640d514a170f1fbe760b292a0b53fe47080b73acf6083cea57e35f11cfd42ba9dc211b8e8dcac343dfc
+	sha512sums = d84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22
+	sha512sums = 55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6
+	sha512sums = de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22
+	sha512sums = 81be7b0ecd9de850f0c740762d37c7489f12b34eb6adb19b3d3077f66d66e48e1206eff4bd29e50f5640509390a08fa138a4664b60d90878d4d17cb1f6919baf
 
 pkgname = xorg-server-bug865
 	pkgdesc = Xorg X server with the patch for freedesktop bug 865 (need to kick hotkeys on release, not press)
@@ -83,14 +66,15 @@ pkgname = xorg-server-bug865
 	depends = dbus
 	depends = libgl
 	depends = xf86-input-libinput
+	depends = nettle
 	depends = libpciaccess
 	depends = libdrm
 	depends = libxshmfence
-	provides = X-ABI-VIDEODRV_VERSION=23
+	provides = X-ABI-VIDEODRV_VERSION=24.0
 	provides = X-ABI-XINPUT_VERSION=24.1
 	provides = X-ABI-EXTENSION_VERSION=10.0
 	provides = x-server
-	provides = xorg-server=1.19.6
+	provides = xorg-server=1.20
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
 	conflicts = xf86-video-modesetting
diff --git a/PKGBUILD b/PKGBUILD
index 2a3975564613..26adbe4976d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,56 +4,55 @@
 
 pkgbase=xorg-server-bug865
 pkgname=xorg-server-bug865
-pkgver=1.19.6+13+gd0d1a694f
-pkgrel=1
+pkgver=1.20.0
+pkgrel=2
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
-             'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
-             'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv'
-             'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres'
-             'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
-             'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
-             'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git')
-_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19
-#source=(https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
-source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit"
-        nvidia-add-modulepath-support.patch
+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' 'systemd' 'wayland-protocols' 'meson') # 'git')
+#_commit=d0d1a694f967af770fba0d36043fd5218ff20984 # branch 1.19
+
+#source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#commit=$_commit"
+source=(https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2{,.sig}
+        xwayland-config.h.meson.in # missing from tarball
         xserver-autobind-hotplug.patch
-        xvfb-run
+        xvfb-run # with updates from FC master
         xvfb-run.1
         freedesktop-bug-865.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011'
-	      'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
-	      '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
-sha256sums=('SKIP'
-            '914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8'
-            'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '460615227a7e42d124639d4ae02e55d1b2a250c7bdf539e018b46de71230364f')
-
-pkgver() {
-  cd xserver
-  git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g'
-}
+              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
+              '995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
+sha512sums=('1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde'
+            'SKIP'
+            '4ed2a66dd98697accef34f84d44490594bf071232fa74640d514a170f1fbe760b292a0b53fe47080b73acf6083cea57e35f11cfd42ba9dc211b8e8dcac343dfc'
+            'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
+            '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
+            'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
+	    '81be7b0ecd9de850f0c740762d37c7489f12b34eb6adb19b3d3077f66d66e48e1206eff4bd29e50f5640509390a08fa138a4664b60d90878d4d17cb1f6919baf')    
+
+#pkgver() {
+#  cd xserver
+#  git describe --tags | sed 's/^xorg-server-//;s/_/./g;s/-/+/g'
+#}
 
 prepare() {
-  cd xserver
-  #cd "${pkgbase}-${pkgver}"
+  cp xwayland-config.h.meson.in xorg-server-${pkgver}/include/
+
+  #cd xserver
+  cd "xorg-server-${pkgver}"
 
-  # merged upstream in trunk
-  patch -Np1 -i ../nvidia-add-modulepath-support.patch
   # patch from Fedora, not yet merged
   patch -Np1 -i ../xserver-autobind-hotplug.patch
 
   # The patch for freedesktop bug 865
   patch -Np1 -i "${srcdir}/freedesktop-bug-865.patch"
-
-  autoreconf -vfi
 }
 
 build() {
@@ -64,81 +63,67 @@ build() {
   export CXXFLAGS=${CXXFLAGS/-fno-plt}
   export LDFLAGS=${LDFLAGS/,-z,now}
 
-  cd xserver
-#  cd "xorg-server-${pkgver}"
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --enable-dri \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-libunwind \
-      --enable-xorg \
-      --enable-xephyr \
-      --enable-glamor \
-      --enable-xwayland \
-      --enable-kdrive \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-config-udev \
-      --enable-systemd-logind \
-      --enable-suid-wrapper \
-      --disable-install-setuid \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --libexecdir=/usr/lib/xorg-server \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts \
-      --with-sha1=libgcrypt
-      
-#      --without-dtrace \
-#      --disable-linux-acpi --disable-linux-apm \
-
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \
-      -i hw/Makefile
+  arch-meson xorg-server-$pkgver build \
+    -D os_vendor="Arch Linux" \
+    -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 glamor=true \
+    -D udev=true \
+    -D systemd_logind=true \
+    -D suid_wrapper=true \
+    -D xkb_dir=/usr/share/X11/xkb \
+    -D xkb_output_dir=/var/lib/xkb
+     
+#     -D xwayland_eglstream=true \ # requires weston-eglstream from AUR
+
+  # 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-bug865() {
   pkgdesc="Xorg X server with the patch for freedesktop bug 865 (need to kick hotkeys on release, not press)"
-  depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput
+  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=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server=1.19.6')
+  provides=('X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server=1.20')
   conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server.install
 
-  cd xserver
-#  cd "xorg-server-${pkgver}"
-  make DESTDIR="${pkgdir}" 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.gz
+  _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4.gz
+  _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5.gz
 
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
 
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
+  # license
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "xorg-server-${pkgver}"/COPYING
 }
diff --git a/nvidia-add-modulepath-support.patch b/nvidia-add-modulepath-support.patch
deleted file mode 100644
index 584b91c0f11e..000000000000
--- a/nvidia-add-modulepath-support.patch
+++ /dev/null
@@ -1,851 +0,0 @@
-From c17e544b271ced65483692103d39ed1188d4ca25 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 27 Sep 2016 14:30:10 +0200
-Subject: [PATCH xserver v2 5/7] xfree86: Remove redundant ServerIsNotSeat0
- check from xf86CallDriverProbe
-
-If foundScreen is TRUE, then all the code below the removed if
-will not execute until we reach the return foundScreen; at the
-end, so this entire if block is redundant.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Bus.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
-index 5b93940..27c6b1b 100644
---- a/hw/xfree86/common/xf86Bus.c
-+++ b/hw/xfree86/common/xf86Bus.c
-@@ -82,8 +82,6 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
-     if (!xf86DoConfigure && drv->platformProbe != NULL) {
-         foundScreen = xf86platformProbeDev(drv);
-     }
--    if (ServerIsNotSeat0() && foundScreen)
--        return foundScreen;
- #endif
- 
- #ifdef XSERVER_LIBPCIACCESS
--- 
-2.9.3
-
-From 74bc0fff3a6ca233e56b3fb2971bca97b5a4f8b5 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 30 Sep 2016 11:59:04 +0200
-Subject: [PATCH xserver v2 6/7] xfree86: Make adding unclaimed devices as GPU
- devices a separate step
-
-This is primarily a preparation patch for fixing the xserver exiting with
-a "no screens found" error even though there are supported video cards,
-due to the server not recognizing any card as the primary card.
-
-This also fixes the (mostly theoretical) case of a platformBus capable
-driver adding a device as GPUscreen before a driver which only supports
-the old PCI probe method gets a chance to claim it as a normal screen.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Bus.c         |  4 ++++
- hw/xfree86/common/xf86platformBus.c | 15 +++++++++++++++
- hw/xfree86/common/xf86platformBus.h |  6 ++++++
- 3 files changed, 25 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
-index 27c6b1b..a3a9898 100644
---- a/hw/xfree86/common/xf86Bus.c
-+++ b/hw/xfree86/common/xf86Bus.c
-@@ -125,6 +125,10 @@ xf86BusConfig(void)
-         xf86CallDriverProbe(xf86DriverList[i], FALSE);
-     }
- 
-+    for (i = 0; i < xf86NumDrivers; i++) {
-+        xf86platformAddGPUDevices(xf86DriverList[i]);
-+    }
-+
-     /* If nothing was detected, return now */
-     if (xf86NumScreens == 0) {
-         xf86Msg(X_ERROR, "No devices detected.\n");
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 39fb1dd..8dd0d5d 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -475,6 +475,21 @@ xf86platformProbeDev(DriverPtr drvp)
-                                         isGPUDevice(devList[i]) ? PLATFORM_PROBE_GPU_SCREEN : 0);
-     }
- 
-+    return foundScreen;
-+}
-+
-+int
-+xf86platformAddGPUDevices(DriverPtr drvp)
-+{
-+    Bool foundScreen = FALSE;
-+    GDevPtr *devList;
-+    int j;
-+
-+    if (!drvp->platformProbe)
-+        return FALSE;
-+
-+    xf86MatchDevice(drvp->driverName, &devList);
-+
-     /* if autoaddgpu devices is enabled then go find any unclaimed platform
-      * devices and add them as GPU screens */
-     if (xf86Info.autoAddGPU) {
-diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h
-index a7335b9..0f5c0ef 100644
---- a/hw/xfree86/common/xf86platformBus.h
-+++ b/hw/xfree86/common/xf86platformBus.h
-@@ -41,6 +41,7 @@ struct xf86_platform_device {
- #ifdef XSERVER_PLATFORM_BUS
- int xf86platformProbe(void);
- int xf86platformProbeDev(DriverPtr drvp);
-+int xf86platformAddGPUDevices(DriverPtr drvp);
- 
- extern int xf86_num_platform_devices;
- extern struct xf86_platform_device *xf86_platform_devices;
-@@ -156,6 +157,11 @@ xf86PlatformMatchDriver(char *matches[], int nmatches);
- 
- extern void xf86platformVTProbe(void);
- extern void xf86platformPrimary(void);
-+
-+#else
-+
-+static inline int xf86platformAddGPUDevices(DriverPtr drvp) { return FALSE; }
-+
- #endif
- 
- #endif
--- 
-2.9.3
-
-From 02bcb6f189c4ad8b2e73ce99cfa3c10f0c244a88 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 30 Sep 2016 12:29:09 +0200
-Subject: [PATCH xserver v2 7/7] xfree86: Try harder to find atleast 1 non GPU
- Screen
-
-If we did not find any non GPU Screens, try again ignoring the notion
-of any video devices being the primary device. This fixes Xorg exiting
-with a "no screens found" error when using virtio-vga in a
-virtual-machine and when using a device driven by simpledrm.
-
-This is a somewhat ugly solution, but it is the best I can come up with
-without major surgery to the bus and probe code.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86.h            |  1 +
- hw/xfree86/common/xf86Bus.c         | 26 +++++++++++++++++++++++---
- hw/xfree86/common/xf86Globals.c     |  1 +
- hw/xfree86/common/xf86pciBus.c      |  4 ++++
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- 5 files changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
-index e54c811..f724688 100644
---- a/hw/xfree86/common/xf86.h
-+++ b/hw/xfree86/common/xf86.h
-@@ -55,6 +55,7 @@
- extern _X_EXPORT int xf86DoConfigure;
- extern _X_EXPORT int xf86DoShowOptions;
- extern _X_EXPORT Bool xf86DoConfigurePass1;
-+extern _X_EXPORT Bool xf86ProbeIgnorePrimary;
- extern _X_EXPORT Bool xorgHWAccess;
- 
- extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;
-diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
-index a3a9898..9836803 100644
---- a/hw/xfree86/common/xf86Bus.c
-+++ b/hw/xfree86/common/xf86Bus.c
-@@ -117,14 +117,34 @@ xf86BusConfig(void)
-     int i, j;
- 
-     /*
--     * Now call each of the Probe functions.  Each successful probe will
--     * result in an extra entry added to the xf86Screens[] list for each
--     * instance of the hardware found.
-+     * 3 step probe to (hopefully) ensure that we always find at least 1
-+     * (non GPU) screen:
-+     *
-+     * 1. Call each drivers probe function normally,
-+     *    Each successful probe will result in an extra entry added to the
-+     *    xf86Screens[] list for each instance of the hardware found.
-      */
-     for (i = 0; i < xf86NumDrivers; i++) {
-         xf86CallDriverProbe(xf86DriverList[i], FALSE);
-     }
- 
-+    /*
-+     * 2. If no Screens were found, call each drivers probe function with
-+     *    ignorePrimary = TRUE, to ensure that we do actually get a
-+     *    Screen if there is atleast one supported video card.
-+     */
-+    if (xf86NumScreens == 0) {
-+        xf86ProbeIgnorePrimary = TRUE;
-+        for (i = 0; i < xf86NumDrivers && xf86NumScreens == 0; i++) {
-+            xf86CallDriverProbe(xf86DriverList[i], FALSE);
-+        }
-+        xf86ProbeIgnorePrimary = FALSE;
-+    }
-+
-+    /*
-+     * 3. Call xf86platformAddGPUDevices() to add any additional video cards as
-+     *    GPUScreens (GPUScreens are only supported by platformBus drivers).
-+     */
-     for (i = 0; i < xf86NumDrivers; i++) {
-         xf86platformAddGPUDevices(xf86DriverList[i]);
-     }
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 07cfabf..e962b75 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -152,6 +152,7 @@ XF86ConfigPtr xf86configptr = NULL;
- Bool xf86Resetting = FALSE;
- Bool xf86Initialising = FALSE;
- Bool xf86DoConfigure = FALSE;
-+Bool xf86ProbeIgnorePrimary = FALSE;
- Bool xf86DoShowOptions = FALSE;
- DriverPtr *xf86DriverList = NULL;
- int xf86NumDrivers = 0;
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 8158c2b..9adfee5 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -352,6 +352,10 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func)
- Bool
- xf86IsPrimaryPci(struct pci_device *pPci)
- {
-+    /* Add max. 1 screen for the IgnorePrimary fallback path */
-+    if (xf86ProbeIgnorePrimary && xf86NumScreens == 0)
-+        return TRUE;
-+
-     if (primaryBus.type == BUS_PCI)
-         return pPci == primaryBus.id.pci;
- #ifdef XSERVER_PLATFORM_BUS
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 8dd0d5d..063e81c 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -114,6 +114,10 @@ xf86_find_platform_device_by_devnum(int major, int minor)
- static Bool
- xf86IsPrimaryPlatform(struct xf86_platform_device *plat)
- {
-+    /* Add max. 1 screen for the IgnorePrimary fallback path */
-+    if (xf86ProbeIgnorePrimary && xf86NumScreens == 0)
-+        return TRUE;
-+
-     if (primaryBus.type == BUS_PLATFORM)
-         return plat == primaryBus.id.plat;
- #ifdef XSERVER_LIBPCIACCESS
--- 
-2.9.3
-
-From c57c1e53ea3d76ebba5b2a23b7260817d3e6b921 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede@redhat.com>
-Date: Mon, 12 Dec 2016 17:03:12 +0100
-Subject: [PATCH xserver 1/6] xfree86: Free devlist returned by xf86MatchDevice
-
-xf86MatchDevice returns a dynamically allocated list of GDevPtr-s,
-free this when we're done with it.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86platformBus.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 063e81c..16d934f 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -479,6 +479,8 @@ xf86platformProbeDev(DriverPtr drvp)
-                                         isGPUDevice(devList[i]) ? PLATFORM_PROBE_GPU_SCREEN : 0);
-     }
- 
-+    free(devList);
-+
-     return foundScreen;
- }
- 
-@@ -505,6 +507,8 @@ xf86platformAddGPUDevices(DriverPtr drvp)
-         }
-     }
- 
-+    free(devList);
-+
-     return foundScreen;
- }
- 
--- 
-2.9.3
-
-From 08b84d72878e43401e99059c3c926dfa42a360c3 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede@redhat.com>
-Date: Mon, 12 Dec 2016 17:03:13 +0100
-Subject: [PATCH xserver 2/6] xfree86: Make OutputClassMatches take a
- xf86_platform_device
-
-Make OutputClassMatches directly take a xf86_platform_device as argument,
-rather then an index into xf86_platform_devices. This makes things
-easier for callers which already have a xf86_platform_device pointer.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86platformBus.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 16d934f..25a9040 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -214,9 +214,10 @@ MatchToken(const char *value, struct xorg_list *patterns,
- }
- 
- static Bool
--OutputClassMatches(const XF86ConfOutputClassPtr oclass, int index)
-+OutputClassMatches(const XF86ConfOutputClassPtr oclass,
-+                   struct xf86_platform_device *dev)
- {
--    char *driver = xf86_platform_odev_attributes(index)->driver;
-+    char *driver = dev->attribs->driver;
- 
-     if (!MatchToken(driver, &oclass->match_driver, strcmp))
-         return FALSE;
-@@ -234,7 +235,7 @@ xf86OutputClassDriverList(int index, char *matches[], int nmatches)
-         return 0;
- 
-     for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) {
--        if (OutputClassMatches(cl, index)) {
-+        if (OutputClassMatches(cl, &xf86_platform_devices[index])) {
-             char *path = xf86_platform_odev_attributes(index)->path;
- 
-             xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n",
--- 
-2.9.3
-
-From 9cd3cc75269d9196898487b5712ee47b8291e077 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede@redhat.com>
-Date: Mon, 12 Dec 2016 17:03:14 +0100
-Subject: [PATCH xserver 3/6] xfree86: Add options support for OutputClass
- Options
-
-Add support for setting options in OutputClass Sections and having these
-applied to any matching output devices.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Option.c      |  5 ++++-
- hw/xfree86/common/xf86platformBus.c | 42 +++++++++++++++++++++++++++++++++++++
- hw/xfree86/common/xf86platformBus.h |  2 ++
- hw/xfree86/man/xorg.conf.man        | 10 +++++++++
- hw/xfree86/parser/OutputClass.c     |  6 ++++++
- hw/xfree86/parser/xf86Parser.h      |  1 +
- 6 files changed, 65 insertions(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c
-index 0e8bc1f..929724d 100644
---- a/hw/xfree86/common/xf86Option.c
-+++ b/hw/xfree86/common/xf86Option.c
-@@ -44,6 +44,7 @@
- #include "xf86Xinput.h"
- #include "xf86Optrec.h"
- #include "xf86Parser.h"
-+#include "xf86platformBus.h" /* For OutputClass functions */
- #include "optionstr.h"
- 
- static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options,
-@@ -64,7 +65,7 @@ static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options,
-  *
-  * The order of precedence for options is:
-  *
-- *   extraOpts, display, confScreen, monitor, device
-+ *   extraOpts, display, confScreen, monitor, device, outputClassOptions
-  */
- 
- void
-@@ -79,6 +80,8 @@ xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts)
-     pScrn->options = NULL;
- 
-     for (i = pScrn->numEntities - 1; i >= 0; i--) {
-+        xf86MergeOutputClassOptions(pScrn->entityList[i], &pScrn->options);
-+
-         device = xf86GetDevFromEntity(pScrn->entityList[i],
-                                       pScrn->entityInstanceList[i]);
-         if (device && device->options) {
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 25a9040..a698c6c 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -310,6 +310,48 @@ xf86platformProbe(void)
-     return 0;
- }
- 
-+void
-+xf86MergeOutputClassOptions(int entityIndex, void **options)
-+{
-+    const EntityPtr entity = xf86Entities[entityIndex];
-+    struct xf86_platform_device *dev = NULL;
-+    XF86ConfOutputClassPtr cl;
-+    XF86OptionPtr classopts;
-+    int i = 0;
-+
-+    switch (entity->bus.type) {
-+    case BUS_PLATFORM:
-+        dev = entity->bus.id.plat;
-+        break;
-+    case BUS_PCI:
-+        for (i = 0; i < xf86_num_platform_devices; i++) {
-+            if (MATCH_PCI_DEVICES(xf86_platform_devices[i].pdev,
-+                                  entity->bus.id.pci)) {
-+                dev = &xf86_platform_devices[i];
-+                break;
-+            }
-+        }
-+        break;
-+    default:
-+        xf86Msg(X_DEBUG, "xf86MergeOutputClassOptions unsupported bus type %d\n",
-+                entity->bus.type);
-+    }
-+
-+    if (!dev)
-+        return;
-+
-+    for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) {
-+        if (!OutputClassMatches(cl, dev) || !cl->option_lst)
-+            continue;
-+
-+        xf86Msg(X_INFO, "Applying OutputClass \"%s\" options to %s\n",
-+                cl->identifier, dev->attribs->path);
-+
-+        classopts = xf86optionListDup(cl->option_lst);
-+        *options = xf86optionListMerge(*options, classopts);
-+    }
-+}
-+
- static int
- xf86ClaimPlatformSlot(struct xf86_platform_device * d, DriverPtr drvp,
-                   int chipset, GDevPtr dev, Bool active)
-diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h
-index 0f5c0ef..70d9ec8 100644
---- a/hw/xfree86/common/xf86platformBus.h
-+++ b/hw/xfree86/common/xf86platformBus.h
-@@ -42,6 +42,7 @@ struct xf86_platform_device {
- int xf86platformProbe(void);
- int xf86platformProbeDev(DriverPtr drvp);
- int xf86platformAddGPUDevices(DriverPtr drvp);
-+void xf86MergeOutputClassOptions(int entityIndex, void **options);
- 
- extern int xf86_num_platform_devices;
- extern struct xf86_platform_device *xf86_platform_devices;
-@@ -161,6 +162,7 @@ extern void xf86platformPrimary(void);
- #else
- 
- static inline int xf86platformAddGPUDevices(DriverPtr drvp) { return FALSE; }
-+static inline void xf86MergeOutputClassOptions(int index, void **options) {}
- 
- #endif
- 
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 7d0c524..8928a53 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -1280,6 +1280,16 @@ For example:
- Check the case-sensitive string
- .RI \*q matchdriver \*q
- against the kernel driver of the device.
-+.PP
-+When an output device has been matched to the
-+.B OutputClass
-+section, any
-+.B Option
-+entries are applied to the device. See the
-+.B Device
-+section below for a description of the remaining
-+.B Option
-+entries.
- .SH "DEVICE SECTION"
- The config file may have multiple
- .B Device
-diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c
-index 8064e0c..f813ee6 100644
---- a/hw/xfree86/parser/OutputClass.c
-+++ b/hw/xfree86/parser/OutputClass.c
-@@ -36,6 +36,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = {
-     {ENDSECTION, "endsection"},
-     {IDENTIFIER, "identifier"},
-     {DRIVER, "driver"},
-+    {OPTION, "option"},
-     {MATCH_DRIVER, "matchdriver"},
-     {-1, ""},
- };
-@@ -60,6 +61,8 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr)
-             free(group);
-         }
- 
-+        xf86optionListFree(ptr->option_lst);
-+
-         prev = ptr;
-         ptr = ptr->list.next;
-         free(prev);
-@@ -112,6 +115,9 @@ xf86parseOutputClassSection(void)
-             else
-                 ptr->driver = xf86_lex_val.str;
-             break;
-+        case OPTION:
-+            ptr->option_lst = xf86parseOption(ptr->option_lst);
-+            break;
-         case MATCH_DRIVER:
-             if (xf86getSubToken(&(ptr->comment)) != STRING)
-                 Error(QUOTE_MSG, "MatchDriver");
-diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
-index 9c4b403..897edab 100644
---- a/hw/xfree86/parser/xf86Parser.h
-+++ b/hw/xfree86/parser/xf86Parser.h
-@@ -338,6 +338,7 @@ typedef struct {
-     char *identifier;
-     char *driver;
-     struct xorg_list match_driver;
-+    XF86OptionPtr option_lst;
-     char *comment;
- } XF86ConfOutputClassRec, *XF86ConfOutputClassPtr;
- 
--- 
-2.9.3
-
-From ab1a65b7755d081b41188104b21f4d21eaa3187b Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede@redhat.com>
-Date: Mon, 12 Dec 2016 17:03:15 +0100
-Subject: [PATCH xserver 4/6] xfree86: xf86platformProbe: split finding
- pci-info and setting primary GPU
-
-This is a preparation patch for allowing an OutputClass section to
-override the default primary GPU device selection.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86platformBus.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index a698c6c..39b3248 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -145,16 +145,9 @@ platform_find_pci_info(struct xf86_platform_device *pd, char *busid)
- 
-     iter = pci_slot_match_iterator_create(&devmatch);
-     info = pci_device_next(iter);
--    if (info) {
-+    if (info)
-         pd->pdev = info;
--        pci_device_probe(info);
--        if (pci_device_is_boot_vga(info)) {
--            primaryBus.type = BUS_PLATFORM;
--            primaryBus.id.plat = pd;
--        }
--    }
-     pci_iterator_destroy(iter);
--
- }
- 
- static Bool
-@@ -307,6 +300,20 @@ xf86platformProbe(void)
-             platform_find_pci_info(&xf86_platform_devices[i], busid);
-         }
-     }
-+
-+    for (i = 0; i < xf86_num_platform_devices; i++) {
-+        struct xf86_platform_device *dev = &xf86_platform_devices[i];
-+
-+        if (!dev->pdev)
-+            continue;
-+
-+        pci_device_probe(dev->pdev);
-+        if (pci_device_is_boot_vga(dev->pdev)) {
-+            primaryBus.type = BUS_PLATFORM;
-+            primaryBus.id.plat = dev;
-+        }
-+    }
-+
-     return 0;
- }
- 
--- 
-2.9.3
-
-From d75ffcdbf8c1e3c8e0d46debcd533a9f2560f0a8 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede@redhat.com>
-Date: Mon, 12 Dec 2016 17:03:16 +0100
-Subject: [PATCH xserver 5/6] xfree86: Allow overriding primary GPU detection
- from an OutputClass section
-
-Allow using:
-
-Option "PrimaryGPU" "yes"
-
-In an OutputClass section to override the default primary GPU device
-selection which selects the GPU used as output by the firmware.
-
-If multiple output devices match an OutputClass section with
-the PrimaryGPU option set, the first one enumerated becomes the
-primary GPU.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86platformBus.c | 19 +++++++++++++++++++
- hw/xfree86/man/xorg.conf.man        | 12 +++++++++++-
- 2 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 39b3248..fc17d15 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -286,6 +286,7 @@ xf86platformProbe(void)
- {
-     int i;
-     Bool pci = TRUE;
-+    XF86ConfOutputClassPtr cl;
- 
-     config_odev_probe(xf86PlatformDeviceProbe);
- 
-@@ -301,6 +302,24 @@ xf86platformProbe(void)
-         }
-     }
- 
-+    /* First see if there is an OutputClass match marking a device as primary */
-+    for (i = 0; i < xf86_num_platform_devices; i++) {
-+        struct xf86_platform_device *dev = &xf86_platform_devices[i];
-+        for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) {
-+            if (!OutputClassMatches(cl, dev))
-+                continue;
-+
-+            if (xf86CheckBoolOption(cl->option_lst, "PrimaryGPU", FALSE)) {
-+                xf86Msg(X_CONFIG, "OutputClass \"%s\" setting %s as PrimaryGPU\n",
-+                        cl->identifier, dev->attribs->path);
-+                primaryBus.type = BUS_PLATFORM;
-+                primaryBus.id.plat = dev;
-+                return 0;
-+            }
-+        }
-+    }
-+
-+    /* Then check for pci_device_is_boot_vga() */
-     for (i = 0; i < xf86_num_platform_devices; i++) {
-         struct xf86_platform_device *dev = &xf86_platform_devices[i];
- 
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 8928a53..79b71a8 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -1285,11 +1285,21 @@ When an output device has been matched to the
- .B OutputClass
- section, any
- .B Option
--entries are applied to the device. See the
-+entries are applied to the device. One
-+.B OutputClass
-+specific
-+.B Option
-+is recognized. See the
- .B Device
- section below for a description of the remaining
- .B Option
- entries.
-+.TP 7
-+.BI "Option \*qPrimaryGPU\*q \*q" boolean \*q
-+This option specifies that the matched device should be treated as the
-+primary GPU, replacing the selection of the GPU used as output by the
-+firmware. If multiple output devices match an OutputClass section with
-+the PrimaryGPU option set, the first one enumerated becomes the primary GPU.
- .SH "DEVICE SECTION"
- The config file may have multiple
- .B Device
--- 
-2.9.3
-
-From b5dffbbac193aa640ffcfa0a431c21b862854e53 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede@redhat.com>
-Date: Mon, 12 Dec 2016 17:03:17 +0100
-Subject: [PATCH xserver 6/6] xfree86: Add ModulePath support for OutputClass
- config Sections
-
-Allow OutputClass config snippets to modify the module-path.
-
-Note that any specified ModulePaths will be pre-pended to the normal
-ModulePath. The idea behind this is that any output hardware specific
-modules should have preference over the normal modules.
-
-One use-case for this is the nvidia binary driver, this allows a
-config snippet like this:
-
-Section "OutputClass"
-    MatchDriver "nvidia"
-    Modulepath "/usr/lib64/nvidia/modules"
-EndSection
-
-To get the nvidia glx specific glx module loaded, but only when the
-nvidia kernel driver is loaded.
-
-Together with the glvnd work done recently, this allows the nouveau
-+ mesa and nvidia-binary userspace stacks to co-exist on the same
-system without any ldconfig / xorg.conf tweaking and the xserver will
-automatically do the right thing depending on which kernel driver
-(nouveau or nvidia) is loaded.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86platformBus.c | 23 +++++++++++++++++++++++
- hw/xfree86/loader/loadmod.c         |  1 +
- hw/xfree86/man/xorg.conf.man        | 16 ++++++++++++++++
- hw/xfree86/parser/OutputClass.c     | 15 +++++++++++++++
- hw/xfree86/parser/xf86Parser.h      |  1 +
- 5 files changed, 56 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index fc17d15..0b5795f 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -40,6 +40,7 @@
- #include "hotplug.h"
- #include "systemd-logind.h"
- 
-+#include "loaderProcs.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "xf86Priv.h"
-@@ -287,6 +288,7 @@ xf86platformProbe(void)
-     int i;
-     Bool pci = TRUE;
-     XF86ConfOutputClassPtr cl;
-+    char *old_path, *path = NULL;
- 
-     config_odev_probe(xf86PlatformDeviceProbe);
- 
-@@ -300,8 +302,29 @@ xf86platformProbe(void)
-         if (pci && (strncmp(busid, "pci:", 4) == 0)) {
-             platform_find_pci_info(&xf86_platform_devices[i], busid);
-         }
-+
-+        /*
-+         * Deal with OutputClass ModulePath directives, these must be
-+         * processed before we do any module loading.
-+         */
-+        for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) {
-+            if (!OutputClassMatches(cl, &xf86_platform_devices[i]))
-+                continue;
-+
-+            if (cl->modulepath && xf86ModPathFrom != X_CMDLINE) {
-+                old_path = path;
-+                XNFasprintf(&path, "%s,%s", cl->modulepath,
-+                            path ? path : xf86ModulePath);
-+                free(old_path);
-+                xf86Msg(X_CONFIG, "OutputClass \"%s\" ModulePath extended to \"%s\"\n",
-+                        cl->identifier, path);
-+                LoaderSetPath(path);
-+            }
-+        }
-     }
- 
-+    free(path);
-+
-     /* First see if there is an OutputClass match marking a device as primary */
-     for (i = 0; i < xf86_num_platform_devices; i++) {
-         struct xf86_platform_device *dev = &xf86_platform_devices[i];
-diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
-index 8bf6836..940f5fc 100644
---- a/hw/xfree86/loader/loadmod.c
-+++ b/hw/xfree86/loader/loadmod.c
-@@ -184,6 +184,7 @@ LoaderSetPath(const char *path)
-     if (!path)
-         return;
- 
-+    FreeStringList(defaultPathList);
-     defaultPathList = InitPathList(path);
- }
- 
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 79b71a8..00ebf56 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -1300,6 +1300,22 @@ This option specifies that the matched device should be treated as the
- primary GPU, replacing the selection of the GPU used as output by the
- firmware. If multiple output devices match an OutputClass section with
- the PrimaryGPU option set, the first one enumerated becomes the primary GPU.
-+.PP
-+A
-+.B OutputClass
-+Section may contain
-+.B ModulePath
-+entries. When an output device matches an
-+.B OutputClass
-+section, any
-+.B ModulePath
-+entries in that
-+.B OutputClass
-+are pre-pended to the search path for loadable Xorg server modules. See
-+.B ModulePath
-+in the
-+.B Files
-+section for more info.
- .SH "DEVICE SECTION"
- The config file may have multiple
- .B Device
-diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c
-index f813ee6..01b348f 100644
---- a/hw/xfree86/parser/OutputClass.c
-+++ b/hw/xfree86/parser/OutputClass.c
-@@ -36,6 +36,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = {
-     {ENDSECTION, "endsection"},
-     {IDENTIFIER, "identifier"},
-     {DRIVER, "driver"},
-+    {MODULEPATH, "modulepath"},
-     {OPTION, "option"},
-     {MATCH_DRIVER, "matchdriver"},
-     {-1, ""},
-@@ -53,6 +54,7 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr)
-         TestFree(ptr->identifier);
-         TestFree(ptr->comment);
-         TestFree(ptr->driver);
-+        TestFree(ptr->modulepath);
- 
-         xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, entry) {
-             xorg_list_del(&group->entry);
-@@ -115,6 +117,19 @@ xf86parseOutputClassSection(void)
-             else
-                 ptr->driver = xf86_lex_val.str;
-             break;
-+        case MODULEPATH:
-+            if (xf86getSubToken(&(ptr->comment)) != STRING)
-+                Error(QUOTE_MSG, "ModulePath");
-+            if (ptr->modulepath) {
-+                char *path;
-+                XNFasprintf(&path, "%s,%s", ptr->modulepath, xf86_lex_val.str);
-+                free(xf86_lex_val.str);
-+                free(ptr->modulepath);
-+                ptr->modulepath = path;
-+            } else {
-+                ptr->modulepath = xf86_lex_val.str;
-+            }
-+            break;
-         case OPTION:
-             ptr->option_lst = xf86parseOption(ptr->option_lst);
-             break;
-diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
-index 897edab..e014048 100644
---- a/hw/xfree86/parser/xf86Parser.h
-+++ b/hw/xfree86/parser/xf86Parser.h
-@@ -337,6 +337,7 @@ typedef struct {
-     GenericListRec list;
-     char *identifier;
-     char *driver;
-+    char *modulepath;
-     struct xorg_list match_driver;
-     XF86OptionPtr option_lst;
-     char *comment;
--- 
-2.9.3
-
diff --git a/xserver-autobind-hotplug.patch b/xserver-autobind-hotplug.patch
index 8025cbd87be9..86b96a23e4bf 100644
--- a/xserver-autobind-hotplug.patch
+++ b/xserver-autobind-hotplug.patch
@@ -1,7 +1,7 @@
-From 4471df41ea6e94834a2b10643ca7fcd69682d276 Mon Sep 17 00:00:00 2001
+From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied@redhat.com>
-Date: Fri, 17 Aug 2012 09:49:24 +1000
-Subject: [PATCH xserver v3] autobind GPUs to the screen
+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
@@ -35,15 +35,6 @@ 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>
 ---
-Changes in v2:
--Make the default enabled instead of installing a xorg.conf
- snippet which enables it unconditionally
-Changes in v3:
--Handle GPUScreen autoconfig in randr/rrprovider.c, looking at
- rrScrPriv->provider, rather then in hw/xfree86/modes/xf86Crtc.c
- looking at xf86CrtcConfig->provider. This fixes the autoconfig not
- working with the nvidia binary driver
----
  hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
  hw/xfree86/common/xf86Globals.c     |  2 ++
  hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
@@ -57,18 +48,18 @@ Changes in v3:
  10 files changed, 85 insertions(+)
 
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 21daf1a..df3ca50 100644
+index 2c1d335..d7d7c2e 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -719,6 +719,7 @@ typedef enum {
+@@ -643,6 +643,7 @@ typedef enum {
      FLAG_DRI2,
      FLAG_USE_SIGIO,
      FLAG_AUTO_ADD_GPU,
 +    FLAG_AUTO_BIND_GPU,
      FLAG_MAX_CLIENTS,
      FLAG_IGLX,
- } FlagValues;
-@@ -778,6 +779,8 @@ static OptionInfoRec FlagOptions[] = {
+     FLAG_DEBUG,
+@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
       {0}, FALSE},
      {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
       {0}, FALSE},
@@ -77,7 +68,7 @@ index 21daf1a..df3ca50 100644
      {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
       {0}, FALSE },
      {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -857,6 +860,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
      }
      xf86Msg(from, "%sutomatically adding GPU devices\n",
              xf86Info.autoAddGPU ? "A" : "Not a");
@@ -101,10 +92,10 @@ index 21daf1a..df3ca50 100644
       * 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 e962b75..0d1e31b 100644
+index e890f05..7b27b4c 100644
 --- a/hw/xfree86/common/xf86Globals.c
 +++ b/hw/xfree86/common/xf86Globals.c
-@@ -136,6 +136,7 @@ xf86InfoRec xf86Info = {
+@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
  #else
      .autoAddGPU = FALSE,
  #endif
@@ -112,7 +103,7 @@ index e962b75..0d1e31b 100644
  };
  
  const char *xf86ConfigFile = NULL;
-@@ -197,6 +198,7 @@ Bool xf86FlipPixels = FALSE;
+@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
  Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
  
  Bool xf86AllowMouseOpenFail = FALSE;
@@ -121,7 +112,7 @@ index e962b75..0d1e31b 100644
  #ifdef XF86VIDMODE
  Bool xf86VidModeDisabled = FALSE;
 diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index a544b65..b0cba3d 100644
+index ea42ec9..ec255b6 100644
 --- a/hw/xfree86/common/xf86Init.c
 +++ b/hw/xfree86/common/xf86Init.c
 @@ -76,6 +76,7 @@
@@ -130,12 +121,13 @@ index a544b65..b0cba3d 100644
  #include "xf86InPriv.h"
 +#include "xf86Crtc.h"
  #include "picturestr.h"
- 
- #include "xf86Bus.h"
-@@ -298,6 +299,19 @@ xf86PrivsElevated(void)
+ #include "randrstr.h"
+ #include "glxvndabi.h"
+@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
+     return PrivsElevated();
  }
  
- static void
++static void
 +xf86AutoConfigOutputDevices(void)
 +{
 +    int i;
@@ -148,11 +140,10 @@ index a544b65..b0cba3d 100644
 +                                      xf86ScrnToScreen(xf86Screens[0]));
 +}
 +
-+static void
- InstallSignalHandlers(void)
+ static void
+ TrapSignals(void)
  {
-     /*
-@@ -871,6 +885,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
      for (i = 0; i < xf86NumGPUScreens; i++)
          AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
  
@@ -161,7 +152,7 @@ index a544b65..b0cba3d 100644
      xf86VGAarbiterWrapFunctions();
      if (sigio_blocked)
          input_unlock();
-@@ -1389,6 +1405,10 @@ ddxProcessArgument(int argc, char **argv, int i)
+@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
          xf86Info.iglxFrom = X_CMDLINE;
          return 0;
      }
@@ -173,7 +164,7 @@ index a544b65..b0cba3d 100644
      /* OS-specific processing */
      return xf86ProcessArgument(argc, argv, i);
 diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index c1f8a18..9a3d0df 100644
+index 4fe2b5f..6566622 100644
 --- a/hw/xfree86/common/xf86Priv.h
 +++ b/hw/xfree86/common/xf86Priv.h
 @@ -46,6 +46,7 @@
@@ -185,22 +176,22 @@ index c1f8a18..9a3d0df 100644
  #ifdef XF86VIDMODE
  extern _X_EXPORT Bool xf86VidModeDisabled;
 diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index c29b3cc..4c5f54b 100644
+index 21c2e1f..6c71863 100644
 --- a/hw/xfree86/common/xf86Privstr.h
 +++ b/hw/xfree86/common/xf86Privstr.h
-@@ -102,6 +102,7 @@ typedef struct {
-     MessageType dri2From;
+@@ -98,6 +98,7 @@ typedef struct {
  
      Bool autoAddGPU;
+     const char *debug;
 +    Bool autoBindGPU;
  } xf86InfoRec, *xf86InfoPtr;
  
- #ifdef DPMSExtension
+ /* 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 063e81c..42789ca 100644
+index cef47da..913a324 100644
 --- a/hw/xfree86/common/xf86platformBus.c
 +++ b/hw/xfree86/common/xf86platformBus.c
-@@ -48,6 +48,7 @@
+@@ -49,6 +49,7 @@
  #include "Pci.h"
  #include "xf86platformBus.h"
  #include "xf86Config.h"
@@ -208,7 +199,7 @@ index 063e81c..42789ca 100644
  
  #include "randrstr.h"
  int platformSlotClaimed;
-@@ -579,6 +580,9 @@ xf86platformAddDevice(int index)
+@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
     }
     /* attach unbound to 0 protocol screen */
     AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
@@ -219,7 +210,7 @@ index 063e81c..42789ca 100644
     RRResourcesChanged(xf86Screens[0]->pScreen);
     RRTellChanged(xf86Screens[0]->pScreen);
 diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index def9bfc..8df6b7d 100644
+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
@@ -237,10 +228,10 @@ index def9bfc..8df6b7d 100644
  Disable Silken Mouse support.
  .TP 8
 diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 7d0c524..3e596e4 100644
+index 9589262..8d51e06 100644
 --- a/hw/xfree86/man/xorg.conf.man
 +++ b/hw/xfree86/man/xorg.conf.man
-@@ -673,6 +673,12 @@ Enabled by default.
+@@ -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
@@ -254,10 +245,10 @@ index 7d0c524..3e596e4 100644
  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 706e9a7..66999d5 100644
+index f94174b..092d726 100644
 --- a/randr/randrstr.h
 +++ b/randr/randrstr.h
-@@ -976,6 +976,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
+@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
  extern _X_EXPORT void
  RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
  
@@ -268,10 +259,10 @@ index 706e9a7..66999d5 100644
  
  extern _X_EXPORT void
 diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index f9df67e..abc5685 100644
+index e4bc2bf..e04c18f 100644
 --- a/randr/rrprovider.c
 +++ b/randr/rrprovider.c
-@@ -482,3 +482,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
+@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
  
      WriteEventsToClient(client, 1, (xEvent *) &pe);
  }
@@ -298,5 +289,5 @@ index f9df67e..abc5685 100644
 +        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
 +}
 -- 
-2.9.3
+2.16.2
 
diff --git a/xvfb-run b/xvfb-run
index 4c2f4e0d3a4d..9d088c1c28ec 100644
--- a/xvfb-run
+++ b/xvfb-run
@@ -1,6 +1,21 @@
 #!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
+# --- 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
@@ -16,7 +31,7 @@ SERVERNUM=99
 AUTHFILE=
 ERRORFILE=/dev/null
 STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
+XVFBARGS="-screen 0 640x480x24"
 LISTENTCP="-nolisten tcp"
 XAUTHPROTO=.
 
@@ -49,7 +64,10 @@ 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
+                                    --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
@@ -81,22 +99,9 @@ find_free_servernum() {
     echo $i
 }
 
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
 # Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
+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=$?
 
@@ -110,6 +115,7 @@ 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" ;;
@@ -136,34 +142,39 @@ if [ -z "$*" ]; then
     exit 2
 fi
 
-if ! which xauth >/dev/null; then
+if ! type xauth >/dev/null; then
     error "xauth command not found"
     exit 3
 fi
 
-# tidy up after ourselves
-trap clean_up EXIT
-
+# 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
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
+    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
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
 
 # Start the command and save its exit status.
 set +e
@@ -174,6 +185,15 @@ 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
 
diff --git a/xwayland-config.h.meson.in b/xwayland-config.h.meson.in
new file mode 100644
index 000000000000..6d37e8bf60a6
--- /dev/null
+++ b/xwayland-config.h.meson.in
@@ -0,0 +1,8 @@
+/* xwayland-config.h.meson.in: not at all generated */
+
+#pragma once
+
+#include <dix-config.h>
+
+/* Build glamor support for Xwayland */
+#mesondefine XWL_HAS_GLAMOR