upgpkg: xorg-server-nosystemd-1.19.1-1

2 files changed, 45 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index baf27044c9fa..ed19f2df923a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec 27 03:26:28 UTC 2016
+# Thu Jan 12 20:16:37 UTC 2017
 pkgbase = xorg-server-nosystemd
-	pkgver = 1.18.4
-	pkgrel = 2
+	pkgver = 1.19.1
+	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = xorg-server-nosystemd
 	makedepends = resourceproto
 	makedepends = xineramaproto
 	makedepends = libxkbfile
-	makedepends = libxfont
+	makedepends = libxfont2
 	makedepends = renderproto
 	makedepends = libpciaccess
 	makedepends = libxv
@@ -55,11 +55,12 @@ pkgbase = xorg-server-nosystemd
 	makedepends = dri3proto
 	makedepends = libxshmfence
 	makedepends = libunwind
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.4.tar.bz2.sig
+	makedepends = wayland-protocols
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.1.tar.bz2
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.19.1.tar.bz2.sig
 	source = xvfb-run
 	source = xvfb-run.1
-	sha256sums = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
+	sha256sums = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb
 	sha256sums = SKIP
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
@@ -68,20 +69,16 @@ pkgname = xorg-server-nosystemd
 	pkgdesc = Xorg X server
 	install = xorg-server.install
 	depends = libepoxy
-	depends = libxdmcp
-	depends = libxfont
-	depends = libpciaccess
-	depends = libdrm
+	depends = libxfont2
 	depends = pixman
-	depends = libgcrypt
-	depends = libxau
-	depends = xorg-server-common
-	depends = xf86-input-evdev
-	depends = libxshmfence
+	depends = xorg-server-common-nosystemd
+	depends = libunwind
+	depends = dbus-nosystemd
 	depends = libgl
-	provides = X-ABI-VIDEODRV_VERSION=20
-	provides = X-ABI-XINPUT_VERSION=22.1
-	provides = X-ABI-EXTENSION_VERSION=9.0
+	depends = xf86-input-driver
+	provides = X-ABI-VIDEODRV_VERSION=23
+	provides = X-ABI-XINPUT_VERSION=24.1
+	provides = X-ABI-EXTENSION_VERSION=10.0
 	provides = x-server
 	provides = xorg-server
 	conflicts = nvidia-utils<=331.20
@@ -94,13 +91,13 @@ pkgname = xorg-server-nosystemd
 
 pkgname = xorg-server-xephyr-nosystemd
 	pkgdesc = A nested X server that runs as an X application
-	depends = libxfont
+	depends = libxfont2
 	depends = libgl
 	depends = libepoxy
-	depends = libgcrypt
+	depends = libunwind
 	depends = libxv
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-nosystemd
 	depends = xcb-util-image
 	depends = xcb-util-renderutil
 	depends = xcb-util-wm
@@ -111,27 +108,25 @@ pkgname = xorg-server-xephyr-nosystemd
 
 pkgname = xorg-server-xdmx-nosystemd
 	pkgdesc = Distributed Multihead X Server and utilities
-	depends = libxfont
+	depends = libxfont2
 	depends = libxi
-	depends = libgcrypt
 	depends = libxaw
 	depends = libxrender
 	depends = libdmx
 	depends = libxfixes
+	depends = libunwind
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-nosystemd
 	provides = xorg-server-xdmx
 	conflicts = xorg-server-xdmx
 	replaces = xorg-server-xdmx
 
 pkgname = xorg-server-xvfb-nosystemd
 	pkgdesc = Virtual framebuffer X server
-	depends = libxfont
-	depends = libxdmcp
-	depends = libxau
-	depends = libgcrypt
+	depends = libxfont2
+	depends = libunwind
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-nosystemd
 	depends = xorg-xauth
 	depends = libgl
 	provides = xorg-server-xvfb
@@ -140,22 +135,23 @@ pkgname = xorg-server-xvfb-nosystemd
 
 pkgname = xorg-server-xnest-nosystemd
 	pkgdesc = A nested X server that runs as an X application
-	depends = libxfont
+	depends = libxfont2
 	depends = libxext
-	depends = libgcrypt
+	depends = libunwind
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-nosystemd
 	provides = xorg-server-xnest
 	conflicts = xorg-server-xnest
 	replaces = xorg-server-xnest
 
 pkgname = xorg-server-xwayland-nosystemd
 	pkgdesc = run X clients under wayland
-	depends = libxfont
+	depends = libxfont2
 	depends = libepoxy
+	depends = libunwind
 	depends = libgl
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-nosystemd
 	provides = xorg-server-xwayland
 	conflicts = xorg-server-xwayland
 	replaces = xorg-server-xwayland
@@ -166,7 +162,6 @@ pkgname = xorg-server-common-nosystemd
 	depends = xorg-xkbcomp
 	depends = xorg-setxkbmap
 	depends = xorg-fonts-misc
-	depends = libunwind
 	provides = xorg-server-common
 	conflicts = xorg-server-common
 	replaces = xorg-server-common
