Sync .SRCINFO

2 files changed, 212 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8185271adf2..49d72f466351 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,6 +4,7 @@ pkgbase = xorg-server-git
 	url = http://cgit.freedesktop.org/xorg/xserver/
 	arch = i686
 	arch = x86_64
+	groups = xorg
 	license = custom
 	makedepends = pixman
 	makedepends = libx11
@@ -24,7 +25,7 @@ pkgbase = xorg-server-git
 	makedepends = resourceproto
 	makedepends = xineramaproto
 	makedepends = libxkbfile
-	makedepends = libxfont
+	makedepends = libxfont2
 	makedepends = renderproto
 	makedepends = libpciaccess
 	makedepends = libxv
@@ -52,9 +53,9 @@ pkgbase = xorg-server-git
 	makedepends = dri3proto
 	makedepends = libxshmfence
 	makedepends = libunwind
-	makedepends = git
-	makedepends = xfont2-git
+	makedepends = systemd
 	makedepends = wayland-protocols
+	makedepends = git
 	source = git://anongit.freedesktop.org/xorg/xserver
 	source = xvfb-run
 	source = xvfb-run.1
@@ -65,40 +66,37 @@ pkgbase = xorg-server-git
 pkgname = xorg-server-git
 	pkgdesc = Xorg X server - Git
 	install = xorg-server-git.install
-	groups = xorg
 	depends = libepoxy
-	depends = libxdmcp
-	depends = libxfont
 	depends = libpciaccess
-	depends = libdrm
+	depends = libxfont2
 	depends = pixman
-	depends = libgcrypt
-	depends = libxau
 	depends = xorg-server-common-git
-	depends = libxshmfence
+	depends = libunwind
+	depends = dbus
 	depends = libgl
-	depends = xf86-input-driver
+	depends = xf86-input-libinput
 	provides = X-ABI-VIDEODRV_VERSION=24.0
 	provides = X-ABI-XINPUT_VERSION=24.1
 	provides = X-ABI-EXTENSION_VERSION=10.0
-	provides = x-server
 	provides = xorg-server
+	provides = x-server
+	conflicts = xorg-server
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
 	conflicts = xf86-video-modesetting
-	conflicts = xorg-server
 	replaces = glamor-egl
 	replaces = xf86-video-modesetting
 
 pkgname = xorg-server-xephyr-git
 	pkgdesc = A nested X server that runs as an X application - Git
-	depends = libxfont
+	depends = libxfont2
 	depends = libgl
 	depends = libepoxy
-	depends = libgcrypt
+	depends = libunwind
+	depends = libsystemd
 	depends = libxv
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-git
 	depends = xcb-util-image
 	depends = xcb-util-renderutil
 	depends = xcb-util-wm
@@ -108,13 +106,13 @@ pkgname = xorg-server-xephyr-git
 
 pkgname = xorg-server-xdmx-git
 	pkgdesc = Distributed Multihead X Server and utilities - Git
-	depends = libxfont
+	depends = libxfont2
 	depends = libxi
-	depends = libgcrypt
 	depends = libxaw
 	depends = libxrender
 	depends = libdmx
 	depends = libxfixes
+	depends = libunwind
 	depends = pixman
 	depends = xorg-server-common-git
 	provides = xorg-server-xdmx
@@ -122,10 +120,9 @@ pkgname = xorg-server-xdmx-git
 
 pkgname = xorg-server-xvfb-git
 	pkgdesc = Virtual framebuffer X server - Git
-	depends = libxfont
-	depends = libxdmcp
-	depends = libxau
-	depends = libgcrypt
+	depends = libxfont2
+	depends = libunwind
+	depends = libsystemd
 	depends = pixman
 	depends = xorg-server-common-git
 	depends = xorg-xauth
@@ -135,9 +132,9 @@ pkgname = xorg-server-xvfb-git
 
 pkgname = xorg-server-xnest-git
 	pkgdesc = A nested X server that runs as an X application - Git
-	depends = libxfont
+	depends = libxfont2
 	depends = libxext
-	depends = libgcrypt
+	depends = libunwind
 	depends = pixman
 	depends = xorg-server-common-git
 	depends = libsystemd
@@ -160,7 +157,6 @@ pkgname = xorg-server-common-git
 	depends = xorg-xkbcomp
 	depends = xorg-setxkbmap
 	depends = xorg-fonts-misc
-	depends = libunwind
 	provides = xorg-server-common
 	conflicts = xorg-server-common
 
