Xorg: update Xserver, Xlibs and drivers

26 files changed, 108 insertions, 102 deletions

diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 42a757d51..138e69660 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -4,12 +4,12 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		inputproto
-PKG_VERSION:=		2.3.1
+PKG_VERSION:=		2.3.2
 PKG_RELEASE:=		1
+PKG_HASH:=		10eaadd531f38f7c92ab59ef0708ca195caf3164a75c4ed99f0c04f2913f6ef3
 PKG_DESCR:=		input extension headers
 PKG_SECTION:=		dev/header
 PKG_BUILDDEP:=		inputproto-host
-PKG_HASH:=		23f65ac55c36ea8c378e30b4a4fd85317c95923134e3fe46569741b94c8ed4ca
 PKG_SITES:=		http://www.x.org/releases/individual/proto/
 PKG_OPTS:=		dev devonly
 
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index b90f52885..f7aae2149 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
-PKG_VERSION:=		1.6.3
+PKG_VERSION:=		1.6.4
 PKG_RELEASE:=		1
-PKG_HASH:=		0b03b9d22f4c9e59b4ba498f294e297f013cae27050dfa0f3496640200db5376
+PKG_HASH:=		5d7fbb9e15c27900ea8963218a59750b674a8d7c94161b66e96fcfbdaa1c6263
 PKG_DESCR:=		x11 client-side library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libX11-host xproto xextproto xtrans libXdmcp libXau xcb-proto
@@ -26,7 +26,6 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-XAKE_FLAGS+=		V=1
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-xf86bigfont \
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index 2c8fe9631..a4ba595bf 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXfixes
-PKG_VERSION:=		5.0.1
+PKG_VERSION:=		5.0.3
 PKG_RELEASE:=		1
-PKG_HASH:=		81b692856c0e7ab2778a34a32aa6b3f455b9b58cf388f009cba872ed933ae9c0
+PKG_HASH:=		9ab6c13590658501ce4bd965a8a5d32ba4d8b3bb39a5a5bc9901edffc5666570
 PKG_DESCR:=		x11 fixes library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		fixesproto xextproto xproto libX11
diff --git a/package/libXfixes/patches/patch-src_Xfixesint_h b/package/libXfixes/patches/patch-src_Xfixesint_h
deleted file mode 100644
index bb17cef2c..000000000
--- a/package/libXfixes/patches/patch-src_Xfixesint_h
+++ /dev/null
@@ -1,21 +0,0 @@
---- libXfixes-5.0.1.orig/src/Xfixesint.h	2013-05-29 06:11:24.000000000 +0200
-+++ libXfixes-5.0.1/src/Xfixesint.h	2015-12-31 00:01:21.448241629 +0100
-@@ -60,18 +60,4 @@ XFixesFindDisplay (Display *dpy);
- #define XFixesSimpleCheckExtension(dpy,i) \
-   if (!XFixesHasExtension(i)) { return; }
- 
--#ifndef HAVE__XEATDATAWORDS
--#include <X11/Xmd.h>  /* for LONG64 on 64-bit platforms */
--#include <limits.h>
--
--static inline void _XEatDataWords(Display *dpy, unsigned long n)
--{
--# ifndef LONG64
--    if (n >= (ULONG_MAX >> 2))
--        _XIOError(dpy);
--# endif
--    _XEatData (dpy, n << 2);
--}
--#endif
--
- #endif /* _XFIXESINT_H_ */
diff --git a/package/libXfont2/Makefile b/package/libXfont2/Makefile
new file mode 100644
index 000000000..1276c3eb9
--- /dev/null
+++ b/package/libXfont2/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		libXfont2
+PKG_VERSION:=		2.0.1
+PKG_RELEASE:=		1
+PKG_HASH:=		381b6b385a69343df48a082523c856aed9042fbbc8ee0a6342fb502e4321230a
+PKG_DESCR:=		x11 font library (v2)
+PKG_SECTION:=		x11/libs
+PKG_DEPENDS:=		libfreetype
+PKG_BUILDDEP:=		freetype fontcacheproto fontsproto libfontenc xtrans
+PKG_SITES:=		http://www.x.org/releases/individual/lib/
+PKG_LIBNAME:=		libxfont2
+PKG_OPTS:=		dev
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXFONT2,libxfont2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ENV+=		ac_cv_path_XMLTO=true
+
+libxfont2-install:
+	${INSTALL_DIR} ${IDIR_LIBXFONT2}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libXfont2.so* ${IDIR_LIBXFONT2}/usr/lib
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 64fe56fb1..e94818026 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXi
-PKG_VERSION:=		1.7.6
+PKG_VERSION:=		1.7.8
 PKG_RELEASE:=		1
