[arch-commits] Commit in xorg-server/repos (18 files)

Laurent Carlier lcarlier at archlinux.org
Thu Jan 12 07:19:36 UTC 2017


    Date: Thursday, January 12, 2017 @ 07:19:35
  Author: lcarlier
Revision: 285708

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  xorg-server/repos/testing-i686/PKGBUILD
    (from rev 285707, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-i686/xorg-server.install
    (from rev 285707, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-i686/xvfb-run
    (from rev 285707, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-i686/xvfb-run.1
    (from rev 285707, xorg-server/trunk/xvfb-run.1)
  xorg-server/repos/testing-x86_64/PKGBUILD
    (from rev 285707, xorg-server/trunk/PKGBUILD)
  xorg-server/repos/testing-x86_64/xorg-server.install
    (from rev 285707, xorg-server/trunk/xorg-server.install)
  xorg-server/repos/testing-x86_64/xvfb-run
    (from rev 285707, xorg-server/trunk/xvfb-run)
  xorg-server/repos/testing-x86_64/xvfb-run.1
    (from rev 285707, xorg-server/trunk/xvfb-run.1)
Deleted:
  xorg-server/repos/testing-i686/PKGBUILD
  xorg-server/repos/testing-i686/git-fixes.diff
  xorg-server/repos/testing-i686/xorg-server.install
  xorg-server/repos/testing-i686/xvfb-run
  xorg-server/repos/testing-i686/xvfb-run.1
  xorg-server/repos/testing-x86_64/PKGBUILD
  xorg-server/repos/testing-x86_64/git-fixes.diff
  xorg-server/repos/testing-x86_64/xorg-server.install
  xorg-server/repos/testing-x86_64/xvfb-run
  xorg-server/repos/testing-x86_64/xvfb-run.1

------------------------------------+
 /PKGBUILD                          |  424 ++++++++++++++++++++
 /xorg-server.install               |   36 +
 /xvfb-run                          |  360 +++++++++++++++++
 /xvfb-run.1                        |  564 +++++++++++++++++++++++++++
 testing-i686/PKGBUILD              |  225 ----------
 testing-i686/git-fixes.diff        |  722 -----------------------------------
 testing-i686/xorg-server.install   |   18 
 testing-i686/xvfb-run              |  180 --------
 testing-i686/xvfb-run.1            |  282 -------------
 testing-x86_64/PKGBUILD            |  225 ----------
 testing-x86_64/git-fixes.diff      |  722 -----------------------------------
 testing-x86_64/xorg-server.install |   18 
 testing-x86_64/xvfb-run            |  180 --------
 testing-x86_64/xvfb-run.1          |  282 -------------
 14 files changed, 1384 insertions(+), 2854 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-i686/PKGBUILD	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,225 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.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.19.0
-pkgrel=6
-arch=('i686' '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')
-source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
-        xvfb-run
-        xvfb-run.1
-        git-fixes.diff)
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3'
-            'SKIP'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            'f0f18685a5894a4d30669fa0b74db8f29d869b57315d8a16e093010659a3299c')
-
-prepare() {
-  cd "${pkgbase}-${pkgver}"
-  # apply upstream fixes:
-  # Revert "damage: Make damageRegionProcessPending take a damage not a drawable"
-  # os: return 0 from check_timers if we touched any of them
-  # glamor: Trust eglGetPlatformDisplayEXT if it exists
-  # present: Only call present_flip_notify if vblank->queued == FALSE
-  # AttendClient of grab-pervious client should queue to saved_ready_clients
-  patch -Np1 -i ../git-fixes.diff
-}
-
-build() {
-  cd "${pkgbase}-${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
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc)
-
-  cd "${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput)
-
-  # 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')
-  conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
-  replaces=('glamor-egl' 'xf86-video-modesetting')
-  install=xorg-server.install
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  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"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common xcb-util-image
-           xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
-
-  cd "${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl)
-
-  cd "${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd)
-
-  cd "${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common)
-
-  cd "${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-xwayland() {
-  pkgdesc="run X clients under wayland"
-  depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common)
-
-  cd "${pkgbase}-${pkgver}/hw/xwayland"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto dri3proto xineramaproto libpciaccess
-           resourceproto scrnsaverproto presentproto
-           # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/usr/lib/xorg-server"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}

Copied: xorg-server/repos/testing-i686/PKGBUILD (from rev 285707, xorg-server/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,212 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.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.19.1
+pkgrel=1
+arch=('i686' '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')
+source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+        xvfb-run
+        xvfb-run.1)
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
+              'C383B778255613DFDB409D91DB221A6900000011'
+              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
+sha256sums=('79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb'
+            'SKIP'
+            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+
+build() {
+  cd "${pkgbase}-${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
+}
+
+package_xorg-server-common() {
+  pkgdesc="Xorg server common files"
+  depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc)
+
+  cd "${pkgbase}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
+  
+  make -C xkb DESTDIR="${pkgdir}" install-data
+
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
+  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
+
+  install -m755 -d "${pkgdir}/usr/lib/xorg"
+  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
+}
+
+package_xorg-server() {
+  pkgdesc="Xorg X server"
+  depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput)
+
+  # 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')
+  conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
+  replaces=('glamor-egl' 'xf86-video-modesetting')
+  install=xorg-server.install
+
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  # distro specific files must be installed in /usr/share/X11/xorg.conf.d
+  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+  
+  # Needed for non-mesa drivers, libgl will restore it
+  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
+     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
+
+  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"
+}
+
+package_xorg-server-xephyr() {
+  pkgdesc="A nested X server that runs as an X application"
+  depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common xcb-util-image
+           xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
+
+  cd "${pkgbase}-${pkgver}/hw/kdrive"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
+}
+
+package_xorg-server-xvfb() {
+  pkgdesc="Virtual framebuffer X server"
+  depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl)
+
+  cd "${pkgbase}-${pkgver}/hw/vfb"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
+  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
+}
+
+package_xorg-server-xnest() {
+  pkgdesc="A nested X server that runs as an X application"
+  depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd)
+
+  cd "${pkgbase}-${pkgver}/hw/xnest"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
+}
+
+package_xorg-server-xdmx() {
+  pkgdesc="Distributed Multihead X Server and utilities"
+  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common)
+
+  cd "${pkgbase}-${pkgver}/hw/dmx"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
+}
+
+package_xorg-server-xwayland() {
+  pkgdesc="run X clients under wayland"
+  depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common)
+
+  cd "${pkgbase}-${pkgver}/hw/xwayland"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
+}
+
+package_xorg-server-devel() {
+  pkgdesc="Development files for the X.Org X server"
+  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
+           xproto randrproto renderproto xextproto inputproto kbproto 
+           fontsproto pixman videoproto xf86driproto glproto 
+           mesa dri2proto dri3proto xineramaproto libpciaccess
+           resourceproto scrnsaverproto presentproto
+           # not technically required but almost every Xorg pkg needs it to build
+           xorg-util-macros)
+
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/bin"
+  rm -rf "${pkgdir}/usr/share/man"
+  rm -rf "${pkgdir}/usr/share/doc"
+  rm -rf "${pkgdir}/usr/share/X11"
+  rm -rf "${pkgdir}/usr/lib/xorg"
+  rm -rf "${pkgdir}/usr/lib/xorg-server"
+  rm -rf "${pkgdir}/var"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
+}

