xorg-server-1.20 support

2 files changed, 10 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9daa0fb07c6..f2c1e70c9f43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tigervnc-git
 	pkgdesc = Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC.
-	pkgver = r3678.8f652339
+	pkgver = r3764.3a37af3
 	pkgrel = 1
 	url = http://www.tigervnc.org
 	arch = i686
@@ -10,20 +10,8 @@ pkgbase = tigervnc-git
 	makedepends = nasm
 	makedepends = xorg-font-util
 	makedepends = xorg-util-macros
-	makedepends = bigreqsproto
-	makedepends = compositeproto
-	makedepends = damageproto
-	makedepends = randrproto
-	makedepends = resourceproto
-	makedepends = scrnsaverproto
-	makedepends = videoproto
-	makedepends = xcmiscproto
-	makedepends = xf86vidmodeproto
+	makedepends = xorgproto
 	makedepends = xtrans
-	makedepends = glproto
-	makedepends = dri2proto
-	makedepends = dri3proto
-	makedepends = presentproto
 	makedepends = mesa
 	makedepends = git
 	depends = fltk
@@ -46,11 +34,11 @@ pkgbase = tigervnc-git
 	conflicts = tigervnc
 	conflicts = tightvnc
 	source = git+https://github.com/TigerVNC/tigervnc.git
-	source = ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.19.6.tar.bz2
+	source = ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2
 	source = vncserver.service
 	source = vncviewer.desktop
 	sha256sums = SKIP
-	sha256sums = a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197
+	sha256sums = 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6
 	sha256sums = 80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e
 	sha256sums = 2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7
 
diff --git a/PKGBUILD b/PKGBUILD
index e2b6d76f3e4a..6aae9bdcca0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc-git
-pkgver=r3678.8f652339
+pkgver=r3764.3a37af39
 pkgrel=1
-_xorgver=1.19.6
+_xorgver=1.20.0
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('i686' 'x86_64')
 url="http://www.tigervnc.org"
@@ -11,11 +11,8 @@ license=('GPL')
 depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'pixman'
 	 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp'
 	 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2')
-makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
-	     'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
-	     'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
-	     'xtrans' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
-	     'mesa' 'git')
+makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'xorgproto'
+	     'xtrans' 'mesa' 'git')
 optdepends=('mesa: for OpenGL functionality in Xvnc')
 conflicts=('tigervnc' 'tightvnc')
 provides=('tigervnc')
@@ -24,7 +21,7 @@ source=(git+https://github.com/TigerVNC/tigervnc.git
 	vncserver.service
 	vncviewer.desktop)
 sha256sums=('SKIP'
-            'a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197'
+            '9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6'
             '80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e'
             '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7')
 
@@ -37,7 +34,7 @@ prepare() {
   cd tigervnc
   cd unix/xserver
   cp -r "$srcdir"/xorg-server-${_xorgver}/* .
-  patch -Np1 -i ../xserver119.patch
+  patch -Np1 -i ../xserver120.patch
 }
 
 build() {