-PKG_HASH:=		4e88fa7decd287e58140ea72238f8d54e4791de302938c83695fc0c9ac102b7e
+PKG_HASH:=		7466d0c626a9cc2e53fd78c811815e82924cd7582236a82401df3d282a9c2889
 PKG_DESCR:=		client interface to the xinput extension
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		xproto xextproto libXext libXfixes
diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile
index 36c501de0..85340713e 100644
--- a/package/libXrandr/Makefile
+++ b/package/libXrandr/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXrandr
-PKG_VERSION:=		1.5.0
+PKG_VERSION:=		1.5.1
 PKG_RELEASE:=		1
-PKG_HASH:=		1b594a149e6b124aab7149446f2fd886461e2935eca8dca43fe83a70cf8ec451
+PKG_HASH:=		2baa7fb3eca78fe7e11a09b373ba898b717f7eeba4a4bfd68187e04b4789b0d3
 PKG_DESCR:=		xrandr library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		randrproto libXrender
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index c088c3a2a..b19a563f0 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXrender
-PKG_VERSION:=		0.9.9
+PKG_VERSION:=		0.9.10
 PKG_RELEASE:=		1
-PKG_HASH:=		beeac64ff8d225f775019eb7c688782dee9f4cc7b412a65538f8dde7be4e90fe
+PKG_HASH:=		770527cce42500790433df84ec3521e8bf095dfe5079454a92236494ab296adf
 PKG_DESCR:=		x11 rendering library
 PKG_SECTION:=		x11/libs
 HOST_BUILDDEP:=		renderproto-host xproto-host xextproto-host libXau-host
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index fc5ae719e..ec7c7bcb5 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXtst
-PKG_VERSION:=		1.2.2
-PKG_RELEASE:=		2
-PKG_HASH:=		221838960c7b9058cd6795c1c3ee8e25bae1c68106be314bc3036a4f26be0e6c
+PKG_VERSION:=		1.2.3
+PKG_RELEASE:=		1
+PKG_HASH:=		a0c83acce02d4923018c744662cb28eb0dbbc33b4adc027726879ccf68fbc2c2
 PKG_DESCR:=		client interface to the record extension to the x protocol
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP+=		recordproto libXi
diff --git a/package/libXtst/patches/patch-src_XRecord_c b/package/libXtst/patches/patch-src_XRecord_c
deleted file mode 100644
index 865673b03..000000000
--- a/package/libXtst/patches/patch-src_XRecord_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libXtst-1.2.2.orig/src/XRecord.c	2013-05-31 04:09:49.000000000 +0200
-+++ libXtst-1.2.2/src/XRecord.c	2015-12-31 09:10:38.348187290 +0100
-@@ -61,17 +61,6 @@ from The Open Group.
- #include <X11/extensions/record.h>
- #include <limits.h>
- 
--#ifndef HAVE__XEATDATAWORDS
--static inline void _XEatDataWords(Display *dpy, unsigned long n)
--{
--# ifndef LONG64
--    if (n >= (ULONG_MAX >> 2))
--        _XIOError(dpy);
--# endif
--    _XEatData (dpy, n << 2);
--}
--#endif
--
- static XExtensionInfo _xrecord_info_data;
- static XExtensionInfo *xrecord_info = &_xrecord_info_data;
- static const char *xrecord_extension_name = RECORD_NAME;
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index aa24d52ac..4693d5a12 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXv
-PKG_VERSION:=		1.0.10
+PKG_VERSION:=		1.0.11
 PKG_RELEASE:=		1