Deleted: testing-i686/git-fixes.diff
===================================================================
--- testing-i686/git-fixes.diff	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-i686/git-fixes.diff	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,722 +0,0 @@
-From d6da2086951693e047fdd22b0d21c539ea1bb1e1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Mon, 12 Dec 2016 13:08:17 -0500
-Subject: Revert "damage: Make damageRegionProcessPending take a damage not a
- drawable"
-
-The commit message makes the assertion that the code below damage is not
-allowed to change whether there's a damage monitor for the drawable.
-That turns out not to be the case! exa's mixed code, at least, will
-create and destroy a damage in PrepareAccess. The destroy path can then
-be catastrophic, as damageRegionProcessPending will attempt to
-RegionEmpty memory from the middle of a freed block.
-
-I'd wanted that invariant for performance, but faster isn't worth
-broken, so revert it. I think what exa's doing is reasonable, so the
-better way to improve performance for the unmonitored case is to either
-revisit dynamically wrapping into the GC, or inline damage into dix.
-
-This reverts commit 4e124203f2260daaf54155f4a05fe469733e0b97.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389886
-Signed-off-by: Adam Jackson <ajax at redhat.com>
-(cherry picked from commit 32e632e85894eddc3ace83f16f1e973b1be478fe)
-
-diff --git a/miext/damage/damage.c b/miext/damage/damage.c
-index 17c2abf..d6a3614 100644
---- a/miext/damage/damage.c
-+++ b/miext/damage/damage.c
-@@ -282,8 +282,10 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
- }
- 
- static void
--damageRegionProcessPending(DamagePtr pDamage)
-+damageRegionProcessPending(DrawablePtr pDrawable)
- {
-+    drawableDamage(pDrawable);
-+
-     for (; pDamage != NULL; pDamage = pDamage->pNext) {
-         if (pDamage->reportAfter) {
-             /* It's possible that there is only interest in postRendering reporting. */
-@@ -358,7 +360,6 @@ damageCreateGC(GCPtr pGC)
- 
- #define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \
-     damageGCPriv(pGC);  \
--    drawableDamage(pDrawable); \
-     const GCFuncs *oldFuncs = pGC->funcs; \
-     unwrap(pGCPriv, pGC, funcs);  \
-     unwrap(pGCPriv, pGC, ops); \
-@@ -456,7 +457,7 @@ damageDestroyClip(GCPtr pGC)
- #define BOX_NOT_EMPTY(box) \
-     (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))
- 
--#define checkGCDamage(d,g)	(d && \
-+#define checkGCDamage(d,g)	(getDrawableDamage(d) && \
- 				 (!g->pCompositeClip ||\
- 				  RegionNotEmpty(g->pCompositeClip)))
- 
-@@ -468,7 +469,8 @@ damageDestroyClip(GCPtr pGC)
-     if(box.y2 > extents->y2) box.y2 = extents->y2; \
-     }
- 
--#define checkPictureDamage(d, p) (d && RegionNotEmpty(p->pCompositeClip))
-+#define checkPictureDamage(p)	(getDrawableDamage(p->pDrawable) && \
-+				 RegionNotEmpty(p->pCompositeClip))
- 
- static void
- damageComposite(CARD8 op,
-@@ -485,9 +487,8 @@ damageComposite(CARD8 op,
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
- 
-     damageScrPriv(pScreen);
--    drawableDamage(pDst->pDrawable);
- 
--    if (checkPictureDamage(pDamage, pDst)) {
-+    if (checkPictureDamage(pDst)) {
-         BoxRec box;
- 
-         box.x1 = xDst + pDst->pDrawable->x;
-@@ -504,7 +505,7 @@ damageComposite(CARD8 op,
-                       pMask,
-                       pDst,
-                       xSrc, ySrc, xMask, yMask, xDst, yDst, width, height);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst->pDrawable);
-     wrap(pScrPriv, ps, Composite, damageComposite);
- }
- 
-@@ -520,9 +521,8 @@ damageGlyphs(CARD8 op,
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
- 
-     damageScrPriv(pScreen);
--    drawableDamage(pDst->pDrawable);
- 
--    if (checkPictureDamage(pDamage, pDst)) {
-+    if (checkPictureDamage(pDst)) {
-         int nlistTmp = nlist;
-         GlyphListPtr listTmp = list;
-         GlyphPtr *glyphsTmp = glyphs;
-@@ -567,7 +567,7 @@ damageGlyphs(CARD8 op,
-     }
-     unwrap(pScrPriv, ps, Glyphs);
-     (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst->pDrawable);
-     wrap(pScrPriv, ps, Glyphs, damageGlyphs);
- }
- 
-@@ -579,9 +579,8 @@ damageAddTraps(PicturePtr pPicture,
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
- 
-     damageScrPriv(pScreen);
--    drawableDamage(pPicture->pDrawable);
- 
--    if (checkPictureDamage(pDamage, pPicture)) {
-+    if (checkPictureDamage(pPicture)) {
-         BoxRec box;
-         int i;
-         int x, y;
-@@ -616,7 +615,7 @@ damageAddTraps(PicturePtr pPicture,
-     }
-     unwrap(pScrPriv, ps, AddTraps);
-     (*ps->AddTraps) (pPicture, x_off, y_off, ntrap, traps);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pPicture->pDrawable);
-     wrap(pScrPriv, ps, AddTraps, damageAddTraps);
- }
- 
-@@ -628,7 +627,7 @@ damageFillSpans(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         int nptTmp = npt;
-         DDXPointPtr pptTmp = ppt;
-         int *pwidthTmp = pwidth;
-@@ -664,7 +663,7 @@ damageFillSpans(DrawablePtr pDrawable,
- 
-     (*pGC->ops->FillSpans) (pDrawable, pGC, npt, ppt, pwidth, fSorted);
- 
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -676,7 +675,7 @@ damageSetSpans(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         DDXPointPtr pptTmp = ppt;
-         int *pwidthTmp = pwidth;
-         int nptTmp = npt;
-@@ -710,7 +709,7 @@ damageSetSpans(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->SetSpans) (pDrawable, pGC, pcharsrc, ppt, pwidth, npt, fSorted);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -722,7 +721,7 @@ damagePutImage(DrawablePtr pDrawable,
-                int y, int w, int h, int leftPad, int format, char *pImage)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
- 
-         box.x1 = x + pDrawable->x;
-@@ -736,7 +735,7 @@ damagePutImage(DrawablePtr pDrawable,
-     }
-     (*pGC->ops->PutImage) (pDrawable, pGC, depth, x, y, w, h,
-                            leftPad, format, pImage);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -750,7 +749,7 @@ damageCopyArea(DrawablePtr pSrc,
- 
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
- 
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDst, pGC)) {
-         BoxRec box;
- 
-         box.x1 = dstx + pDst->x;
-@@ -765,7 +764,7 @@ damageCopyArea(DrawablePtr pSrc,
- 
-     ret = (*pGC->ops->CopyArea) (pSrc, pDst,
-                                  pGC, srcx, srcy, width, height, dstx, dsty);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDst);
-     return ret;
- }
-@@ -783,7 +782,7 @@ damageCopyPlane(DrawablePtr pSrc,
- 
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
- 
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDst, pGC)) {
-         BoxRec box;
- 
-         box.x1 = dstx + pDst->x;
-@@ -799,7 +798,7 @@ damageCopyPlane(DrawablePtr pSrc,
-     ret = (*pGC->ops->CopyPlane) (pSrc, pDst,
-                                   pGC, srcx, srcy, width, height, dstx, dsty,
-                                   bitPlane);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDst);
-     return ret;
- }
-@@ -810,7 +809,7 @@ damagePolyPoint(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int nptTmp = npt;
-         xPoint *pptTmp = ppt;
-@@ -840,7 +839,7 @@ damagePolyPoint(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyPoint) (pDrawable, pGC, mode, npt, ppt);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -850,7 +849,7 @@ damagePolylines(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         int nptTmp = npt;
-         DDXPointPtr pptTmp = ppt;
-         BoxRec box;
-@@ -913,7 +912,7 @@ damagePolylines(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->Polylines) (pDrawable, pGC, mode, npt, ppt);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -922,7 +921,7 @@ damagePolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSeg, xSegment * pSeg)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nSeg && checkGCDamage(pDamage, pGC)) {
-+    if (nSeg && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int extra = pGC->lineWidth;
-         int nsegTmp = nSeg;
-@@ -992,7 +991,7 @@ damagePolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSeg, xSegment * pSeg)
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolySegment) (pDrawable, pGC, nSeg, pSeg);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1002,7 +1001,7 @@ damagePolyRectangle(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nRects && checkGCDamage(pDamage, pGC)) {
-+    if (nRects && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int offset1, offset2, offset3;
-         int nRectsTmp = nRects;
-@@ -1051,7 +1050,7 @@ damagePolyRectangle(DrawablePtr pDrawable,
-         }
-     }
-     (*pGC->ops->PolyRectangle) (pDrawable, pGC, nRects, pRects);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1060,7 +1059,7 @@ damagePolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nArcs && checkGCDamage(pDamage, pGC)) {
-+    if (nArcs && checkGCDamage(pDrawable, pGC)) {
-         int extra = pGC->lineWidth >> 1;
-         BoxRec box;
-         int nArcsTmp = nArcs;
-@@ -1098,7 +1097,7 @@ damagePolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyArc) (pDrawable, pGC, nArcs, pArcs);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1108,7 +1107,7 @@ damageFillPolygon(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt > 2 && checkGCDamage(pDamage, pGC)) {
-+    if (npt > 2 && checkGCDamage(pDrawable, pGC)) {
-         DDXPointPtr pptTmp = ppt;
-         int nptTmp = npt;
-         BoxRec box;
-@@ -1157,7 +1156,7 @@ damageFillPolygon(DrawablePtr pDrawable,
-     }
- 
-     (*pGC->ops->FillPolygon) (pDrawable, pGC, shape, mode, npt, ppt);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1166,7 +1165,7 @@ damagePolyFillRect(DrawablePtr pDrawable,
-                    GCPtr pGC, int nRects, xRectangle *pRects)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
--    if (nRects && checkGCDamage(pDamage, pGC)) {
-+    if (nRects && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         xRectangle *pRectsTmp = pRects;
-         int nRectsTmp = nRects;
-@@ -1193,7 +1192,7 @@ damagePolyFillRect(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyFillRect) (pDrawable, pGC, nRects, pRects);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1202,7 +1201,7 @@ damagePolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nArcs && checkGCDamage(pDamage, pGC)) {
-+    if (nArcs && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int nArcsTmp = nArcs;
-         xArc *pArcsTmp = pArcs;
-@@ -1229,7 +1228,7 @@ damagePolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyFillArc) (pDrawable, pGC, nArcs, pArcs);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1278,9 +1277,12 @@ damageDamageChars(DrawablePtr pDrawable,
- #define TT_IMAGE16 3
- 
- static void
--damageText(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned long count,
--           char *chars, FontEncoding fontEncoding, DamagePtr pDamage,
--           Bool textType)
-+damageText(DrawablePtr pDrawable,
-+           GCPtr pGC,
-+           int x,
-+           int y,
-+           unsigned long count,
-+           char *chars, FontEncoding fontEncoding, Bool textType)
- {
-     CharInfoPtr *charinfo;
-     unsigned long i;
-@@ -1289,7 +1291,7 @@ damageText(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned long count,
- 
-     imageblt = (textType == TT_IMAGE8) || (textType == TT_IMAGE16);
- 
--    if (!pDamage)
-+    if (!checkGCDamage(pDrawable, pGC))
-         return;
- 
-     charinfo = xallocarray(count, sizeof(CharInfoPtr));
-@@ -1314,9 +1316,9 @@ damagePolyText8(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit,
--               pDamage, TT_POLY8);
-+               TT_POLY8);
-     x = (*pGC->ops->PolyText8) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
-     return x;
- }
-@@ -1328,9 +1330,9 @@ damagePolyText16(DrawablePtr pDrawable,
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
-                FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
--               pDamage, TT_POLY16);
-+               TT_POLY16);
-     x = (*pGC->ops->PolyText16) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
-     return x;
- }
-@@ -1341,9 +1343,9 @@ damageImageText8(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit,
--               pDamage, TT_IMAGE8);
-+               TT_IMAGE8);
-     (*pGC->ops->ImageText8) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1354,9 +1356,9 @@ damageImageText16(DrawablePtr pDrawable,
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
-                FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
--               pDamage, TT_IMAGE16);
-+               TT_IMAGE16);
-     (*pGC->ops->ImageText16) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1371,7 +1373,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable,
-     damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
-                       nglyph, ppci, TRUE, pGC->subWindowMode);
-     (*pGC->ops->ImageGlyphBlt) (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1386,7 +1388,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable,
-     damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
-                       nglyph, ppci, FALSE, pGC->subWindowMode);
-     (*pGC->ops->PolyGlyphBlt) (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1396,7 +1398,7 @@ damagePushPixels(GCPtr pGC,
-                  DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
- 
-         box.x1 = xOrg;
-@@ -1415,7 +1417,7 @@ damagePushPixels(GCPtr pGC,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PushPixels) (pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1480,7 +1482,6 @@ damageCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-     ScreenPtr pScreen = pWindow->drawable.pScreen;
- 
-     damageScrPriv(pScreen);
--    drawableDamage(&pWindow->drawable);
- 
-     if (getWindowDamage(pWindow)) {
-         int dx = pWindow->drawable.x - ptOldOrg.x;
-@@ -1496,7 +1497,7 @@ damageCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-     }
-     unwrap(pScrPriv, pScreen, CopyWindow);
-     (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(&pWindow->drawable);
-     wrap(pScrPriv, pScreen, CopyWindow, damageCopyWindow);
- }
- 
-@@ -1870,22 +1871,20 @@ DamageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion)
- void
- DamageRegionProcessPending(DrawablePtr pDrawable)
- {
--    drawableDamage(pDrawable);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
- }
- 
- /* This call is very odd, i'm leaving it intact for API sake, but please don't use it. */
- void
- DamageDamageRegion(DrawablePtr pDrawable, RegionPtr pRegion)
- {
--    drawableDamage(pDrawable);
-     damageRegionAppend(pDrawable, pRegion, FALSE, -1);
- 
-     /* Go back and report this damage for DamagePtrs with reportAfter set, since
-      * this call isn't part of an in-progress drawing op in the call chain and
-      * the DDX probably just wants to know about it right away.
-      */
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
- }
- 
- void
--- 
-cgit v0.10.2
-
-From 1b42f9505ff3a39b441464f553442079b750fe88 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Thu, 8 Dec 2016 14:32:06 +1000
-Subject: os: return 0 from check_timers if we touched any of them
-
-Fixes a regression introduced in 0b2f30834b1a9f. If a driver posts input
-events during a timer function (wacom and synaptics do this during tap
-timeouts), ProcessInputEvents() is not called for these events. There are no
-new events on any fds, so the events just sit in the queue waiting for
-something else to happen.
-
-Fix this by simply returning 0 from check_timers if we ran at least one of
-them or reset them all. This way the callers ospoll_wait will exit and
-continue with normal processing.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index ff1c85e..613608f 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -143,7 +143,7 @@ check_timers(void)
- {
-     OsTimerPtr timer;
- 
--    while ((timer = first_timer()) != NULL) {
-+    if ((timer = first_timer()) != NULL) {
-         CARD32 now = GetTimeInMillis();
-         int timeout = timer->expires - now;
- 
-@@ -157,6 +157,8 @@ check_timers(void)
-             /* time has rewound.  reset the timers. */
-             CheckAllTimers();
-         }
-+
-+        return 0;
-     }
-     return -1;
- }
--- 
-cgit v0.10.2
-
-From 05e19644250698aa126a60bc671e85425df784d1 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede at redhat.com>
-Date: Tue, 20 Dec 2016 13:00:43 +0100
-Subject: glamor: Trust eglGetPlatformDisplayEXT if it exists
-
-If the libEGL we are using has eglGetPlatformDisplayEXT, yet it still
-returns NULL, then this very likely means that it does not support the
-type (e.g. EGL_PLATFORM_GBM_MESA) passed in, and then returning NULL is
-the right thing to do.
-
-This avoids falling back to an eglGetDisplay() implementation which does
-not understands the passed in gbm handle, treats it as a pointer to
-something else completely, followed by a crash sooner or later.
-
-Specifically this fixes using the nvidia binary driver, with nvidia's
-libEGL + the modesetting driver on a secondary GPU crashing inside
-glamor_egl_init() sometimes.
-
-Cc: Eric Anholt <eric at anholt.net>
-Reviewed-by: Adam Jackson <ajax at redhat.com>
-Signed-off-by: Hans de Goede <hdegoede at redhat.com>
-
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 9cc0f8d..4bde637 100644
---- a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -769,6 +769,10 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
- 
-     glamor_egl->display = glamor_egl_get_display(EGL_PLATFORM_GBM_MESA,
-                                                  glamor_egl->gbm);
-+    if (!glamor_egl->display) {
-+        xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglGetDisplay() failed\n");
-+        goto error;
-+    }
- #else
-     glamor_egl->display = eglGetDisplay((EGLNativeDisplayType) (intptr_t) fd);
- #endif
-diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
-index 6b05f57..2c6d307 100644
---- a/glamor/glamor_egl.h
-+++ b/glamor/glamor_egl.h
-@@ -67,9 +67,7 @@ glamor_egl_get_display(EGLint type, void *native)
-         PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT =
-             (void *) eglGetProcAddress("eglGetPlatformDisplayEXT");
-         if (getPlatformDisplayEXT)
--            dpy = getPlatformDisplayEXT(type, native, NULL);
--        if (dpy)
--            return dpy;
-+            return getPlatformDisplayEXT(type, native, NULL);
-     }
- 
-     /* Welp, everything is awful. */
--- 
-cgit v0.10.2
-
-From e473b2bc016adacfe3fa47fdf6a8ce9f8cddff62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer at amd.com>
-Date: Fri, 25 Nov 2016 17:34:05 +0900
-Subject: present: Only call present_flip_notify if vblank->queued == FALSE
-
-We are no longer using the present_flip_queue list only for presents
-which have already been submitted to the driver for page flipping, but
-also for those which we are queueing up to be flipped later, marked
-with vblank->queued == TRUE. We were incorrectly calling
-present_flip_notify for such entries, failing the assertion in
-present_flip_notify (or presumably resulting in other undesirable
-behaviour with assertions disabled).
-
-Reproduction recipe: Run the JavaFX test case referenced by
-https://bugs.freedesktop.org/show_bug.cgi?id=98831#c6 and alt-tab out
-of it while it's fullscreen. May take a few attempts to hit the
-assertion failure.
-
-Fixes: bab0f450a719 ("present: Fix presentation of flips out of order")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98854
-Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
-
-diff --git a/present/present.c b/present/present.c
-index a7ca06e..ef89045 100644
---- a/present/present.c
-+++ b/present/present.c
-@@ -536,7 +536,10 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc)
-     }
-     xorg_list_for_each_entry(vblank, &present_flip_queue, event_queue) {
-         if (vblank->event_id == event_id) {
--            present_flip_notify(vblank, ust, msc);
-+            if (vblank->queued)
-+                present_execute(vblank, ust, msc);
-+            else
-+                present_flip_notify(vblank, ust, msc);
-             return;
-         }
-     }
--- 
-cgit v0.10.2
-
-From: Keith Packard <keithp at keithp.com>
-X-Patchwork-Id: 132089
-Message-Id: <20170110021441.12759-1-keithp at keithp.com>
-To: xorg-devel at lists.freedesktop.org
-Date: Mon,  9 Jan 2017 18:14:41 -0800
-
-A client which is attended while a grab is blocking execution of its
-requests needs to be placed in the saved_ready_clients list so that it
-will get scheduled once the grab terminates. Otherwise, if the client
-never sends another request, there is no way for it to be placed in
-the ready_clients list.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99333
-Signed-off-by: Keith Packard <keithp at keithp.com>
----
- dix/dispatch.c      | 7 +++++++
- include/dixstruct.h | 3 +++
- os/connection.c     | 4 ++++
- 3 files changed, 14 insertions(+)
-
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 3d0fe26fd..ab69d34b9 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -266,6 +266,13 @@ mark_client_ready(ClientPtr client)
-         xorg_list_append(&client->ready, &ready_clients);
- }
- 
-+/* Client has requests queued or data on the network, but awaits a server grab release */
-+void mark_client_saved_ready(ClientPtr client)
-+{
-+    if (xorg_list_is_empty(&client->ready))
-+        xorg_list_append(&client->ready, &saved_ready_clients);
-+}
-+
- /* Client has no requests queued and no data on network */
- void
- mark_client_not_ready(ClientPtr client)
-diff --git a/include/dixstruct.h b/include/dixstruct.h
-index d71b0ac05..fd9195972 100644
---- a/include/dixstruct.h
-+++ b/include/dixstruct.h
-@@ -143,6 +143,9 @@ extern void SmartScheduleStopTimer(void);
- /* Client has requests queued or data on the network */
- void mark_client_ready(ClientPtr client);
- 
-+/* Client has requests queued or data on the network, but awaits a server grab release */
-+void mark_client_saved_ready(ClientPtr client);
-+
- /* Client has no requests queued and no data on network */
- void mark_client_not_ready(ClientPtr client);
- 
-diff --git a/os/connection.c b/os/connection.c
-index a901ebf3c..a2629c8a2 100644
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -1067,6 +1067,10 @@ AttendClient(ClientPtr client)
-     set_poll_client(client);
-     if (listen_to_client(client))
-         mark_client_ready(client);
-+    else if (!(oc->flags & OS_COMM_IGNORED)) {
-+        /* grab active, mark ready when grab goes away */
-+        mark_client_saved_ready(client);
-+    }
- }
- 
- /* make client impervious to grabs; assume only executing client calls this */
-

Deleted: testing-i686/xorg-server.install
===================================================================
--- testing-i686/xorg-server.install	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-i686/xorg-server.install	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,18 +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 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).
-MSG
-}
-

Copied: xorg-server/repos/testing-i686/xorg-server.install (from rev 285707, xorg-server/trunk/xorg-server.install)
===================================================================
--- testing-i686/xorg-server.install	                        (rev 0)
+++ testing-i686/xorg-server.install	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,18 @@
+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).
+MSG
+}
+

