Updated to 1.19.7 and fixed compile

5 files changed, 206 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47b0ab3d621c..37cb529c2e20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,22 @@
 pkgbase = xorg-server1.19-git
-	pkgver = 1.19.6+24+g56547b196
+	pkgver = 1.19.7
 	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = x86_64
 	groups = xorg
 	license = custom
+	makedepends = xorgproto
 	makedepends = pixman
 	makedepends = libx11
 	makedepends = mesa
-	makedepends = mesa-libgl
-	makedepends = xf86driproto
-	makedepends = xcmiscproto
 	makedepends = xtrans
-	makedepends = bigreqsproto
-	makedepends = randrproto
-	makedepends = inputproto
-	makedepends = fontsproto
-	makedepends = videoproto
-	makedepends = presentproto
-	makedepends = compositeproto
-	makedepends = recordproto
-	makedepends = scrnsaverproto
-	makedepends = resourceproto
-	makedepends = xineramaproto
 	makedepends = libxkbfile
 	makedepends = libxfont2
-	makedepends = renderproto
 	makedepends = libpciaccess
 	makedepends = libxv
-	makedepends = xf86dgaproto
 	makedepends = libxmu
 	makedepends = libxrender
 	makedepends = libxi
-	makedepends = dmxproto
 	makedepends = libxaw
 	makedepends = libdmx
 	makedepends = libxtst
@@ -40,8 +24,6 @@ pkgbase = xorg-server1.19-git
 	makedepends = xorg-xkbcomp
 	makedepends = xorg-util-macros
 	makedepends = xorg-font-util
-	makedepends = glproto
-	makedepends = dri2proto
 	makedepends = libgcrypt
 	makedepends = libepoxy
 	makedepends = xcb-util
@@ -49,7 +31,6 @@ pkgbase = xorg-server1.19-git
 	makedepends = xcb-util-renderutil
 	makedepends = xcb-util-wm
 	makedepends = xcb-util-keysyms
-	makedepends = dri3proto
 	makedepends = libxshmfence
 	makedepends = libunwind
 	makedepends = systemd
@@ -61,12 +42,18 @@ pkgbase = xorg-server1.19-git
 	source = xext-shm-downgrade-from-error-to-debug.patch
 	source = xvfb-run
 	source = xvfb-run.1
+	source = libglvnd-glx.patch
+	source = libglvnd-glamor.patch
+	source = 35-gcc-10.patch
 	sha256sums = SKIP
 	sha256sums = 914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8
 	sha256sums = fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57
 	sha256sums = ecfd6f72bd6e9494f64d48ab4abb8c68d07ce102c90b07006b21d60f63c1cdc8
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
+	sha256sums = c213df933a66876a1eb6ff2ae30d8db682071d4f019bf3b4419bb7ad015f02a4
+	sha256sums = 56f0f7190154537424864ed7c878ef86802bd93491ff86b640208246b2c48dcf
+	sha256sums = 9899190ae04aa173bad76a67ce706ad99b9f3bcef80ba7d9703548381ff5d423
 
 pkgname = xorg-server1.19-git
 	pkgdesc = Xorg X server
@@ -85,7 +72,7 @@ pkgname = xorg-server1.19-git
 	provides = X-ABI-VIDEODRV_VERSION=23
 	provides = X-ABI-XINPUT_VERSION=24.1
 	provides = X-ABI-EXTENSION_VERSION=10.0
-	provides = xorg-server=1.19.6+24+g56547b196
+	provides = xorg-server=1.19.7
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
 	conflicts = xf86-video-modesetting
@@ -99,7 +86,7 @@ pkgname = xorg-server1.19-xephyr-git
 	depends = libgl
 	depends = libepoxy
 	depends = libunwind
-	depends = libsystemd
+	depends = systemd-libs
 	depends = libxv
 	depends = pixman
 	depends = xorg-server-common
@@ -107,7 +94,7 @@ pkgname = xorg-server1.19-xephyr-git
 	depends = xcb-util-renderutil
 	depends = xcb-util-wm
 	depends = xcb-util-keysyms