-PKG_HASH:=		89a664928b625558268de81c633e300948b3752b0593453d7815f8775bab5293
+PKG_HASH:=		c4112532889b210e21cf05f46f0f2f8354ff7e1b58061e12d7a76c95c0d47bb1
 PKG_DESCR:=		xvideo extensions library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libX11 videoproto libXext
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index 511bedcbf..a8b52760d 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libxcb
-PKG_VERSION:=		1.10
+PKG_VERSION:=		1.12
 PKG_RELEASE:=		1
-PKG_HASH:=		c4cd324ac7bf810e95b1c1b56f413b13850eaa1d7eca60ddc46c61ac9d5f4441
+PKG_HASH:=		092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06
 PKG_DESCR:=		interface to the x window system protocol
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP+=		python2 libpthread-stubs libxslt libXau xcb-proto
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index f62730753..936b26546 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		v4l-utils
-PKG_VERSION:=		1.8.0
+PKG_VERSION:=		1.10.1
 PKG_RELEASE:=		1
-PKG_HASH:=		50c7be033636d878e902dad0a207fc9f6d831bec27f1b410f1102acddaa5565e
+PKG_HASH:=		6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0
 PKG_DESCR:=		video4linux utilities
 PKG_SECTION:=		mm/video
 PKG_BUILDDEP:=		libjpeg-turbo
diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile
index a47e923a0..8f2e6cf9d 100644
--- a/package/videoproto/Makefile
+++ b/package/videoproto/Makefile
@@ -4,11 +4,11 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		videoproto
-PKG_VERSION:=		2.3.2
+PKG_VERSION:=		2.3.3
 PKG_RELEASE:=		1
+PKG_HASH:=		df8dfeb158767f843054248d020e291a2c40f7f5e0ac6d8706966686fee7c5c0
 PKG_DESCR:=		x11 video protocol headers
 PKG_SECTION:=		dev/header
-PKG_HASH:=		70eaa52beb83d07b71d81b9e4a396ba53c825472c4998f9e7b9889325b2a4346
 PKG_SITES:=		http://www.x.org/releases/individual/proto/
 PKG_OPTS:=		dev devonly
 
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index aa1db6fd6..67947e882 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -4,11 +4,11 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xcb-proto
-PKG_VERSION:=		1.10
+PKG_VERSION:=		1.12
 PKG_RELEASE:=		1
+PKG_HASH:=		cfa49e65dd390233d560ce4476575e4b76e505a0e0bacdfb5ba6f8d0af53fd59
 PKG_DESCR:=		xml-xcb protocol descriptions
 PKG_SECTION:=		dev/header
-PKG_HASH:=		d0e6a2c8aed8af430edd011bb139368480d556b0829adcf1e1ca5708d1fc04b9
 HOST_BUILDDEP:=		python2-host
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev devonly
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 12ba75afa..5931ff84b 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-evdev
-PKG_VERSION:=		2.7.0
+PKG_VERSION:=		2.10.4
 PKG_RELEASE:=		1
-PKG_HASH:=		cf4bdbd4b40f05d4e29cd6494c64f092667202b0834c54bdaed448463622807b
+PKG_HASH:=		1a1b69daf41eac965f1cf0be721ebc340b2860c066147cb483f0e8f0ab7dd6a2
 PKG_DESCR:=		x11 driver for evdev
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libudev
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		xorg-server eudev
 PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_LIBC_DEPENDS:=	glibc
-PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
 
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index eb54c5ccd..5eac75d56 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-keyboard
-PKG_VERSION:=		1.8.1
+PKG_VERSION:=		1.9.0
 PKG_RELEASE:=		1
