update Xorg to 7.7

115 files changed, 350 insertions, 140162 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 3dd7ee490..c55aa1db1 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -4,25 +4,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
-PKG_VERSION:=		7.8.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		c89b63d253605ed40e8ac370d25a833c
+PKG_VERSION:=		8.0.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cda5d101f43b8784fa60bdeaca4056f2
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxdamage libxfixes libdrm libxxf86vm libexpat
 PKG_BUILDDEP:=		libXdamage libXfixes libXxf86vm libdrm
 PKG_BUILDDEP+=		dri2proto glproto expat libXext
 PKG_URL:=		http://www.mesa3d.org/
-PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.2/
+PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/
 PKG_NEED_CXX:=		1
 
-PKG_SUBPKGS:=		MESALIB MESALIB_DEV GLXINFO GLXGEARS
+PKG_SUBPKGS:=		MESALIB MESALIB_DEV
 PKGSD_MESALIB_DEV:=	MESA headers
 PKGSC_MESALIB_DEV:=	devel
-PKGSD_GLXINFO:=		Display various GLX information
-PKGSC_GLXINFO:=		x11/apps
-PKGSD_GLXGEARS:=	Nice little OpenGL demo application
-PKGSC_GLXGEARS:=	x11/apps
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
@@ -32,21 +28,22 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MESALIB_DEV},${PKGSC_MESALIB_DEV}))
-$(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO}))
-$(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 DRI_DRIVERS:=i915
 endif
 
 CONFIGURE_ARGS+=	--disable-static \
-			--disable-gallium \
-			--disable-glw \
+			--disable-gallium-llvm \
+			--with-gallium-drivers=swrast \
 			--with-driver=dri \
-			--with-dri-drivers=${DRI_DRIVERS},swrast \
-			--with-demos=xdemos
+			--disable-gles1 \
+			--disable-gles2 \
+			--with-dri-drivers=${DRI_DRIVERS},swrast
+CONFIGURE_ENV+=		PYTHON2=/usr/bin/python
 
 XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
 ifeq ($(ADK_NATIVE),y)
@@ -57,14 +54,15 @@ post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
 		./configure \
 		--disable-static \
-		--disable-glw \
-		--disable-gallium \
+		--disable-gallium-llvm \
+		--with-gallium-drivers=swrast \
 		--with-driver=xlib \
 	);
 	${MAKE} -C ${WRKBUILD}/src/glsl
-	${MAKE} -C ${WRKBUILD}/src/glsl/apps
-	${CP} ${WRKBUILD}/src/glsl/apps/compile \
-		${STAGING_HOST_DIR}/bin/glslcompile
+	${CP} ${WRKBUILD}/src/glsl/glsl_compiler \
+		${STAGING_HOST_DIR}/bin/glsl_compiler
+	${CP} ${WRKBUILD}/src/glsl/builtin_compiler \
+		${STAGING_HOST_DIR}/bin/builtin_compiler
 	${MAKE} -C ${WRKBUILD}/src/glsl clean
 
 mesalib-install:
@@ -78,16 +76,6 @@ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 		${IDIR_MESALIB}/usr/lib/dri/
 endif
 
-glxinfo-install:
-	${INSTALL_DIR} ${IDIR_GLXINFO}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxinfo \
-		${IDIR_GLXINFO}/usr/bin/
-
-glxgears-install:
-	${INSTALL_DIR} ${IDIR_GLXGEARS}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxgears \
-		${IDIR_GLXGEARS}/usr/bin/
-
 mesalib-dev-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/include
 	${CP} ${WRKINST}/usr/include/* \
diff --git a/package/MesaLib/patches/000-mesalib-xdemos.patch b/package/MesaLib/patches/000-mesalib-xdemos.patch
deleted file mode 100644
index 0ebf160e5..000000000
--- a/package/MesaLib/patches/000-mesalib-xdemos.patch
+++ /dev/null
@@ -1,14774 +0,0 @@
-diff -Naurp Mesa-7.8.1/progs/xdemos/corender.c Mesa-7.8.1.patched/progs/xdemos/corender.c
---- Mesa-7.8.1/progs/xdemos/corender.c	1970-01-01 01:00:00.000000000 +0100
-+++ Mesa-7.8.1.patched/progs/xdemos/corender.c	2010-06-13 13:45:06.789793146 +0200
-@@ -0,0 +1,400 @@
-+/**
-+ * Example of cooperative rendering into one window by two processes.
-+ * The first instance of the program creates the GLX window.
-+ * The second instance of the program gets the window ID from the first
-+ * and draws into it.
-+ * Socket IPC is used for synchronization.
-+ *
-+ * Usage:
-+ * 1. run 'corender &'
-+ * 2. run 'corender 2'  (any arg will do)
-+ *
-+ * Brian Paul
-+ * 11 Oct 2007
-+ */
-+
-+
-+#include <GL/gl.h>
-+#include <GL/glx.h>
-+#include <assert.h>
-+#include <math.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <X11/keysym.h>
-+#include <unistd.h>
-+#include "ipc.h"
-+
-+
-+#ifndef M_PI
-+#define M_PI 3.14159265358979323846
-+#endif
-+
-+static int MyID = 0;  /* 0 or 1 */
-+static int WindowID = 0;
-+static GLXContext Context = 0;
-+static int Width = 700, Height = 350;
-+static int Rot = 0;
-+static int Sock = 0;
-+
-+static GLfloat Red[4] = {1.0, 0.2, 0.2, 1.0};
-+static GLfloat Blue[4] = {0.2, 0.2, 1.0, 1.0};
-+
-+static int Sync = 1;  /** synchronized rendering? */
-+
-+
-+static void