diff --git a/PKGBUILD b/PKGBUILD
index beb5bac3c71f..41c66992e3c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,31 +7,30 @@ pkgbase=xorg-server-nosystemd
 pkgname=('xorg-server-nosystemd' 'xorg-server-xephyr-nosystemd' 'xorg-server-xdmx-nosystemd' 'xorg-server-xvfb-nosystemd'
 		 'xorg-server-xnest-nosystemd' 'xorg-server-xwayland-nosystemd' 'xorg-server-common-nosystemd' 'xorg-server-devel-nosystemd')
 _pkgbase=xorg-server
-pkgver=1.18.4
-pkgrel=2
+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' 'libxfont' 'renderproto' 'libpciaccess' 'libxv'
+             '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')
-source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig}
+             'libxshmfence' 'libunwind' '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=('278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8'
+sha256sums=('79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb'
             'SKIP'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
 
-
 build() {
   cd "${_pkgbase}-${pkgver}"
   ./configure --prefix=/usr \
@@ -83,8 +82,7 @@ build() {
 
 package_xorg-server-common-nosystemd() {
   pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc'
-           'libunwind')
+  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
   provides=('xorg-server-common')
   conflicts=('xorg-server-common')
   replaces=('xorg-server-common')
@@ -103,10 +101,10 @@ package_xorg-server-common-nosystemd() {
 
 package_xorg-server-nosystemd() {
   pkgdesc="Xorg X server"
-  depends=('libepoxy' 'libxdmcp' 'libxfont' 'libpciaccess' 'libdrm' 'pixman' 'libgcrypt' 'libxau' 'xorg-server-common' 'xf86-input-evdev' 'libxshmfence' 'libgl')
+  depends=('libepoxy' 'libxfont2' 'pixman' 'xorg-server-common-nosystemd' 'libunwind' 'dbus-nosystemd' 'libgl' 'xf86-input-driver')
   # 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=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server' 'xorg-server')
+  provides=('X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server')
   conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server')
   replaces=('glamor-egl' 'xf86-video-modesetting' 'xorg-server')
   install=xorg-server.install
@@ -136,7 +134,7 @@ package_xorg-server-nosystemd() {
 
 package_xorg-server-xephyr-nosystemd() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=('libxfont' 'libgl' 'libepoxy' 'libgcrypt' 'libxv' 'pixman' 'xorg-server-common' 'xcb-util-image'
+  depends=('libxfont2' 'libgl' 'libepoxy' 'libunwind' 'libxv' 'pixman' 'xorg-server-common-nosystemd' 'xcb-util-image'
            'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms')
   provides=('xorg-server-xephyr')
   conflicts=('xorg-server-xephyr')
@@ -150,7 +148,7 @@ package_xorg-server-xephyr-nosystemd() {
 
 package_xorg-server-xvfb-nosystemd() {
   pkgdesc="Virtual framebuffer X server"
-  depends=('libxfont' 'libxdmcp' 'libxau' 'libgcrypt' 'pixman' 'xorg-server-common' 'xorg-xauth' 'libgl')
+  depends=('libxfont2' 'libunwind' 'pixman' 'xorg-server-common-nosystemd' 'xorg-xauth' 'libgl')
   provides=('xorg-server-xvfb')
   conflicts=('xorg-server-xvfb')
   replaces=('xorg-server-xvfb')
@@ -166,7 +164,7 @@ package_xorg-server-xvfb-nosystemd() {
 
 package_xorg-server-xnest-nosystemd() {
   pkgdesc="A nested X server that runs as an X application"
-  depends=('libxfont' 'libxext' 'libgcrypt' 'pixman' 'xorg-server-common')
+  depends=('libxfont2' 'libxext' 'libunwind' 'pixman' 'xorg-server-common-nosystemd')
   provides=('xorg-server-xnest')
   conflicts=('xorg-server-xnest')
   replaces=('xorg-server-xnest')
@@ -179,7 +177,7 @@ package_xorg-server-xnest-nosystemd() {
 
 package_xorg-server-xdmx-nosystemd() {
   pkgdesc="Distributed Multihead X Server and utilities"
-  depends=('libxfont' 'libxi' 'libgcrypt' 'libxaw' 'libxrender' 'libdmx' 'libxfixes' 'pixman' 'xorg-server-common')
+  depends=('libxfont2' 'libxi' 'libxaw' 'libxrender' 'libdmx' 'libxfixes' 'libunwind' 'pixman' 'xorg-server-common-nosystemd')
   provides=('xorg-server-xdmx')
   conflicts=('xorg-server-xdmx')
   replaces=('xorg-server-xdmx')
@@ -192,7 +190,7 @@ package_xorg-server-xdmx-nosystemd() {
 
 package_xorg-server-xwayland-nosystemd() {
   pkgdesc="run X clients under wayland"
-  depends=('libxfont' 'libepoxy' 'libgl' 'pixman' 'xorg-server-common')
+  depends=('libxfont2' 'libepoxy' 'libunwind' 'libgl' 'pixman' 'xorg-server-common-nosystemd')
   provides=('xorg-server-xwayland')
   conflicts=('xorg-server-xwayland')
   replaces=('xorg-server-xwayland')