Merge branch 'master' of git+ssh://openadk.org/git/openadk

update Xorg / Mesa

Conflicts:
	TODO

30 files changed, 70 insertions, 409 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index c6e1811a5..17abe52ef 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -4,17 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
-PKG_VERSION:=		9.2.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		df801a975045150790e10e2ccf32193f
+PKG_VERSION:=		10.1.0
+PKG_SUBVER:=		10.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		08e796ec7122aa299d32d4f67a254315
 PKG_DESCR:=		MESA 3D graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxdamage libxfixes libdrm libxxf86vm libexpat
 PKG_DEPENDS+=		libxml2 libxml2-python
-PKG_BUILDDEP:=		autotool python2 libxml2 libXdamage libXfixes libXxf86vm libdrm
-PKG_BUILDDEP+=		dri2proto glproto expat libXext
+PKG_BUILDDEP:=		autotool python2 libxml2 libXdamage libXfixes
+PKG_BUILDDEP+=		libXxf86vm libdrm dri2proto glproto expat libXext
+PKG_BUILDDEP+=		eudev dri3proto presentproto xcb-proto libxcb
+PKG_BUILDDEP+=		libxshmfence
 PKG_URL:=		http://www.mesa3d.org/
-PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
+PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/
 PKG_NEED_CXX:=		1
 PKG_LIBNAME:=		mesalib
 PKG_OPTS:=		dev
@@ -58,6 +61,8 @@ mesalib-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
 		$(IDIR_MESALIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libglapi.so* \
+		$(IDIR_MESALIB)/usr/lib
 	${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \
 		${IDIR_MESALIB}/usr/lib/dri/
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index 402144bfd..f42ef212e 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dri2proto
-PKG_VERSION:=		2.6
+PKG_VERSION:=		2.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		873142af5db695537cfe05e01d13541f
-PKG_DESCR:=		DRI protocol headers
+PKG_MD5SUM:=		19ea18f63d8ae8053c9fa84b60365b77
+PKG_DESCR:=		DRI2 protocol headers
 PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=              dev devonly
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index 6c3e5e715..437d208e6 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -4,11 +4,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		glproto
-PKG_VERSION:=		1.4.15
+PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_DESCR:=		OpenGL headers
 PKG_SECTION:=		devel
-PKG_MD5SUM:=		be7c4e3c289db480b9e1238c03637eb7
+PKG_MD5SUM:=		d69554c1b51a83f2c6976a640819911b
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 53180cfbe..6f873ba0b 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		inputproto
-PKG_VERSION:=		2.2
+PKG_VERSION:=		2.3
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Input Extension headers
 PKG_SECTION:=		devel
 PKG_BUILDDEP:=		inputproto-host
-PKG_MD5SUM:=		e0047823230413e67d74e92af77fbe58
+PKG_MD5SUM:=		5ea366d32a9a78d6204a47ea35d9dc5c
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 6a49c346a..2543a7863 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -4,17 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libssh
-PKG_VERSION:=		0.5.3
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
+PKG_VERSION:=		0.6.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		66cf16e77f60913b4d54f18c92cdbf71
 PKG_DESCR:=		SSH library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl zlib
 PKG_BUILDDEP:=		cmake-host openssl zlib
 PKG_URL:=		http://www.libssh.org/
-PKG_SITES:=		http://www.libssh.org/files/0.5/
+PKG_SITES:=		https://red.libssh.org/attachments/download/87/
 PKG_OPTS:=		dev
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
index a67998250..b8e077b94 100644
--- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
+++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
@@ -1,6 +1,6 @@
---- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake	2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake	2013-12-17 13:20:04.073723090 +0100
-@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32)
+--- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake	2014-02-06 10:20:57.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake	2014-03-14 09:10:56.621673326 +0100
+@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32)
              set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
          endif (WITH_FPIC)
  
@@ -9,6 +9,6 @@
 -            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
 -        endif (WITH_STACK_PROTECTOR)
 -
