update mesa to latest stable upstream

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

package/fltk/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		4
 PKG_HASH:=		176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs/misc
-PKG_DEPENDS:=		mesalib libx11 libxi freeglut libfreetype
-PKG_BUILDDEP:=		libX11 libXi mesalib freeglut freetype
+PKG_DEPENDS:=		mesa libx11 libxi freeglut libfreetype
+PKG_BUILDDEP:=		libX11 libXi mesa freeglut freetype
 PKG_URL:=		http://www.fltk.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_LIBNAME:=		libfltk

package/glu/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12
 PKG_DESCR:=		opengl utility library
 PKG_SECTION:=		libs/video
-PKG_BUILDDEP:=		mesalib
+PKG_BUILDDEP:=		mesa
 PKG_URL:=		http://cgit.freedesktop.org/mesa/glu/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/glu/
 PKG_LIBNAME:=		libglu

package/libglew/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		3
 PKG_HASH:=		99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307
 PKG_DESCR:=		opengl extension wrangler library
 PKG_SECTION:=		libs/video
-PKG_DEPENDS:=		libx11 libxmu libxi libxext mesalib
-PKG_BUILDDEP:=		libX11 libXmu libXi libXext mesalib
+PKG_DEPENDS:=		libx11 libxmu libxi libxext mesa
+PKG_BUILDDEP:=		libX11 libXmu libXi libXext mesa
 PKG_URL:=		http://glew.sourceforge.net/index.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=glew/}
 PKG_OPTS:=		dev

package/mesa-demos/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_HASH:=		dca2c73ce8ab28b7d5d9b221a4a47fb5584f6b764171af075bc4385e8e2a7a64
 PKG_DESCR:=		opengl demo apps
 PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		mesalib
-PKG_BUILDDEP:=		mesalib libglew glu
+PKG_DEPENDS:=		mesa
+PKG_BUILDDEP:=		mesa libglew glu
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_VERSION}/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz

package/mesalib/Makefile → package/mesa/Makefile

@@ -3,10 +3,10 @@
 
 include $(ADK_TOPDIR)/rules.mk
 
-PKG_NAME:=		mesalib
-PKG_VERSION:=		10.3.5
+PKG_NAME:=		mesa
+PKG_VERSION:=		10.5.1
 PKG_RELEASE:=		1
-PKG_HASH:=		7ea71c3cce89114df3dc050376afa1c6f6bf235d77a68f9703273603d6a90621
+PKG_HASH:=		d7ca9f9044bbdd674377e3eebceef1fae339c8817b9aa435c2053e4fea44e5d3
 PKG_DESCR:=		3d graphics library
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libxdamage libxfixes libdrm libxxf86vm libexpat
@@ -17,56 +17,37 @@ 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_LIBNAME:=		mesalib
+PKG_LIBNAME:=		mesa
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el arm
 
