Sync

2 files changed, 29 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49d72f466351..00fc2aa0c742 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -67,7 +67,6 @@ pkgname = xorg-server-git
 	pkgdesc = Xorg X server - Git
 	install = xorg-server-git.install
 	depends = libepoxy
-	depends = libpciaccess
 	depends = libxfont2
 	depends = pixman
 	depends = xorg-server-common-git
@@ -75,9 +74,11 @@ pkgname = xorg-server-git
 	depends = dbus
 	depends = libgl
 	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
+	depends = libpciaccess
+	depends = libdrm
+	depends = libxshmfence
+	provides = 
+	provides = X-ABI-_VERSION=grep: xserver/hw/xfree86/common/xf86Module.h: No such file or directory
 	provides = xorg-server
 	provides = x-server
 	conflicts = xorg-server
diff --git a/.SRCINFOa b/.SRCINFOa
index e8185271adf2..91b130302ed7 100644
--- a/.SRCINFOa
+++ b/.SRCINFOa
@@ -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,39 @@ 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
+	depends = libpciaccess
+	depends = libdrm
+	depends = libxshmfence
 	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 +108,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 +122,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 +134,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 +159,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