Deleted: testing-i686/xvfb-run
===================================================================
--- testing-i686/xvfb-run	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-i686/xvfb-run	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# 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 640x480x8"
-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
--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
-}
-
-# 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: \
-       --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) ;;
-        -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 ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# 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"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-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
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:

Copied: xorg-server/repos/testing-i686/xvfb-run (from rev 285707, xorg-server/trunk/xvfb-run)
===================================================================
--- testing-i686/xvfb-run	                        (rev 0)
+++ testing-i686/xvfb-run	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,180 @@
+#!/bin/sh
+
+# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
+
+# 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 640x480x8"
+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
+-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
+}
+
+# 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: \
+       --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) ;;
+        -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 ! which xauth >/dev/null; then
+    error "xauth command not found"
+    exit 3
+fi
+
+# tidy up after ourselves
+trap clean_up EXIT
+
+# 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"
+fi
+
+# Start Xvfb.
+MCOOKIE=$(mcookie)
+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
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
+RETVAL=$?
+set -e
+
+# Kill Xvfb now that the command has exited.
+kill $XVFBPID
+
+# Return the executed command's exit status.
+exit $RETVAL
+
+# vim:set ai et sts=4 sw=4 tw=80:

Deleted: testing-i686/xvfb-run.1
===================================================================
--- testing-i686/xvfb-run.1	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-i686/xvfb-run.1	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden at 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:

Copied: xorg-server/repos/testing-i686/xvfb-run.1 (from rev 285707, xorg-server/trunk/xvfb-run.1)
===================================================================
--- testing-i686/xvfb-run.1	                        (rev 0)
+++ testing-i686/xvfb-run.1	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,282 @@
+.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
+.\"
+.\" Copyright 1998-2004 Branden Robinson <branden at 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:

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-x86_64/PKGBUILD	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,225 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.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.19.0
-pkgrel=6
-arch=('i686' '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')
-source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
-        xvfb-run
-        xvfb-run.1
-        git-fixes.diff)
-validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
-              'C383B778255613DFDB409D91DB221A6900000011'
-              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3'
-            'SKIP'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            'f0f18685a5894a4d30669fa0b74db8f29d869b57315d8a16e093010659a3299c')
-
-prepare() {
-  cd "${pkgbase}-${pkgver}"
-  # apply upstream fixes:
-  # Revert "damage: Make damageRegionProcessPending take a damage not a drawable"
-  # os: return 0 from check_timers if we touched any of them
-  # glamor: Trust eglGetPlatformDisplayEXT if it exists
-  # present: Only call present_flip_notify if vblank->queued == FALSE
-  # AttendClient of grab-pervious client should queue to saved_ready_clients
-  patch -Np1 -i ../git-fixes.diff
-}
-
-build() {
-  cd "${pkgbase}-${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
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc)
-
-  cd "${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput)
-
-  # 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')
-  conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
-  replaces=('glamor-egl' 'xf86-video-modesetting')
-  install=xorg-server.install
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  # distro specific files must be installed in /usr/share/X11/xorg.conf.d
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  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"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common xcb-util-image
-           xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
-
-  cd "${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl)
-
-  cd "${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd)
-
-  cd "${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common)
-
-  cd "${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-xwayland() {
-  pkgdesc="run X clients under wayland"
-  depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common)
-
-  cd "${pkgbase}-${pkgver}/hw/xwayland"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto dri3proto xineramaproto libpciaccess
-           resourceproto scrnsaverproto presentproto
-           # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/usr/lib/xorg-server"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}

