upgpkg: 1.20.7-2

trunk/PKGBUILD

@@ -20,8 +20,8 @@ pkgname=(
 	'xorg-server-common'
 	'xorg-server-devel')
 
-pkgver=1.20.6
-pkgrel=3
+pkgver=1.20.7
+pkgrel=2
 
 url="https://xorg.freedesktop.org/releases/individual/xserver"
 source=("${url}/${pkgbase}-${pkgver}.tar.bz2"{,.sig}
@@ -70,8 +70,6 @@ makedepends=(
 #--------------------------------------| BUILD PREPARATION |------------------------------------
 
 prepare() {
-    cp xwayland-config.h.meson.in ${pkgbase}-${pkgver}/include/
-
     cd "${pkgbase}-${pkgver}"
 
     ## patch from Fedora, not yet merged

trunk/xserver-autobind-hotplug.patch

@@ -290,4 +290,3 @@ index e4bc2bf..e04c18f 100644
 +}
 -- 
 2.16.2
-

trunk/xvfb-run

@@ -101,7 +101,7 @@ find_free_servernum() {
 
 # Parse the command line.
 ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
+       --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
        --name "$PROGNAME" -- "$@")
 GETOPT_STATUS=$?