-         check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
-         if (WITH_FORTIFY_SOURCE)
-             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+         if (CMAKE_BUILD_TYPE)
+             string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+             if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel))
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
index 9a140e652..e7fcdfd2d 100644
--- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
+++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
@@ -1,5 +1,5 @@
---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake	2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake	2014-01-11 12:11:52.000000000 +0100
+--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake	2013-12-21 18:37:12.000000000 +0100
++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake	2014-03-14 09:07:03.296701809 +0100
 @@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
          NAMES
              zlib.h
@@ -13,9 +13,9 @@
      )
      mark_as_advanced(ZLIB_INCLUDE_DIR)
  
-@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
-             zlib
+@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
              zlib1
+             zlibd
          PATHS
 +            ${ZLIB_ROOT_DIR}/lib
              /usr/local/lib
diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h
index 8811f79fb..dc60939bf 100644
--- a/package/libssh/patches/patch-include_libssh_libssh_h
+++ b/package/libssh/patches/patch-include_libssh_libssh_h
@@ -1,6 +1,6 @@
---- libssh-0.5.3.orig/include/libssh/libssh.h	2012-11-20 12:41:49.000000000 +0100
-+++ libssh-0.5.3/include/libssh/libssh.h	2014-01-11 12:04:00.000000000 +0100
-@@ -57,6 +57,7 @@
+--- libssh-0.6.3.orig/include/libssh/libssh.h	2014-03-04 13:20:48.000000000 +0100
++++ libssh-0.6.3/include/libssh/libssh.h	2014-03-14 09:07:03.304701842 +0100
+@@ -56,6 +56,7 @@
    typedef unsigned long long uint64_t;
    typedef int mode_t;
  #else /* _MSC_VER */
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index 713a6c3a3..c126b66ac 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libxcb
-PKG_VERSION:=		1.9.1
+PKG_VERSION:=		1.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		324c76024a73dba8a902638696ba87de
+PKG_MD5SUM:=		a484793fbfb974b09d54fa1ebf44b2e4
 PKG_DESCR:=		X11 keyboard library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXau-host libpthread-stubs-host xcb-proto-host
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 2453064f5..779ebfbdd 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ncurses
 PKG_VERSION:=		5.9
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		8cb9c412e5f2d96bc6f459aa8c6282a1
 PKG_DESCR:=		a terminal handling library
 PKG_SECTION:=		libs
@@ -81,18 +81,13 @@ libncurses-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}.so* \
 	    ${IDIR_LIBNCURSES}/usr/lib
-	for ti in rxvt rxvt-unicode; do \
-		TERMINFO=${WRKINST}/usr/share/terminfo \
-		PATH=$(HOST_PATH) \
-		tic$(EXEEXT) -x ./files/$$ti.ti; \
-	done
 ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y)
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share
 	${CP} ${WRKINST}/usr/share/terminfo ${IDIR_LIBNCURSES}/usr/share/
 else
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
 	for f in ansi dumb linux screen vt100 vt102 \