Copied: xorg-server/repos/testing-x86_64/PKGBUILD (from rev 285707, xorg-server/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,212 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.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.19.1
+pkgrel=1
+arch=('i686' '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')
+source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
+        xvfb-run
+        xvfb-run.1)
+validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
+              'C383B778255613DFDB409D91DB221A6900000011'
+              'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
+sha256sums=('79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb'
+            'SKIP'
+            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+
+build() {
+  cd "${pkgbase}-${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
+}
+
+package_xorg-server-common() {
+  pkgdesc="Xorg server common files"
+  depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc)
+
+  cd "${pkgbase}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
+  
+  make -C xkb DESTDIR="${pkgdir}" install-data
+
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
+  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
+
+  install -m755 -d "${pkgdir}/usr/lib/xorg"
+  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
+}
+
+package_xorg-server() {
+  pkgdesc="Xorg X server"
+  depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput)
+
+  # 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')
+  conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
+  replaces=('glamor-egl' 'xf86-video-modesetting')
+  install=xorg-server.install
+
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  # distro specific files must be installed in /usr/share/X11/xorg.conf.d
+  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+  
+  # Needed for non-mesa drivers, libgl will restore it
+  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
+     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
+
+  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"
+}
+
+package_xorg-server-xephyr() {
+  pkgdesc="A nested X server that runs as an X application"
+  depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common xcb-util-image
+           xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
+
+  cd "${pkgbase}-${pkgver}/hw/kdrive"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
+}
+
+package_xorg-server-xvfb() {
+  pkgdesc="Virtual framebuffer X server"
+  depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl)
+
+  cd "${pkgbase}-${pkgver}/hw/vfb"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
+  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
+}
+
+package_xorg-server-xnest() {
+  pkgdesc="A nested X server that runs as an X application"
+  depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd)
+
+  cd "${pkgbase}-${pkgver}/hw/xnest"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
+}
+
+package_xorg-server-xdmx() {
+  pkgdesc="Distributed Multihead X Server and utilities"
+  depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common)
+
+  cd "${pkgbase}-${pkgver}/hw/dmx"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
+}
+
+package_xorg-server-xwayland() {
+  pkgdesc="run X clients under wayland"
+  depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common)
+
+  cd "${pkgbase}-${pkgver}/hw/xwayland"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
+}
+
+package_xorg-server-devel() {
+  pkgdesc="Development files for the X.Org X server"
+  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
+           xproto randrproto renderproto xextproto inputproto kbproto 
+           fontsproto pixman videoproto xf86driproto glproto 
+           mesa dri2proto dri3proto xineramaproto libpciaccess
+           resourceproto scrnsaverproto presentproto
+           # not technically required but almost every Xorg pkg needs it to build
+           xorg-util-macros)
+
+  cd "${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/bin"
+  rm -rf "${pkgdir}/usr/share/man"
+  rm -rf "${pkgdir}/usr/share/doc"
+  rm -rf "${pkgdir}/usr/share/X11"
+  rm -rf "${pkgdir}/usr/lib/xorg"
+  rm -rf "${pkgdir}/usr/lib/xorg-server"
+  rm -rf "${pkgdir}/var"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
+}