-	provides = xorg-server-xephyr=1.19.6+24+g56547b196
+	provides = xorg-server-xephyr=1.19.7
 	conflicts = xorg-server-xephyr
 
 pkgname = xorg-server1.19-xdmx-git
@@ -121,20 +108,20 @@ pkgname = xorg-server1.19-xdmx-git
 	depends = libunwind
 	depends = pixman
 	depends = xorg-server-common
-	provides = xorg-server-xdmx=1.19.6+24+g56547b196
+	provides = xorg-server-xdmx=1.19.7
 	conflicts = xorg-server-xdmx
 
 pkgname = xorg-server1.19-xvfb-git
 	pkgdesc = Virtual framebuffer X server
 	depends = libxfont2
 	depends = libunwind
-	depends = libsystemd
+	depends = systemd-libs
 	depends = pixman
 	depends = xorg-server-common
 	depends = xorg-xauth
 	depends = libgl
 	depends = which
-	provides = xorg-server-xvfb=1.19.6+24+g56547b196
+	provides = xorg-server-xvfb=1.19.7
 	conflicts = xorg-server-xvfb
 
 pkgname = xorg-server1.19-xnest-git
@@ -144,8 +131,8 @@ pkgname = xorg-server1.19-xnest-git
 	depends = libunwind
 	depends = pixman
 	depends = xorg-server-common
-	depends = libsystemd
-	provides = xorg-server-xnest=1.19.6+24+g56547b196
+	depends = systemd-libs
+	provides = xorg-server-xnest=1.19.7
 	conflicts = xorg-server-xnest
 
 pkgname = xorg-server1.19-xwayland-git
@@ -153,11 +140,11 @@ pkgname = xorg-server1.19-xwayland-git
 	depends = libxfont2
 	depends = libepoxy
 	depends = libunwind
-	depends = libsystemd
+	depends = systemd-libs
 	depends = libgl
 	depends = pixman
 	depends = xorg-server-common
-	provides = xorg-server-xwayland=1.19.6+24+g56547b196
+	provides = xorg-server-xwayland=1.19.7
 	conflicts = xorg-server-xwayland
 
 pkgname = xorg-server1.19-common-git
@@ -165,31 +152,16 @@ pkgname = xorg-server1.19-common-git
 	depends = xkeyboard-config
 	depends = xorg-xkbcomp
 	depends = xorg-setxkbmap
-	provides = xorg-server-common=1.19.6+24+g56547b196
+	provides = xorg-server-common=1.19.7
 	conflicts = xorg-server-common
 
 pkgname = xorg-server1.19-devel-git
 	pkgdesc = Development files for the X.Org X server
-	depends = xproto
-	depends = randrproto
-	depends = renderproto
-	depends = xextproto
-	depends = inputproto
-	depends = kbproto
-	depends = fontsproto
+	depends = xorgproto
 	depends = pixman
-	depends = videoproto
-	depends = xf86driproto
-	depends = glproto
 	depends = mesa
-	depends = dri2proto
-	depends = dri3proto
-	depends = xineramaproto
 	depends = libpciaccess
-	depends = resourceproto
-	depends = scrnsaverproto
-	depends = presentproto
 	depends = xorg-util-macros
-	provides = xorg-server-devel=1.19.6+24+g56547b196
+	provides = xorg-server-devel=1.19.7
 	conflicts = xorg-server-devel
 