-	    rxvt rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \
+	    vt220 xterm xterm-color xterm-xfree86; do \
 		${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \
 		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
 		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 8223abe7b..97ea55df3 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		parted
 PKG_VERSION:=		3.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		5d89d64d94bcfefa9ce8f59f4b81bdcb
 PKG_DESCR:=		partition table editor
 PKG_SECTION:=		fs
-PKG_DEPENDS:=		libuuid libreadline libpthread libgcc
+PKG_DEPENDS:=		libblkid libuuid libreadline libpthread libgcc
 PKG_BUILDDEP:=		util-linux readline
 PKG_URL:=		http://www.gnu.org/software/parted/index.shtml
 PKG_SITES:=		${MASTER_SITE_GNU:=parted/}
diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile
index 407f27fbf..fbd6341e5 100644
--- a/package/randrproto/Makefile
+++ b/package/randrproto/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		randrproto
-PKG_VERSION:=		1.3.2
+PKG_VERSION:=		1.4.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b8fd2f75cf156c9f6e6771addd07ef59
+PKG_MD5SUM:=		af44f250b89783eb4967f1dc5b32ef68
 PKG_DESCR:=		Xrandr protcol headers
 PKG_SECTION:=		devel
 PKG_SITES:=		${MASTER_SITE_XORG}
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 9e5d2b3b1..e4d2bfe97 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -4,11 +4,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xcb-proto
-PKG_VERSION:=		1.8
+PKG_VERSION:=		1.10
 PKG_RELEASE:=		1
 PKG_DESCR:=		XML-XCB protocol descriptions
 PKG_SECTION:=		devel
-PKG_MD5SUM:=		8d2cdb770129cef563088a90c5bec768
+PKG_MD5SUM:=		2b9dc6442156aba2bfb4133cb9d7cf46
 PKG_BUILDDEP:=		autotool bzip2-host python2-host xcb-proto-host
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev devonly
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index 1c70d3956..368e75037 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xextproto
-PKG_VERSION:=		7.2.1
+PKG_VERSION:=		7.3.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		X Protocol Extensions headers
 PKG_SECTION:=		devel
 PKG_BUILDDEP:=		xextproto-host
-PKG_MD5SUM:=		9062d689f422fad1b8774c967d730f09
+PKG_MD5SUM:=		37b700baa8c8ea7964702d948dd13821
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly
 
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index cca9b2194..9b46c8f2f 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-keyboard
-PKG_VERSION:=		1.6.1
+PKG_VERSION:=		1.8.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c2188611990880f06f7d6c2a7672af1b
+PKG_MD5SUM:=		4f3e135e04939916f37f91a111c6f70b
 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 f050696f6..0f1267fb4 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-mouse
-PKG_VERSION:=		1.7.2
+PKG_VERSION:=		1.9.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0f2f2dfb7b769544f04b3469803098a5
+PKG_MD5SUM:=		125402066940ef30737721243bb1b77e
 PKG_DESCR:=		X11 driver for mouse
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 84c73e6bd..69540fc99 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-video-siliconmotion
-PKG_VERSION:=		1.7.6
+PKG_VERSION:=		1.7.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b71859e15fc62563d346c7bccc0ef82e
+PKG_MD5SUM:=		94c44123d8d0a46a7f6bace8508763d8
 PKG_DESCR:=		X11 driver for Silicon Motion VGA chips
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server
@@ -21,6 +21,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,xf86-video-siliconmotion,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--disable-xaa
+
 xf86-video-siliconmotion-install:
 	${INSTALL_DIR} ${IDIR_XF86_VIDEO_SILICONMOTION}/usr/lib/xorg/modules/drivers
 	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/siliconmotion_*.so \
diff --git a/package/xf86-video-siliconmotion/patches/loongson.patch b/package/xf86-video-siliconmotion/patches/loongson.patch
deleted file mode 100644
index 2b9041516..000000000
--- a/package/xf86-video-siliconmotion/patches/loongson.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c
---- xf86-video-siliconmotion-1.7.4/src/smi_video.c	2010-02-25 08:33:07.000000000 +0100
-+++ xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c	2012-03-13 04:18:18.634989344 +0100
-@@ -276,6 +276,7 @@
-     XVIMAGE_YUY2,
-     XVIMAGE_YV12,
-     XVIMAGE_I420,
-+    XVIMAGE_UYVY,
-     {
- 	FOURCC_RV15,			/* id				*/
- 	XvRGB,				/* type				*/
-@@ -1464,6 +1465,117 @@
-     LEAVE();
- }
- 
-+static void myXVCopyYUV12ToPacked(const unsigned char *srcy, const unsigned char *srcv, const unsigned char *srcu,
-+		unsigned char *dst, int srcPitchy, int srcPitchuv, int dstPitch, int h, int w)
-+{
-+	int i, j;
-+	unsigned char const *y, *u, *v;
-+	int dstinc, yinc, uinc, vinc;
-+
-+	y = srcy;
-+	u = srcu;
-+	v = srcv;
-+
-+	dstinc = dstPitch - 2*w;
-+	yinc = srcPitchy - w;
-+	uinc = srcPitchuv - w/2;
-+	vinc = srcPitchuv - w/2;
-+
-+	for (i = 0; i < h; i++) {
-+		asm (
-+//			".set arch=loongson2f\n\t"
-+			".set noreorder\n\t"
-+			"move $8, %8 \n\t"
-+			"1: \n\t"
-+			"beqz $8, 2f \n\t"
-+			"xor $f0, $f0, $f0 \n\t"
-+			"ldc1 $f4, (%0) \n\t"
-+			"punpcklbh $f2, $f4, $f0 \n\t"
-+			"punpckhbh $f4, $f4, $f0 \n\t"
-+			"ldc1 $f16, 8(%0) \n\t"
-+			"punpcklbh $f14, $f16, $f0 \n\t"
-+			"punpckhbh $f16, $f16, $f0 \n\t"
-+			
-+			"lwc1 $f8, (%1) \n\t"
-+			"lwc1 $f12, (%2) \n\t"
-+			"punpcklbh $f8, $f8, $f12 \n\t"
-+			"punpcklbh $f6, $f0, $f8 \n\t"
-+			"punpckhbh $f8, $f0, $f8 \n\t"
-+			"lwc1 $f18, 4(%1) \n\t"
-+			"lwc1 $f12, 4(%2) \n\t"
-+			"punpcklbh $f18, $f18, $f12 \n\t"
-+			"punpcklbh $f10, $f0, $f18 \n\t"
-+			"punpckhbh $f12, $f0, $f18 \n\t"
-+
-+			"or $f2, $f2, $f6 \n\t"
-+			"or $f4, $f4, $f8 \n\t"
-+			"or $f14, $f14, $f10 \n\t"
-+			"or $f16, $f16, $f12 \n\t"
-+
-+			"sdc1 $f2, (%3) \n\t"
-+			"sdc1 $f4, 8(%3) \n\t"
-+			"add %0, 16 \n\t"
-+			"add %1, 8 \n\t"
-+			"add %2, 8 \n\t"
-+			"sdc1 $f14, 0x10(%3) \n\t"
-+			"sdc1 $f16, 0x18(%3) \n\t"
-+			"add $8, -1 \n\t"
-+			"b 1b \n\t"
-+			"add %3, 32 \n\t"
-+			"2: \n\t"
-+			".set reorder\n\t"
-+			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
-+			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" (w>>4)
-+			: "memory","$8"
-+		);
-+
-+		asm (
-+//			".set arch=loongson2f\n\t"
-+			".set noreorder\n\t"
-+			"move $8, %8 \n\t"
-+			"1: \n\t"
-+			"beqz $8, 2f \n\t"
-+			"xor $f0, $f0, $f0 \n\t"
-+			"ldc1 $f4, (%0) \n\t"
-+			"punpcklbh $f2, $f4, $f0 \n\t"
-+			"punpckhbh $f4, $f4, $f0 \n\t"
-+			
-+			"lwc1 $f8, (%1) \n\t"
-+			"lwc1 $f12, (%2) \n\t"
-+			"punpcklbh $f8, $f8, $f12 \n\t"
-+			"punpcklbh $f6, $f0, $f8 \n\t"
-+			"punpckhbh $f8, $f0, $f8 \n\t"
-+
-+			"or $f2, $f2, $f6 \n\t"
-+			"or $f4, $f4, $f8 \n\t"
-+
-+			"sdc1 $f2, (%3) \n\t"
-+			"sdc1 $f4, 8(%3) \n\t"
-+			"add %0, 8 \n\t"
-+			"add %1, 4 \n\t"
-+			"add %2, 4 \n\t"
-+			"add $8, -1 \n\t"
-+			"b 1b \n\t"
-+			"add %3, 16 \n\t"
-+			"2:\n\t"
-+			".set reorder\n\t"
-+			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
-+			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" ((w&0xf)/8)
-+			: "memory","$8"
-+		);
-+
-+		for (j = (w&7)/2; j; j--) {
-+			*dst++ = *y++;
-+			*dst++ = *u++;
-+			*dst++ = *y++;
-+			*dst++ = *v++;
-+		}
-+		y += yinc;
-+		u = (i%2) ? (u + uinc): (u - w/2);
-+		v = (i%2) ? (v + vinc): (v - w/2);
-+		dst += dstinc;
-+	}
-+}
- 
- static int
- SMI_PutImage(
-@@ -1592,7 +1704,7 @@
- 		offset3 = tmp;
- 	    }
- 	    nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
--	    xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
-+	    myXVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
- 				    buf + offset2, buf + offset3, dstStart,
- 				    srcPitch, srcPitch2, dstPitch, nLines,
- 				    nPixels);
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index fef274746..e766b685d 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,19 +4,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.12.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		a95c896fbe8322c3c8d518a13eb74c7a
+PKG_VERSION:=		1.15.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		faf04f1213f9a476997a774254b3abce
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11/server
 PKG_DEPENDS:=		libopenssl libxfont 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 libgcc librt