diff --git a/.SRCINFOa b/.SRCINFOa
new file mode 100644
index 000000000000..e8185271adf2
--- /dev/null
+++ b/.SRCINFOa
@@ -0,0 +1,191 @@
+pkgbase = xorg-server-git
+	pkgver = 1.19.0.99.r15877.g3f9507e
+	pkgrel = 1
+	url = http://cgit.freedesktop.org/xorg/xserver/
+	arch = i686
+	arch = x86_64
+	license = custom
+	makedepends = pixman
+	makedepends = libx11
+	makedepends = mesa
+	makedepends = 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 = libxfont
+	makedepends = renderproto
+	makedepends = libpciaccess
+	makedepends = libxv
+	makedepends = xf86dgaproto
+	makedepends = libxmu
+	makedepends = libxrender
+	makedepends = libxi
+	makedepends = dmxproto
+	makedepends = libxaw
+	makedepends = libdmx
+	makedepends = libxtst
+	makedepends = libxres
+	makedepends = xorg-xkbcomp
+	makedepends = xorg-util-macros
+	makedepends = xorg-font-util
+	makedepends = glproto
+	makedepends = dri2proto
+	makedepends = libgcrypt
+	makedepends = libepoxy
+	makedepends = xcb-util
+	makedepends = xcb-util-image
+	makedepends = xcb-util-renderutil
+	makedepends = xcb-util-wm
+	makedepends = xcb-util-keysyms
+	makedepends = dri3proto
+	makedepends = libxshmfence
+	makedepends = libunwind
+	makedepends = git
+	makedepends = xfont2-git
+	makedepends = wayland-protocols
+	source = git://anongit.freedesktop.org/xorg/xserver
+	source = xvfb-run
+	source = xvfb-run.1
+	sha256sums = SKIP
+	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
+	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
+
+pkgname = xorg-server-git
+	pkgdesc = Xorg X server - Git
+	install = xorg-server-git.install
+	groups = xorg
+	depends = libepoxy
+	depends = libxdmcp
+	depends = libxfont
+	depends = libpciaccess
+	depends = libdrm
+	depends = pixman
+	depends = libgcrypt
+	depends = libxau
+	depends = xorg-server-common-git
+	depends = libxshmfence
+	depends = libgl
+	depends = xf86-input-driver
+	provides = X-ABI-VIDEODRV_VERSION=24.0
+	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
+	conflicts = glamor-egl
+	conflicts = xf86-video-modesetting
+	conflicts = xorg-server
+	replaces = glamor-egl
+	replaces = xf86-video-modesetting
+
+pkgname = xorg-server-xephyr-git
+	pkgdesc = A nested X server that runs as an X application - Git
+	depends = libxfont
+	depends = libgl
+	depends = libepoxy
+	depends = libgcrypt
+	depends = libxv
+	depends = pixman
+	depends = xorg-server-common
+	depends = xcb-util-image
+	depends = xcb-util-renderutil
+	depends = xcb-util-wm
+	depends = xcb-util-keysyms
+	provides = xorg-server-xephyr
+	conflicts = xorg-server-xephyr
+
+pkgname = xorg-server-xdmx-git
+	pkgdesc = Distributed Multihead X Server and utilities - Git
+	depends = libxfont
+	depends = libxi
+	depends = libgcrypt
+	depends = libxaw
+	depends = libxrender
+	depends = libdmx
+	depends = libxfixes
+	depends = pixman
+	depends = xorg-server-common-git
+	provides = xorg-server-xdmx
+	conflicts = xorg-server-xdmx
+
+pkgname = xorg-server-xvfb-git
+	pkgdesc = Virtual framebuffer X server - Git
+	depends = libxfont
+	depends = libxdmcp
+	depends = libxau
+	depends = libgcrypt
+	depends = pixman
+	depends = xorg-server-common-git
+	depends = xorg-xauth
+	depends = libgl
+	provides = xorg-server-xvfb
+	conflicts = xorg-server-xvfb
+
+pkgname = xorg-server-xnest-git
+	pkgdesc = A nested X server that runs as an X application - Git
+	depends = libxfont
+	depends = libxext
+	depends = libgcrypt
+	depends = pixman
+	depends = xorg-server-common-git
+	depends = libsystemd
+	provides = xorg-server-xnest
+	conflicts = xorg-server-xnest
+
+pkgname = xorg-server-xwayland-git
+	pkgdesc = Run X clients under Wayland - Git
+	depends = libxfont
+	depends = libepoxy
+	depends = libgl
+	depends = pixman
+	depends = xorg-server-common-git
+	provides = xorg-server-xwayland
+	conflicts = xorg-server-xwayland
+
+pkgname = xorg-server-common-git
+	pkgdesc = Xorg server common files - Git
+	depends = xkeyboard-config
+	depends = xorg-xkbcomp
+	depends = xorg-setxkbmap
+	depends = xorg-fonts-misc
+	depends = libunwind
+	provides = xorg-server-common
+	conflicts = xorg-server-common
+
+pkgname = xorg-server-devel-git
+	pkgdesc = Development files for the X.Org X server - Git
+	depends = xproto
+	depends = randrproto
+	depends = renderproto
+	depends = xextproto
+	depends = inputproto
+	depends = kbproto
+	depends = fontsproto
+	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
+	conflicts = xorg-server-devel
+