diff --git a/35-gcc-10.patch b/35-gcc-10.patch
new file mode 100644
index 000000000000..ee8c1d9ffa04
--- /dev/null
+++ b/35-gcc-10.patch
@@ -0,0 +1,100 @@
+--- xorg-server-1.19.7/randr/rrprovider.c.orig	2020-05-14 10:17:01.138670184 +0000
++++ xorg-server-1.19.7/randr/rrprovider.c	2020-05-14 10:17:12.964330073 +0000
+@@ -27,7 +27,7 @@
+ 
+ #include <X11/Xatom.h>
+ 
+-RESTYPE RRProviderType;
++RESTYPE RRProviderType = 0;
+ 
+ /*
+  * Initialize provider type error value
+--- xorg-server-1.19.7/hw/xwayland/xwayland.c.orig	2020-05-14 09:58:09.466678754 +0000
++++ xorg-server-1.19.7/hw/xwayland/xwayland.c	2020-05-14 09:58:17.105153183 +0000
+@@ -37,7 +37,7 @@
+ 
+ #ifdef XF86VIDMODE
+ #include <X11/extensions/xf86vmproto.h>
+-_X_EXPORT Bool noXFree86VidModeExtension;
++extern _X_EXPORT Bool noXFree86VidModeExtension;
+ #endif
+ 
+ void
+--- xorg-server-1.19.7/hw/dmx/dmxextension.c.orig	2020-05-14 10:13:31.561339683 +0000
++++ xorg-server-1.19.7/hw/dmx/dmxextension.c	2020-05-14 10:24:15.942597405 +0000
+@@ -68,9 +68,6 @@
+  * _any_ header files. */
+ extern FontPtr defaultFont;
+ 
+-/* Hack to get Present to build (present requires RandR) */
+-RESTYPE RRCrtcType;
+-
+ /** This routine provides information to the DMX protocol extension
+  * about a particular screen. */
+ Bool
+--- xorg-server-1.19.7/hw/dmx/dmxinit.c.orig	2020-05-14 10:14:15.502876876 +0000
++++ xorg-server-1.19.7/hw/dmx/dmxinit.c	2020-05-14 10:17:31.072863884 +0000
+@@ -109,8 +109,6 @@
+ Bool dmxGLXFinishSwap = FALSE;
+ #endif
+ 
+-RESTYPE RRProviderType = 0;
+-
+ Bool dmxIgnoreBadFontPaths = FALSE;
+ 
+ Bool dmxAddRemoveScreens = FALSE;
+--- xorg-server-1.19.7/test/xi2/protocol-common.h.orig	2020-05-14 10:01:18.017983252 +0000
++++ xorg-server-1.19.7/test/xi2/protocol-common.h	2020-05-14 10:01:31.913514784 +0000
+@@ -97,7 +97,7 @@
+  * The reply handler called from WriteToClient. Set this handler if you need
+  * to check the reply values.
+  */
+-void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
++extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
+ 
+ /**
+  * The default screen used for the windows. Initialized by init_simple().
+--- xorg-server-1.19.7/test/xi2/protocol-common.c.orig	2020-05-14 10:01:56.497798794 +0000
++++ xorg-server-1.19.7/test/xi2/protocol-common.c	2020-05-14 10:02:16.462669794 +0000
+@@ -44,6 +44,8 @@
+ 
+ void *global_userdata;
+ 
++void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
++
+ static void
+ fake_init_sprite(DeviceIntPtr dev)
+ {
+--- xorg-server-1.19.7/test/misc.c.orig	2020-05-14 09:58:56.076213502 +0000
++++ xorg-server-1.19.7/test/misc.c	2020-05-14 09:59:03.347755949 +0000
+@@ -31,7 +31,7 @@
+ #include "dix.h"
+ #include "dixstruct.h"
+ 
+-ScreenInfo screenInfo;
++extern ScreenInfo screenInfo;
+ 
+ static void
+ dix_version_compare(void)
+--- xorg-server-1.19.7/hw/dmx/config/dmxconfig.c.orig	2020-05-17 03:21:32.467842842 +0000
++++ xorg-server-1.19.7/hw/dmx/config/dmxconfig.c	2020-05-17 03:22:23.371810328 +0000
+@@ -72,7 +72,7 @@
+     DMXConfigList *xinputs;
+ } DMXConfigCmd, *DMXConfigCmdPtr;
+ 
+-DMXConfigEntryPtr dmxConfigEntry;
++extern DMXConfigEntryPtr dmxConfigEntry;
+ static DMXConfigCmd dmxConfigCmd;
+ 
+ static int dmxDisplaysFromCommandLine;
+--- xorg-server-1.19.7/hw/dmx/config/xdmxconfig.c.orig	2020-05-17 03:21:26.309385341 +0000
++++ xorg-server-1.19.7/hw/dmx/config/xdmxconfig.c	2020-05-17 03:21:57.852228446 +0000
+@@ -82,7 +82,7 @@
+ #define DMX_CANVAS_WIDTH  400
+ #define DMX_CANVAS_HEIGHT 500
+ 
+-DMXConfigEntryPtr dmxConfigEntry;
++extern DMXConfigEntryPtr dmxConfigEntry;
+ static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
+ static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
+ static int dmxConfigGrabbed, dmxConfigGrabbedFine;
diff --git a/PKGBUILD b/PKGBUILD
index 4968f3a91b86..2a86273c33db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,23 @@
 # Maintainer (original xorg-server): AndyRTR <andyrtr@archlinux.org>
 # Maintainer (original xorg-server): Jan de Groot <jgc@archlinux.org>
 # Maintainer: Rafal Malachowicz <k5hv@linux.pl>
+# Maintainer: mirh
 
 pkgbase=xorg-server1.19-git
 _pkgbase=xorg-server
 pkgname=('xorg-server1.19-git' 'xorg-server1.19-xephyr-git' 'xorg-server1.19-xdmx-git' 'xorg-server1.19-xvfb-git' 'xorg-server1.19-xnest-git' 'xorg-server1.19-xwayland-git' 'xorg-server1.19-common-git' 'xorg-server1.19-devel-git')
-pkgver=1.19.6+24+g56547b196
+pkgver=1.19.7
 pkgrel=1
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
-             'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
-             'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv'
-             'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres'
-             'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
-             'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
-             'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git')
+makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'xtrans' 'libxkbfile' 'libxfont2'
+             'libpciaccess' 'libxv' 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx'
+             'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util'
+             'libgcrypt' 'libepoxy' 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil'
+             'xcb-util-wm' 'xcb-util-keysyms' 'libxshmfence' 'libunwind' 'systemd'
+             'wayland-protocols' 'git')
 # _commit=56547b196660e246e37132960723819972b99c8c # branch 1.19
 #source=(https://xorg.freedesktop.org/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
 source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#branch=server-1.19-branch"
@@ -26,7 +26,10 @@ source=("git+https://anongit.freedesktop.org/git/xorg/xserver.git#branch=server-
         xserver-autobind-hotplug.patch
         xext-shm-downgrade-from-error-to-debug.patch
         xvfb-run
-        xvfb-run.1)
+        xvfb-run.1
+        libglvnd-glx.patch
+        libglvnd-glamor.patch
+        35-gcc-10.patch)
 # validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
 #               'C383B778255613DFDB409D91DB221A6900000011'
 #               'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
@@ -36,7 +39,10 @@ sha256sums=('SKIP'
             'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57'
             'ecfd6f72bd6e9494f64d48ab4abb8c68d07ce102c90b07006b21d60f63c1cdc8'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
+            'c213df933a66876a1eb6ff2ae30d8db682071d4f019bf3b4419bb7ad015f02a4'
+            '56f0f7190154537424864ed7c878ef86802bd93491ff86b640208246b2c48dcf'
+            '9899190ae04aa173bad76a67ce706ad99b9f3bcef80ba7d9703548381ff5d423')
 
 pkgver() {
   cd xserver
@@ -53,6 +59,12 @@ prepare() {
   patch -Np1 -i ../xserver-autobind-hotplug.patch
   # merged upstream in trunk (FS#58187)
   patch -Np1 -i ../xext-shm-downgrade-from-error-to-debug.patch
+  # Pkg-config fix backport (X.org #893)
+  patch -Np1 -i ../libglvnd-glx.patch
+  # Glamor define fix (X.org #914)
+  patch -Np1 -i ../libglvnd-glamor.patch
+  # Gcc10 fix, courtesy of OpenIndiana Userland
+  patch -Np1 -i ../35-gcc-10.patch
 
   autoreconf -vfi
 }
@@ -167,7 +179,7 @@ package_xorg-server1.19-git() {
 
 package_xorg-server1.19-xephyr-git() {
   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
+  depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common xcb-util-image
            xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
   provides=("xorg-server-xephyr=$pkgver")
   conflicts=('xorg-server-xephyr')
@@ -182,7 +194,7 @@ package_xorg-server1.19-xephyr-git() {
 
 package_xorg-server1.19-xvfb-git() {
   pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont2 libunwind libsystemd pixman xorg-server-common xorg-xauth libgl which)
+  depends=(libxfont2 libunwind systemd-libs pixman xorg-server-common xorg-xauth libgl which)
   provides=("xorg-server-xvfb=$pkgver")
   conflicts=('xorg-server-xvfb')
 
@@ -199,7 +211,7 @@ package_xorg-server1.19-xvfb-git() {
 
 package_xorg-server1.19-xnest-git() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont2 libxext libunwind pixman xorg-server-common libsystemd)
+  depends=(libxfont2 libxext libunwind pixman xorg-server-common systemd-libs)
   provides=("xorg-server-xnest=$pkgver")
   conflicts=('xorg-server-xnest')
 
@@ -227,7 +239,7 @@ package_xorg-server1.19-xdmx-git() {
 
 package_xorg-server1.19-xwayland-git() {
   pkgdesc="run X clients under wayland"
-  depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common)
+  depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common)
   provides=("xorg-server-xwayland=$pkgver")
   conflicts=('xorg-server-xwayland')
 
@@ -242,10 +254,7 @@ package_xorg-server1.19-xwayland-git() {
 package_xorg-server1.19-devel-git() {
   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
+           xorgproto pixman mesa libpciaccess
            # not technically required but almost every Xorg pkg needs it to build
            xorg-util-macros)
   provides=("xorg-server-devel=$pkgver")
diff --git a/libglvnd-glamor.patch b/libglvnd-glamor.patch
new file mode 100644
index 000000000000..446afcda4a53
--- /dev/null
+++ b/libglvnd-glamor.patch
@@ -0,0 +1,36 @@
+diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
+index 6bb1185bf..f8601bb73 100644
+--- a/glamor/glamor_egl.h
++++ b/glamor/glamor_egl.h
+@@ -28,6 +28,7 @@
+ #define GLAMOR_EGL_H
+ 
+ #define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <epoxy/gl.h>
+ #include <epoxy/egl.h>
+ 
+diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
+index 27f95521d..4c4eb43d5 100644
+--- a/glamor/glamor_priv.h
++++ b/glamor/glamor_priv.h
+@@ -40,6 +40,7 @@
+ #include <epoxy/gl.h>
+ #if GLAMOR_HAS_GBM
+ #define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <epoxy/egl.h>
+ #endif
+ 
+diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
+index 63f230369..571b16b47 100644
+--- a/hw/xwayland/xwayland-glamor.c
++++ b/hw/xwayland/xwayland-glamor.c
+@@ -30,6 +30,7 @@
+ #include <xf86drm.h>
+ 
+ #define MESA_EGL_NO_X11_HEADERS
++#define EGL_NO_X11
+ #include <gbm.h>
+ #include <glamor_egl.h>
+ 
diff --git a/libglvnd-glx.patch b/libglvnd-glx.patch
new file mode 100644
index 000000000000..533fb34a68f9
--- /dev/null
+++ b/libglvnd-glx.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index b3fd2a023..90ac6d236 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -833,7 +833,7 @@ LIBDRI="dri >= 7.8.0"
+ LIBDRM="libdrm >= 2.3.1"
+ LIBEGL="egl"
+ LIBGBM="gbm >= 10.2.0"
+-LIBGL="gl >= 7.1.0"
++LIBGL="gl >= 1.2"
+ LIBXEXT="xext >= 1.0.99.4"
+ LIBXFONT="xfont2 >= 2.0.0"
+ LIBXI="xi >= 1.2.99.1"
+@@ -1184,7 +1184,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
+ 	yes,yes | auto,yes)
+ 		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+ 		DRI2=yes
+-		LIBGL="gl >= 9.2.0"
++		LIBGL="gl >= 1.2"
+ 		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+ 		;;
+ esac