-PKG_HASH:=		8f7c645f4b17ed0a0607c92dfac87deafee9f3b975df6f87e0f606bab49e7754
+PKG_HASH:=		407cf742246708843126617feee85b30a8b7b7567b3bc507a6cfda7443a8d9ac
 PKG_DESCR:=		x11 driver for keyboard
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 5eba9b887..6bef7daef 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-mouse
-PKG_VERSION:=		1.9.1
+PKG_VERSION:=		1.9.2
 PKG_RELEASE:=		1
-PKG_HASH:=		e348aff7068affbc53620cc6ee67821064b32ace681c7c200c6ad3e74719b8da
+PKG_HASH:=		82bb4b01b26853b180e87ab97510316c741af2bded359c994c0d689386947095
 PKG_DESCR:=		x11 driver for mouse
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 59ada0b5d..d509f038b 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-ati
-PKG_VERSION:=		7.4.0
+PKG_VERSION:=		7.8.0
 PKG_RELEASE:=		1
-PKG_HASH:=		dc0a00d1ea367e5f3e2baa0c1a0f8330c217f1d8c9d6e380757b945fb3bf6c61
+PKG_HASH:=		da8c721f04c0cdb0b05b084581d2c1457543351a98de4aa0de3e3852512389b6
 PKG_DESCR:=		x11 driver for ati vga chip
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libdrm mesa libudev
@@ -23,7 +23,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_ATI,xf86-video-ati,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--enable-dri
+CONFIGURE_ARGS+=	--enable-dri \
+			--disable-glamor
 
 xf86-video-ati-install:
 	${INSTALL_DIR} ${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index fe9e0d585..0c84eac63 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-cirrus
-PKG_VERSION:=		1.5.2
+PKG_VERSION:=		1.5.3
 PKG_RELEASE:=		1
-PKG_HASH:=		7c882c9064f58edf6cb08ef889b6e1d9e7bf6be0eb0002c052d5b4cb6a9bf74d
+PKG_HASH:=		4ff2024c1645f30931f0871f36484aed85ef35aa04852faa7082dbf4ee2c83a5
 PKG_DESCR:=		x11 driver for cirrus vga chips
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
@@ -14,7 +14,6 @@ PKG_BUILDDEP:=		xorg-server
 PKG_NEEDS:=		c++
 PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
-PKG_SYSTEM_DEPENDS:=	qemu-x86 qemu-x86_64
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index db44dca8c..be0a6461e 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-geode
-PKG_VERSION:=		2.11.15
+PKG_VERSION:=		2.11.18
 PKG_RELEASE:=		1
-PKG_HASH:=		43e17e901eb8cefa985480680f5d02a78d1fae01327b663a7b3459ef98d75cba
+PKG_HASH:=		60df188a72ef2b337e6cbc73684edf04b75fe4dd20555460005e1a19814b9046
 PKG_DESCR:=		x11 driver for amd geode vga chip
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
@@ -14,7 +14,6 @@ PKG_BUILDDEP:=		xorg-server
 PKG_NEEDS:=		c++
 PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
-PKG_SYSTEM_DEPENDS:=	pcengines-alix1c
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-geode/patches/patch-src_compat-api_h b/package/xf86-video-geode/patches/patch-src_compat-api_h
new file mode 100644
index 000000000..244111bdd
--- /dev/null
+++ b/package/xf86-video-geode/patches/patch-src_compat-api_h
@@ -0,0 +1,30 @@
+--- xf86-video-geode-2.11.18.orig/src/compat-api.h	2016-02-03 19:46:59.000000000 +0100
++++ xf86-video-geode-2.11.18/src/compat-api.h	2016-11-28 08:39:15.624653928 +0100
+@@ -53,8 +53,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScrn, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScrn
+ #define CLOSE_SCREEN_ARGS scrnIndex, pScrn
+@@ -89,8 +94,13 @@
+ 
+ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScrn, int argc, char **argv
+ 
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
++#define BLOCKHANDLER_ARGS arg, pTimeout
++#else
+ #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+ #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
++#endif
+ 
+ #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScrn
+ #define CLOSE_SCREEN_ARGS pScrn
diff --git a/package/xf86-video-geode/patches/patch-src_geode_dcon_c b/package/xf86-video-geode/patches/patch-src_geode_dcon_c
deleted file mode 100644
index a80c00dfe..000000000
--- a/package/xf86-video-geode/patches/patch-src_geode_dcon_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- xf86-video-geode-2.11.15.orig/src/geode_dcon.c	2013-10-09 13:47:09.000000000 +0200
-+++ xf86-video-geode-2.11.15/src/geode_dcon.c	2014-05-17 18:56:45.000000000 +0200
-@@ -29,6 +29,7 @@
- 
- /* Includes that are used by all drivers */
- #include <xf86.h>
-+#include <xf86Modes.h>
- #include <xf86_OSproc.h>
- #include <compiler.h>
- 
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index 69071d644..e8de7f22e 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-intel
-PKG_VERSION:=		82293901da23d79fd074e5255fda5c95405d52de
+PKG_VERSION:=		bde946054efbc1c7ae1483b84c3b4fa3c2c7e2ec
 PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_HASH:=		b30dfa89f26f0f88c561f615d3c260d57bc095870d77b4ee565263c31bc52ce0
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index a9fc009a0..730c57315 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,19 +4,19 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.18.0
+PKG_VERSION:=		1.19.0
 PKG_RELEASE:=		1
-PKG_HASH:=		a1bfa91ecbee765e3935dbb6a9204668ab84eb31a6978815c97ab6064585d71b
+PKG_HASH:=		c3e8660a74e2902e6ecaa66aa774e15d1ab66c2c19a023bd9e74e651ef005a43
 PKG_DESCR:=		xorg server
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		libxfont pixman libpciaccess libxkbfile
+PKG_DEPENDS:=		libxfont2 pixman libpciaccess libxkbfile
 PKG_DEPENDS+=		libfontenc xkeyboard-config xkbcomp libxau libxaw
 PKG_DEPENDS+=		libxmu libxpm libxrender libxt libxxf86dga libxext
 PKG_DEPENDS+=		libxdmcp libxv libsm libice libx11 libxcb
 PKG_DEPENDS+=		libxshmfence libfreetype libfontenc libpciaccess
 PKG_BUILDDEP:=		libX11 randrproto renderproto fixesproto damageproto
 PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
-PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont pixman
+PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont2 pixman
 PKG_BUILDDEP+=		libpciaccess xf86dgaproto recordproto
 PKG_BUILDDEP+=		xineramaproto presentproto xf86driproto glproto mesa
 PKG_NEEDS:=		threads c++
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--enable-dpms \
 			--enable-xinerama \
 			--disable-docs \
-			--disable-aiglx \
+			--disable-glamor \
 			--disable-config-hal \
 			--disable-config-udev \
 			--disable-xace \
@@ -80,6 +80,7 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--enable-dri2 \
 			--enable-dri3 \
 			--enable-glx \
+			--enable-aiglx \
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index 8f749c49d..54948b669 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -4,11 +4,11 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xproto
-PKG_VERSION:=		7.0.28
+PKG_VERSION:=		7.0.31
 PKG_RELEASE:=		1
+PKG_HASH:=		6d755eaae27b45c5cc75529a12855fed5de5969b367ed05003944cf901ed43c7
 PKG_DESCR:=		x window system core protocol headers
 PKG_SECTION:=		dev/header
-PKG_HASH:=		6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e81ed7aaf08f2bf6dbcfed
 PKG_BUILDDEP:=		xproto-host
 PKG_SITES:=		http://www.x.org/releases/individual/proto/
 PKG_OPTS:=		dev devonly