+PKG_DEPENDS+=		libxshmfence libfreetype libfontenc
 PKG_BUILDDEP:=		libX11 randrproto renderproto fixesproto damageproto
 PKG_BUILDDEP+=		scrnsaverproto resourceproto fontsproto videoproto
 PKG_BUILDDEP+=		compositeproto evieext libxkbfile libXfont pixman
 PKG_BUILDDEP+=		libpciaccess openssl xf86dgaproto recordproto
+PKG_BUILDDEP+=		xineramaproto
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
@@ -28,7 +30,7 @@ PKG_ARCH_DEPENDS:=	!m68k
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
 PKGFD_WITH_DRI:=		enable DRI/DRI2 support
-PKGFB_WITH_DRI:=		xf86driproto glproto dri2proto MesaLib
+PKGFB_WITH_DRI:=		xf86driproto glproto MesaLib
 PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
 PKG_CHOICES_XORG_SERVER:=	WITH_GCRYPT WITH_CRYPTO
@@ -57,9 +59,10 @@ CONFIGURE_ENV+=		V=1
 CONFIGURE_ARGS+=	--enable-dga \
 			--enable-xorg \
 			--enable-xv \
-			--enable-xaa \
 			--enable-vgahw \
 			--enable-dpms \
+			--enable-xinerama \
+			--disable-docs \
 			--disable-aiglx \
 			--disable-config-hal \
 			--disable-config-udev \