Deleted: testing-x86_64/git-fixes.diff
===================================================================
--- testing-x86_64/git-fixes.diff	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-x86_64/git-fixes.diff	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,722 +0,0 @@
-From d6da2086951693e047fdd22b0d21c539ea1bb1e1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Mon, 12 Dec 2016 13:08:17 -0500
-Subject: Revert "damage: Make damageRegionProcessPending take a damage not a
- drawable"
-
-The commit message makes the assertion that the code below damage is not
-allowed to change whether there's a damage monitor for the drawable.
-That turns out not to be the case! exa's mixed code, at least, will
-create and destroy a damage in PrepareAccess. The destroy path can then
-be catastrophic, as damageRegionProcessPending will attempt to
-RegionEmpty memory from the middle of a freed block.
-
-I'd wanted that invariant for performance, but faster isn't worth
-broken, so revert it. I think what exa's doing is reasonable, so the
-better way to improve performance for the unmonitored case is to either
-revisit dynamically wrapping into the GC, or inline damage into dix.
-
-This reverts commit 4e124203f2260daaf54155f4a05fe469733e0b97.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389886
-Signed-off-by: Adam Jackson <ajax at redhat.com>
-(cherry picked from commit 32e632e85894eddc3ace83f16f1e973b1be478fe)
-
-diff --git a/miext/damage/damage.c b/miext/damage/damage.c
-index 17c2abf..d6a3614 100644
---- a/miext/damage/damage.c
-+++ b/miext/damage/damage.c
-@@ -282,8 +282,10 @@ damageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
- }
- 
- static void
--damageRegionProcessPending(DamagePtr pDamage)
-+damageRegionProcessPending(DrawablePtr pDrawable)
- {
-+    drawableDamage(pDrawable);
-+
-     for (; pDamage != NULL; pDamage = pDamage->pNext) {
-         if (pDamage->reportAfter) {
-             /* It's possible that there is only interest in postRendering reporting. */
-@@ -358,7 +360,6 @@ damageCreateGC(GCPtr pGC)
- 
- #define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \
-     damageGCPriv(pGC);  \
--    drawableDamage(pDrawable); \
-     const GCFuncs *oldFuncs = pGC->funcs; \
-     unwrap(pGCPriv, pGC, funcs);  \
-     unwrap(pGCPriv, pGC, ops); \
-@@ -456,7 +457,7 @@ damageDestroyClip(GCPtr pGC)
- #define BOX_NOT_EMPTY(box) \
-     (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))
- 
--#define checkGCDamage(d,g)	(d && \
-+#define checkGCDamage(d,g)	(getDrawableDamage(d) && \
- 				 (!g->pCompositeClip ||\
- 				  RegionNotEmpty(g->pCompositeClip)))
- 
-@@ -468,7 +469,8 @@ damageDestroyClip(GCPtr pGC)
-     if(box.y2 > extents->y2) box.y2 = extents->y2; \
-     }
- 
--#define checkPictureDamage(d, p) (d && RegionNotEmpty(p->pCompositeClip))
-+#define checkPictureDamage(p)	(getDrawableDamage(p->pDrawable) && \
-+				 RegionNotEmpty(p->pCompositeClip))
- 
- static void
- damageComposite(CARD8 op,
-@@ -485,9 +487,8 @@ damageComposite(CARD8 op,
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
- 
-     damageScrPriv(pScreen);
--    drawableDamage(pDst->pDrawable);
- 
--    if (checkPictureDamage(pDamage, pDst)) {
-+    if (checkPictureDamage(pDst)) {
-         BoxRec box;
- 
-         box.x1 = xDst + pDst->pDrawable->x;
-@@ -504,7 +505,7 @@ damageComposite(CARD8 op,
-                       pMask,
-                       pDst,
-                       xSrc, ySrc, xMask, yMask, xDst, yDst, width, height);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst->pDrawable);
-     wrap(pScrPriv, ps, Composite, damageComposite);
- }
- 
-@@ -520,9 +521,8 @@ damageGlyphs(CARD8 op,
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
- 
-     damageScrPriv(pScreen);
--    drawableDamage(pDst->pDrawable);
- 
--    if (checkPictureDamage(pDamage, pDst)) {
-+    if (checkPictureDamage(pDst)) {
-         int nlistTmp = nlist;
-         GlyphListPtr listTmp = list;
-         GlyphPtr *glyphsTmp = glyphs;
-@@ -567,7 +567,7 @@ damageGlyphs(CARD8 op,
-     }
-     unwrap(pScrPriv, ps, Glyphs);
-     (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst->pDrawable);
-     wrap(pScrPriv, ps, Glyphs, damageGlyphs);
- }
- 
-@@ -579,9 +579,8 @@ damageAddTraps(PicturePtr pPicture,
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
- 
-     damageScrPriv(pScreen);
--    drawableDamage(pPicture->pDrawable);
- 
--    if (checkPictureDamage(pDamage, pPicture)) {
-+    if (checkPictureDamage(pPicture)) {
-         BoxRec box;
-         int i;
-         int x, y;
-@@ -616,7 +615,7 @@ damageAddTraps(PicturePtr pPicture,
-     }
-     unwrap(pScrPriv, ps, AddTraps);
-     (*ps->AddTraps) (pPicture, x_off, y_off, ntrap, traps);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pPicture->pDrawable);
-     wrap(pScrPriv, ps, AddTraps, damageAddTraps);
- }
- 
-@@ -628,7 +627,7 @@ damageFillSpans(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         int nptTmp = npt;
-         DDXPointPtr pptTmp = ppt;
-         int *pwidthTmp = pwidth;
-@@ -664,7 +663,7 @@ damageFillSpans(DrawablePtr pDrawable,
- 
-     (*pGC->ops->FillSpans) (pDrawable, pGC, npt, ppt, pwidth, fSorted);
- 
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -676,7 +675,7 @@ damageSetSpans(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         DDXPointPtr pptTmp = ppt;
-         int *pwidthTmp = pwidth;
-         int nptTmp = npt;
-@@ -710,7 +709,7 @@ damageSetSpans(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->SetSpans) (pDrawable, pGC, pcharsrc, ppt, pwidth, npt, fSorted);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -722,7 +721,7 @@ damagePutImage(DrawablePtr pDrawable,
-                int y, int w, int h, int leftPad, int format, char *pImage)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
- 
-         box.x1 = x + pDrawable->x;
-@@ -736,7 +735,7 @@ damagePutImage(DrawablePtr pDrawable,
-     }
-     (*pGC->ops->PutImage) (pDrawable, pGC, depth, x, y, w, h,
-                            leftPad, format, pImage);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -750,7 +749,7 @@ damageCopyArea(DrawablePtr pSrc,
- 
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
- 
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDst, pGC)) {
-         BoxRec box;
- 
-         box.x1 = dstx + pDst->x;
-@@ -765,7 +764,7 @@ damageCopyArea(DrawablePtr pSrc,
- 
-     ret = (*pGC->ops->CopyArea) (pSrc, pDst,
-                                  pGC, srcx, srcy, width, height, dstx, dsty);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDst);
-     return ret;
- }
-@@ -783,7 +782,7 @@ damageCopyPlane(DrawablePtr pSrc,
- 
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDst);
- 
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDst, pGC)) {
-         BoxRec box;
- 
-         box.x1 = dstx + pDst->x;
-@@ -799,7 +798,7 @@ damageCopyPlane(DrawablePtr pSrc,
-     ret = (*pGC->ops->CopyPlane) (pSrc, pDst,
-                                   pGC, srcx, srcy, width, height, dstx, dsty,
-                                   bitPlane);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDst);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDst);
-     return ret;
- }
-@@ -810,7 +809,7 @@ damagePolyPoint(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int nptTmp = npt;
-         xPoint *pptTmp = ppt;
-@@ -840,7 +839,7 @@ damagePolyPoint(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyPoint) (pDrawable, pGC, mode, npt, ppt);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -850,7 +849,7 @@ damagePolylines(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt && checkGCDamage(pDamage, pGC)) {
-+    if (npt && checkGCDamage(pDrawable, pGC)) {
-         int nptTmp = npt;
-         DDXPointPtr pptTmp = ppt;
-         BoxRec box;
-@@ -913,7 +912,7 @@ damagePolylines(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->Polylines) (pDrawable, pGC, mode, npt, ppt);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -922,7 +921,7 @@ damagePolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSeg, xSegment * pSeg)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nSeg && checkGCDamage(pDamage, pGC)) {
-+    if (nSeg && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int extra = pGC->lineWidth;
-         int nsegTmp = nSeg;
-@@ -992,7 +991,7 @@ damagePolySegment(DrawablePtr pDrawable, GCPtr pGC, int nSeg, xSegment * pSeg)
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolySegment) (pDrawable, pGC, nSeg, pSeg);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1002,7 +1001,7 @@ damagePolyRectangle(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nRects && checkGCDamage(pDamage, pGC)) {
-+    if (nRects && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int offset1, offset2, offset3;
-         int nRectsTmp = nRects;
-@@ -1051,7 +1050,7 @@ damagePolyRectangle(DrawablePtr pDrawable,
-         }
-     }
-     (*pGC->ops->PolyRectangle) (pDrawable, pGC, nRects, pRects);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1060,7 +1059,7 @@ damagePolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nArcs && checkGCDamage(pDamage, pGC)) {
-+    if (nArcs && checkGCDamage(pDrawable, pGC)) {
-         int extra = pGC->lineWidth >> 1;
-         BoxRec box;
-         int nArcsTmp = nArcs;
-@@ -1098,7 +1097,7 @@ damagePolyArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyArc) (pDrawable, pGC, nArcs, pArcs);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1108,7 +1107,7 @@ damageFillPolygon(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (npt > 2 && checkGCDamage(pDamage, pGC)) {
-+    if (npt > 2 && checkGCDamage(pDrawable, pGC)) {
-         DDXPointPtr pptTmp = ppt;
-         int nptTmp = npt;
-         BoxRec box;
-@@ -1157,7 +1156,7 @@ damageFillPolygon(DrawablePtr pDrawable,
-     }
- 
-     (*pGC->ops->FillPolygon) (pDrawable, pGC, shape, mode, npt, ppt);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1166,7 +1165,7 @@ damagePolyFillRect(DrawablePtr pDrawable,
-                    GCPtr pGC, int nRects, xRectangle *pRects)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
--    if (nRects && checkGCDamage(pDamage, pGC)) {
-+    if (nRects && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         xRectangle *pRectsTmp = pRects;
-         int nRectsTmp = nRects;
-@@ -1193,7 +1192,7 @@ damagePolyFillRect(DrawablePtr pDrawable,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyFillRect) (pDrawable, pGC, nRects, pRects);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1202,7 +1201,7 @@ damagePolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
- 
--    if (nArcs && checkGCDamage(pDamage, pGC)) {
-+    if (nArcs && checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
-         int nArcsTmp = nArcs;
-         xArc *pArcsTmp = pArcs;
-@@ -1229,7 +1228,7 @@ damagePolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int nArcs, xArc * pArcs)
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PolyFillArc) (pDrawable, pGC, nArcs, pArcs);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1278,9 +1277,12 @@ damageDamageChars(DrawablePtr pDrawable,
- #define TT_IMAGE16 3
- 
- static void
--damageText(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned long count,
--           char *chars, FontEncoding fontEncoding, DamagePtr pDamage,
--           Bool textType)
-+damageText(DrawablePtr pDrawable,
-+           GCPtr pGC,
-+           int x,
-+           int y,
-+           unsigned long count,
-+           char *chars, FontEncoding fontEncoding, Bool textType)
- {
-     CharInfoPtr *charinfo;
-     unsigned long i;
-@@ -1289,7 +1291,7 @@ damageText(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned long count,
- 
-     imageblt = (textType == TT_IMAGE8) || (textType == TT_IMAGE16);
- 
--    if (!pDamage)
-+    if (!checkGCDamage(pDrawable, pGC))
-         return;
- 
-     charinfo = xallocarray(count, sizeof(CharInfoPtr));
-@@ -1314,9 +1316,9 @@ damagePolyText8(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit,
--               pDamage, TT_POLY8);
-+               TT_POLY8);
-     x = (*pGC->ops->PolyText8) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
-     return x;
- }
-@@ -1328,9 +1330,9 @@ damagePolyText16(DrawablePtr pDrawable,
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
-                FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
--               pDamage, TT_POLY16);
-+               TT_POLY16);
-     x = (*pGC->ops->PolyText16) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
-     return x;
- }
-@@ -1341,9 +1343,9 @@ damageImageText8(DrawablePtr pDrawable,
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit,
--               pDamage, TT_IMAGE8);
-+               TT_IMAGE8);
-     (*pGC->ops->ImageText8) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1354,9 +1356,9 @@ damageImageText16(DrawablePtr pDrawable,
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
-     damageText(pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
-                FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
--               pDamage, TT_IMAGE16);
-+               TT_IMAGE16);
-     (*pGC->ops->ImageText16) (pDrawable, pGC, x, y, count, chars);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1371,7 +1373,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable,
-     damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
-                       nglyph, ppci, TRUE, pGC->subWindowMode);
-     (*pGC->ops->ImageGlyphBlt) (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1386,7 +1388,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable,
-     damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
-                       nglyph, ppci, FALSE, pGC->subWindowMode);
-     (*pGC->ops->PolyGlyphBlt) (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1396,7 +1398,7 @@ damagePushPixels(GCPtr pGC,
-                  DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg)
- {
-     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
--    if (checkGCDamage(pDamage, pGC)) {
-+    if (checkGCDamage(pDrawable, pGC)) {
-         BoxRec box;
- 
-         box.x1 = xOrg;
-@@ -1415,7 +1417,7 @@ damagePushPixels(GCPtr pGC,
-             damageDamageBox(pDrawable, &box, pGC->subWindowMode);
-     }
-     (*pGC->ops->PushPixels) (pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
-     DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
- }
- 
-@@ -1480,7 +1482,6 @@ damageCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-     ScreenPtr pScreen = pWindow->drawable.pScreen;
- 
-     damageScrPriv(pScreen);
--    drawableDamage(&pWindow->drawable);
- 
-     if (getWindowDamage(pWindow)) {
-         int dx = pWindow->drawable.x - ptOldOrg.x;
-@@ -1496,7 +1497,7 @@ damageCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-     }
-     unwrap(pScrPriv, pScreen, CopyWindow);
-     (*pScreen->CopyWindow) (pWindow, ptOldOrg, prgnSrc);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(&pWindow->drawable);
-     wrap(pScrPriv, pScreen, CopyWindow, damageCopyWindow);
- }
- 
-@@ -1870,22 +1871,20 @@ DamageRegionAppend(DrawablePtr pDrawable, RegionPtr pRegion)
- void
- DamageRegionProcessPending(DrawablePtr pDrawable)
- {
--    drawableDamage(pDrawable);
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
- }
- 
- /* This call is very odd, i'm leaving it intact for API sake, but please don't use it. */
- void
- DamageDamageRegion(DrawablePtr pDrawable, RegionPtr pRegion)
- {
--    drawableDamage(pDrawable);
-     damageRegionAppend(pDrawable, pRegion, FALSE, -1);
- 
-     /* Go back and report this damage for DamagePtrs with reportAfter set, since
-      * this call isn't part of an in-progress drawing op in the call chain and
-      * the DDX probably just wants to know about it right away.
-      */
--    damageRegionProcessPending(pDamage);
-+    damageRegionProcessPending(pDrawable);
- }
- 
- void
--- 
-cgit v0.10.2
-
-From 1b42f9505ff3a39b441464f553442079b750fe88 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Thu, 8 Dec 2016 14:32:06 +1000
-Subject: os: return 0 from check_timers if we touched any of them
-
-Fixes a regression introduced in 0b2f30834b1a9f. If a driver posts input
-events during a timer function (wacom and synaptics do this during tap
-timeouts), ProcessInputEvents() is not called for these events. There are no
-new events on any fds, so the events just sit in the queue waiting for
-something else to happen.
-
-Fix this by simply returning 0 from check_timers if we ran at least one of
-them or reset them all. This way the callers ospoll_wait will exit and
-continue with normal processing.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-
-diff --git a/os/WaitFor.c b/os/WaitFor.c
-index ff1c85e..613608f 100644
---- a/os/WaitFor.c
-+++ b/os/WaitFor.c
-@@ -143,7 +143,7 @@ check_timers(void)
- {
-     OsTimerPtr timer;
- 
--    while ((timer = first_timer()) != NULL) {
-+    if ((timer = first_timer()) != NULL) {
-         CARD32 now = GetTimeInMillis();
-         int timeout = timer->expires - now;
- 
-@@ -157,6 +157,8 @@ check_timers(void)
-             /* time has rewound.  reset the timers. */
-             CheckAllTimers();
-         }
-+
-+        return 0;
-     }
-     return -1;
- }
--- 
-cgit v0.10.2
-
-From 05e19644250698aa126a60bc671e85425df784d1 Mon Sep 17 00:00:00 2001
-From: Hans De Goede <hdegoede at redhat.com>
-Date: Tue, 20 Dec 2016 13:00:43 +0100
-Subject: glamor: Trust eglGetPlatformDisplayEXT if it exists
-
-If the libEGL we are using has eglGetPlatformDisplayEXT, yet it still
-returns NULL, then this very likely means that it does not support the
-type (e.g. EGL_PLATFORM_GBM_MESA) passed in, and then returning NULL is
-the right thing to do.
-
-This avoids falling back to an eglGetDisplay() implementation which does
-not understands the passed in gbm handle, treats it as a pointer to
-something else completely, followed by a crash sooner or later.
-
-Specifically this fixes using the nvidia binary driver, with nvidia's
-libEGL + the modesetting driver on a secondary GPU crashing inside
-glamor_egl_init() sometimes.
-
-Cc: Eric Anholt <eric at anholt.net>
-Reviewed-by: Adam Jackson <ajax at redhat.com>
-Signed-off-by: Hans de Goede <hdegoede at redhat.com>
-
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 9cc0f8d..4bde637 100644
---- a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -769,6 +769,10 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
- 
-     glamor_egl->display = glamor_egl_get_display(EGL_PLATFORM_GBM_MESA,
-                                                  glamor_egl->gbm);
-+    if (!glamor_egl->display) {
-+        xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglGetDisplay() failed\n");
-+        goto error;
-+    }
- #else
-     glamor_egl->display = eglGetDisplay((EGLNativeDisplayType) (intptr_t) fd);
- #endif
-diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
-index 6b05f57..2c6d307 100644
---- a/glamor/glamor_egl.h
-+++ b/glamor/glamor_egl.h
-@@ -67,9 +67,7 @@ glamor_egl_get_display(EGLint type, void *native)
-         PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT =
-             (void *) eglGetProcAddress("eglGetPlatformDisplayEXT");
-         if (getPlatformDisplayEXT)
--            dpy = getPlatformDisplayEXT(type, native, NULL);
--        if (dpy)
--            return dpy;
-+            return getPlatformDisplayEXT(type, native, NULL);
-     }
- 
-     /* Welp, everything is awful. */
--- 
-cgit v0.10.2
-
-From e473b2bc016adacfe3fa47fdf6a8ce9f8cddff62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer at amd.com>
-Date: Fri, 25 Nov 2016 17:34:05 +0900
-Subject: present: Only call present_flip_notify if vblank->queued == FALSE
-
-We are no longer using the present_flip_queue list only for presents
-which have already been submitted to the driver for page flipping, but
-also for those which we are queueing up to be flipped later, marked
-with vblank->queued == TRUE. We were incorrectly calling
-present_flip_notify for such entries, failing the assertion in
-present_flip_notify (or presumably resulting in other undesirable
-behaviour with assertions disabled).
-
-Reproduction recipe: Run the JavaFX test case referenced by
-https://bugs.freedesktop.org/show_bug.cgi?id=98831#c6 and alt-tab out
-of it while it's fullscreen. May take a few attempts to hit the
-assertion failure.
-
-Fixes: bab0f450a719 ("present: Fix presentation of flips out of order")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98854
-Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
-
-diff --git a/present/present.c b/present/present.c
-index a7ca06e..ef89045 100644
---- a/present/present.c
-+++ b/present/present.c
-@@ -536,7 +536,10 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc)
-     }
-     xorg_list_for_each_entry(vblank, &present_flip_queue, event_queue) {
-         if (vblank->event_id == event_id) {
--            present_flip_notify(vblank, ust, msc);
-+            if (vblank->queued)
-+                present_execute(vblank, ust, msc);
-+            else
-+                present_flip_notify(vblank, ust, msc);
-             return;
-         }
-     }
--- 
-cgit v0.10.2
-
-From: Keith Packard <keithp at keithp.com>
-X-Patchwork-Id: 132089
-Message-Id: <20170110021441.12759-1-keithp at keithp.com>
-To: xorg-devel at lists.freedesktop.org
-Date: Mon,  9 Jan 2017 18:14:41 -0800
-
-A client which is attended while a grab is blocking execution of its
-requests needs to be placed in the saved_ready_clients list so that it
-will get scheduled once the grab terminates. Otherwise, if the client
-never sends another request, there is no way for it to be placed in
-the ready_clients list.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99333
-Signed-off-by: Keith Packard <keithp at keithp.com>
----
- dix/dispatch.c      | 7 +++++++
- include/dixstruct.h | 3 +++
- os/connection.c     | 4 ++++
- 3 files changed, 14 insertions(+)
-
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 3d0fe26fd..ab69d34b9 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -266,6 +266,13 @@ mark_client_ready(ClientPtr client)
-         xorg_list_append(&client->ready, &ready_clients);
- }
- 
-+/* Client has requests queued or data on the network, but awaits a server grab release */
-+void mark_client_saved_ready(ClientPtr client)
-+{
-+    if (xorg_list_is_empty(&client->ready))
-+        xorg_list_append(&client->ready, &saved_ready_clients);
-+}
-+
- /* Client has no requests queued and no data on network */
- void
- mark_client_not_ready(ClientPtr client)
-diff --git a/include/dixstruct.h b/include/dixstruct.h
-index d71b0ac05..fd9195972 100644
---- a/include/dixstruct.h
-+++ b/include/dixstruct.h
-@@ -143,6 +143,9 @@ extern void SmartScheduleStopTimer(void);
- /* Client has requests queued or data on the network */
- void mark_client_ready(ClientPtr client);
- 
-+/* Client has requests queued or data on the network, but awaits a server grab release */
-+void mark_client_saved_ready(ClientPtr client);
-+
- /* Client has no requests queued and no data on network */
- void mark_client_not_ready(ClientPtr client);
- 
-diff --git a/os/connection.c b/os/connection.c
-index a901ebf3c..a2629c8a2 100644
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -1067,6 +1067,10 @@ AttendClient(ClientPtr client)
-     set_poll_client(client);
-     if (listen_to_client(client))
-         mark_client_ready(client);
-+    else if (!(oc->flags & OS_COMM_IGNORED)) {
-+        /* grab active, mark ready when grab goes away */
-+        mark_client_saved_ready(client);
-+    }
- }
- 
- /* make client impervious to grabs; assume only executing client calls this */
-

Deleted: testing-x86_64/xorg-server.install
===================================================================
--- testing-x86_64/xorg-server.install	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-x86_64/xorg-server.install	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,18 +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 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).
-MSG
-}
-

Copied: xorg-server/repos/testing-x86_64/xorg-server.install (from rev 285707, xorg-server/trunk/xorg-server.install)
===================================================================
--- testing-x86_64/xorg-server.install	                        (rev 0)
+++ testing-x86_64/xorg-server.install	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,18 @@
+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).
+MSG
+}
+

Deleted: testing-x86_64/xvfb-run
===================================================================
--- testing-x86_64/xvfb-run	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-x86_64/xvfb-run	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# 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 640x480x8"
-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
--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
-}
-
-# 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: \
-       --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) ;;
-        -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 ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# 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"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-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
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:

Copied: xorg-server/repos/testing-x86_64/xvfb-run (from rev 285707, xorg-server/trunk/xvfb-run)
===================================================================
--- testing-x86_64/xvfb-run	                        (rev 0)
+++ testing-x86_64/xvfb-run	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,180 @@
+#!/bin/sh
+
+# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
+
+# 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 640x480x8"
+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
+-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
+}
+
+# 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: \
+       --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) ;;
+        -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 ! which xauth >/dev/null; then
+    error "xauth command not found"
+    exit 3
+fi
+
+# tidy up after ourselves
+trap clean_up EXIT
+
+# 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"
+fi
+
+# Start Xvfb.
+MCOOKIE=$(mcookie)
+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
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
+RETVAL=$?
+set -e
+
+# Kill Xvfb now that the command has exited.
+kill $XVFBPID
+
+# Return the executed command's exit status.
+exit $RETVAL
+
+# vim:set ai et sts=4 sw=4 tw=80:

Deleted: testing-x86_64/xvfb-run.1
===================================================================
--- testing-x86_64/xvfb-run.1	2017-01-12 07:19:27 UTC (rev 285707)
+++ testing-x86_64/xvfb-run.1	2017-01-12 07:19:35 UTC (rev 285708)
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden at 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:

Copied: xorg-server/repos/testing-x86_64/xvfb-run.1 (from rev 285707, xorg-server/trunk/xvfb-run.1)
===================================================================
--- testing-x86_64/xvfb-run.1	                        (rev 0)
+++ testing-x86_64/xvfb-run.1	2017-01-12 07:19:35 UTC (rev 285708)
@@ -0,0 +1,282 @@
+.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
+.\"
+.\" Copyright 1998-2004 Branden Robinson <branden at 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:



More information about the arch-commits mailing list