-DISTFILES:=		MesaLib-${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
-
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-include $(ADK_TOPDIR)/mk/python.mk
-
-ifeq ($(ADK_HOST_DARWIN),y)
-PYTHON:=/usr/bin/python2.7
-endif
-ifeq ($(ADK_HOST_OPENBSD),y)
-PYTHON:=/usr/local/bin/python2.7
-endif
-ifeq ($(ADK_HOST_CYGWIN),y)
-PYTHON:=/usr/bin/python2.7
-endif
+$(eval $(call PKG_template,MESA,mesa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
-DRI_DRIVERS:=i915
+DRI_DRIVERS:=		i915
 endif
 
-AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-gallium-llvm \
 			--with-gallium-drivers=swrast \
-			--disable-gles1 \
-			--disable-gles2 \
 			--with-dri-drivers=${DRI_DRIVERS},swrast
-CONFIGURE_ENV+=		MISSING="echo" \
-			PYTHON2=$(PYTHON)
+CONFIGURE_ENV+=		MISSING="echo"
 XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD}
 
-mesalib-install:
-	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
+mesa-install:
+	$(INSTALL_DIR) $(IDIR_MESA)/usr/lib/dri
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
-		$(IDIR_MESALIB)/usr/lib
+		$(IDIR_MESA)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libglapi.so* \
-		$(IDIR_MESALIB)/usr/lib
+		$(IDIR_MESA)/usr/lib
 	${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \
-		${IDIR_MESALIB}/usr/lib/dri/
+		${IDIR_MESA}/usr/lib/dri/
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 	${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \
-		${IDIR_MESALIB}/usr/lib/dri/
+		${IDIR_MESA}/usr/lib/dri/
 endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/mesalib/patches/patch-configure_ac

@@ -1,11 +0,0 @@
---- Mesa-10.1.0.orig/configure.ac	2014-02-27 02:56:39.000000000 +0100
-+++ Mesa-10.1.0/configure.ac	2014-03-14 21:36:14.000000000 +0100
-@@ -65,7 +65,7 @@ AC_PATH_PROG([PERL], [perl])
- 
- AC_CHECK_PROG(INDENT, indent, indent, cat)
- if test "x$INDENT" != "xcat"; then
--    AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool')
-+    AC_SUBST(INDENT_FLAGS, '-i4 -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool')
- fi
- 
- AC_PROG_INSTALL

package/mesalib/patches/patch-include_c11_threads_posix_h

@@ -1,11 +0,0 @@
---- Mesa-10.1.0.orig/include/c11/threads_posix.h	2014-02-27 02:56:39.000000000 +0100
-+++ Mesa-10.1.0/include/c11/threads_posix.h	2014-03-14 21:54:55.000000000 +0100
-@@ -176,7 +176,7 @@ mtx_init(mtx_t *mtx, int type)
-         return thrd_error;
-     pthread_mutexattr_init(&attr);
-     if ((type & mtx_recursive) != 0) {
--#if defined(__linux__) || defined(__linux)
-+#if defined(__GLIBC__)
-         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- #else
-         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

package/mesalib/patches/patch-src_gallium_include_pipe_p_config_h

@@ -1,11 +0,0 @@
---- Mesa-10.1.0.orig/src/gallium/include/pipe/p_config.h	2014-02-27 02:56:39.000000000 +0100
-+++ Mesa-10.1.0/src/gallium/include/pipe/p_config.h	2014-03-14 21:36:14.000000000 +0100
-@@ -130,7 +130,7 @@
-  * Endian detection.
-  */
- 
--#ifdef __GLIBC__
-+#ifdef __linux__
- #include <endian.h>
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN

package/mesalib/patches/patch-src_mesa_main_querymatrix_c

@@ -1,11 +0,0 @@
---- Mesa-10.1.0.orig/src/mesa/main/querymatrix.c	2014-02-27 02:56:40.000000000 +0100
-+++ Mesa-10.1.0/src/mesa/main/querymatrix.c	2014-03-14 21:36:14.000000000 +0100
-@@ -76,7 +76,7 @@ fpclassify(double x)
- #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
-      defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
-      (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
--     (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__)
-+     (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) || 1
- 
- /* fpclassify is available. */
- 

package/xf86-video-ati/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		dc0a00d1ea367e5f3e2baa0c1a0f8330c217f1d8c9d6e380757b945fb3bf6c61
 PKG_DESCR:=		x11 driver for ati vga chip
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server libdrm mesalib libudev libstdcxx
-PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesalib eudev
+PKG_DEPENDS:=		xorg-server libdrm mesa libudev libstdcxx
+PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesa eudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz

package/xf86-video-intel/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		1888f2733f8dccf4ab24bc56ba62eeac41c231b98365027438702d6c55216576
 PKG_DESCR:=		x11 driver for intel vga chips
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server libdrm mesalib libstdcxx libudev
-PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesalib eudev
+PKG_DEPENDS:=		xorg-server libdrm mesa libstdcxx libudev
+PKG_BUILDDEP:=		xorg-server libdrm xf86driproto mesa eudev
 PKG_SITES:=		$(MASTER_SITE_XORG)
 
 PKG_SYSTEM_DEPENDS:=	ibm-x40

package/xorg-server/Makefile

@@ -28,9 +28,9 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
-PKGFS_WITH_DRI:=		mesalib
+PKGFS_WITH_DRI:=		mesa
 PKGFD_WITH_DRI:=		enable dri support
-PKGFB_WITH_DRI:=		xf86driproto glproto mesalib
+PKGFB_WITH_DRI:=		xf86driproto glproto mesa
 PKGFD_WITH_KDRIVE:=		build kdrive xfbdev server
 
 PKG_CHOICES_XORG_SERVER:=	WITH_GCRYPT WITH_CRYPTO