@@ -68,7 +71,6 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xf86bigfont \
 			--disable-xf86vidmode \
 			--disable-xfake \
-			--disable-xinerama \
 			--disable-xnest \
 			--disable-xselinux \
 			--disable-xcsecurity \
@@ -85,9 +87,9 @@ CONFIGURE_ARGS+=	--disable-kdrive --disable-xfbdev
 endif
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
-CONFIGURE_ARGS+=	--enable-dri --enable-dri2 --enable-glx
+CONFIGURE_ARGS+=	--enable-dri --enable-dri2 --enable-dri3 --enable-glx
 else
-CONFIGURE_ARGS+=	--disable-dri --disable-dri2 --disable-glx
+CONFIGURE_ARGS+=	--disable-dri --disable-dri2 --disable-dri3 --disable-glx
 endif
 
 ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
@@ -117,10 +119,6 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y)
 	${CP} ./files/xorg.conf.sharp-zaurus \
 		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
 endif
-ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
-	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
-		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
-endif
 	# add m4 file to host directory
 	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal
 	$(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \
diff --git a/package/xorg-server/files/xorg.conf.lemote-yeelong b/package/xorg-server/files/xorg.conf.lemote-yeelong
index 042471020..c6204c590 100644
--- a/package/xorg-server/files/xorg.conf.lemote-yeelong
+++ b/package/xorg-server/files/xorg.conf.lemote-yeelong
@@ -12,13 +12,10 @@ Section "Module"
        Load  "vgahw"
        Load  "fb"
        Load  "exa"
-       Load  "xaa"
        Load  "int10"
        Load  "ddc"
        Load  "i2c"
        Load  "vbe"
-       Disable "glx"
-       Disable "dri"
 EndSection
 
 Section "Device"
@@ -27,7 +24,7 @@ Section "Device"
        VendorName  "Silicon Motion, Inc."
        BoardName   "SM712 LynxEM+"
        BusID       "PCI:0:8:0"
-       Option      "AccelMethod"       "XAA"
+       Option      "AccelMethod"        "EXA"
        Option      "pci_burst"         "true"
        Option      "PanelSize"         "1024x600"
 EndSection
diff --git a/package/xorg-server/patches/patch-fb_fb_h b/package/xorg-server/patches/patch-fb_fb_h
deleted file mode 100644
index 9118bec68..000000000
--- a/package/xorg-server/patches/patch-fb_fb_h
+++ /dev/null
@@ -1,13 +0,0 @@
-	Fix for xf86-video-siliconmotion in 16bpp with XAA, see:
-	http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2
---- xorg-server-1.12.2.orig/fb/fb.h	2012-05-29 22:04:19.000000000 +0200
-+++ xorg-server-1.12.2/fb/fb.h	2013-04-30 10:33:00.000000000 +0200
-@@ -70,7 +70,7 @@
- #define FBPREFIX(x) fb##x
- #define WRITE(ptr, val) (*(ptr) = (val))
- #define READ(ptr) (*(ptr))
--#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
-+#define MEMCPY_WRAPPED(dst, src, size) memmove((dst), (src), (size))
- #define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
- 
- #endif
diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
deleted file mode 100644
index 2a8477cb8..000000000
--- a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/kdrive/linux/linux.c	2013-12-22 20:10:03.000000000 +0100
-@@ -66,8 +66,8 @@ static void
- LinuxCheckChown(char *file)
- {
-     struct stat st;
--    __uid_t u;
--    __gid_t g;
-+    uid_t u;
-+    gid_t g;
- 
-     if (stat(file, &st) < 0)
-         return;
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
deleted file mode 100644
index 8a5f29ebd..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
+++ /dev/null
@@ -1,58 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/common/compiler.h	2013-04-30 10:52:21.000000000 +0200
-@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
- #define PORT_SIZE short
- #endif
- 
--_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
-+_X_EXPORT volatile unsigned char *ioBase;  /* Memory mapped I/O port area */
- 
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
- {
--    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
-         val;
- }
- 
- static __inline__ void
- outw(unsigned PORT_SIZE port, unsigned short val)
- {
--    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
-         val;
- }
- 
- static __inline__ void
- outl(unsigned PORT_SIZE port, unsigned int val)
- {
--    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
-         val;
- }
- 
-@@ -737,21 +737,21 @@ static __inline__ unsigned int
- inb(unsigned PORT_SIZE port)
- {
-     return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
--                                        IOPortBase);
-+                                        ioBase);
- }
- 
- static __inline__ unsigned int
- inw(unsigned PORT_SIZE port)
- {
-     return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
--                                         IOPortBase);
-+                                         ioBase);
- }
- 
- static __inline__ unsigned int
- inl(unsigned PORT_SIZE port)
- {
-     return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
--                                       IOPortBase);
-+                                       ioBase);
- }
- 
- #if defined(__mips__)
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
deleted file mode 100644
index 0e3d1974a..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h	2009-08-11 06:00:23.000000000 +0200
-+++ xorg-server-1.7.5/hw/xfree86/dri/dri.h	2010-04-21 19:59:22.000000000 +0200
-@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #include <pciaccess.h>
- 
- #include "scrnintstr.h"
--#include "xf86dri.h"
-+#include <X11/dri/xf86dri.h>
- 
- typedef int DRISyncType;
- 
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
deleted file mode 100644
index 6f45382eb..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/dri/sarea.h	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/dri/sarea.h	2013-04-30 10:33:00.000000000 +0200
-@@ -41,6 +41,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 			0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX			0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX			0x10000 /* 64kB */
- #else
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
deleted file mode 100644
index fd8fcfced..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_init.c	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_init.c	2013-04-30 10:33:00.000000000 +0200
-@@ -75,8 +75,8 @@ xf86OpenConsole(void)
-     struct vt_mode VT;
-     struct vt_stat vts;
-     MessageType from = X_PROBED;
--    char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
--    char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
-+    char *tty0[] = { "/dev/tty0", NULL };
-+    char *vcs[] = { "/dev/tty%d", NULL };
- 
-     if (serverGeneration == 1) {
- 
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
deleted file mode 100644
index 4dbf01589..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ /dev/null
@@ -1,56 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_video.c	2013-04-30 10:49:01.000000000 +0200
-@@ -472,7 +472,7 @@ unmapVidMem(int ScreenNum, pointer Base,
- /* I/O Permissions section                                                 */
- /***************************************************************************/
- 
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- volatile unsigned char *ioBase = NULL;
- 
- #ifndef __NR_pciconfig_iobase
-@@ -484,7 +484,7 @@ volatile unsigned char *ioBase = NULL;
- Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-     int fd;
-     unsigned int ioBase_phys;
- #endif
-@@ -492,8 +492,12 @@ xf86EnableIO(void)
-     if (ExtendedEnabled)
-         return TRUE;
- 
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-+#ifdef __powerpc__
-     ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
-+#else
-+    ioBase_phys = 0x1fd00000;
-+#endif	
- 
-     fd = open("/dev/mem", O_RDWR);
-     if (ioBase == NULL) {
-@@ -511,7 +515,7 @@ xf86EnableIO(void)
- #endif
-     }
-     close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-     if (ioperm(0, 1024, 1) || iopl(3)) {
-         if (errno == ENODEV)
-             ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-@@ -537,10 +541,10 @@ xf86DisableIO(void)
- {
-     if (!ExtendedEnabled)
-         return;
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-     munmap(ioBase, 0x20000);
-     ioBase = NULL;
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-     iopl(0);
-     ioperm(0, 1024, 0);
- #endif
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
deleted file mode 100644
index cd1c5c15c..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
+++ /dev/null
@@ -1,14 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/xf86_OSlib.h	2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/xf86_OSlib.h	2013-10-29 15:23:18.000000000 +0100
-@@ -178,11 +178,7 @@
- #include <sys/types.h>
- #include <assert.h>
- 
--#ifdef __linux__
--#include <termio.h>
--#else                           /* __GLIBC__ */
- #include <termios.h>
--#endif
- #ifdef __sparc__
- #include <sys/param.h>
- #endif
diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh
deleted file mode 100644
index eedadf67e..000000000
--- a/package/xorg-server/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.12.2.orig/ltmain.sh	2012-05-29 22:06:05.000000000 +0200
-+++ xorg-server-1.12.2/ltmain.sh	2013-04-30 10:33:00.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index fbbd16857..103ca9e7f 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xtrans
-PKG_VERSION:=		1.2.6
+PKG_VERSION:=		1.3.3
 PKG_RELEASE:=		1
 PKG_DESCR:=		X11 network protocol transport library
 PKG_SECTION:=		devel
 PKG_BUILDDEP:=		xtrans-host
-PKG_MD5SUM:=		b91dd22b77a350d129a81175cd8c58cc
+PKG_MD5SUM:=		c83d04cd878f1e51a44d132aa1d5b932
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_OPTS:=		dev devonly