Mesa: update to Mesa-9.2-rc2

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/graphics/Mesa/package.mk

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="9.1.6"
+PKG_VERSION="9.2.0-rc2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
-PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://freedesktop.org/pub/mesa/9.2/MesaLib-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
 PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"

packages/graphics/Mesa/patches/Mesa-AC_CHECK_FILE.patch

@@ -1,39 +0,0 @@
-diff -Naur Mesa-9.1.1/configure.ac Mesa-9.1.1.patch/configure.ac
---- Mesa-9.1.1/configure.ac	2013-03-20 01:14:17.000000000 +0100
-+++ Mesa-9.1.1.patch/configure.ac	2013-05-01 02:51:48.086299947 +0200
-@@ -1923,7 +1923,9 @@
-     if test "x$with_llvm_shared_libs" = xyes; then
-         dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-         LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
--        AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,)
-+        if test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"; then
-+          llvm_have_one_so=yes
-+        fi
- 
-         if test "x$llvm_have_one_so" = xyes; then
-             dnl LLVM was built using auto*, so there is only one shared object.
-@@ -1931,8 +1933,8 @@
-         else
-             dnl If LLVM was built with CMake, there will be one shared object per
-             dnl component.
--            AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",,
--                    AC_MSG_ERROR([Could not find llvm shared libraries:
-+            if test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"; then
-+              AC_MSG_ERROR([Could not find llvm shared libraries:
- 	Please make sure you have built llvm with the --enable-shared option
- 	and that your llvm libraries are installed in $LLVM_LIBDIR
- 	If you have installed your llvm libraries to a different directory you
-@@ -1943,11 +1945,12 @@
- 		--enable-opencl
- 	If you do not want to build with llvm shared libraries and instead want to
- 	use llvm static libraries then remove these options from your configure
--	invocation and reconfigure.]))
-+	invocation and reconfigure.])
- 
-            dnl We don't need to update LLVM_LIBS in this case because the LLVM
-            dnl install uses a shared object for each compoenent and we have
-            dnl already added all of these objects to LLVM_LIBS.
-+            fi
-         fi
-     fi
- fi

packages/graphics/Mesa/patches/Mesa-cross.patch

@@ -1,60 +0,0 @@
-diff -up Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am.cross Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am
---- Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am.cross	2013-03-28 14:56:22.990746189 +0100
-+++ Mesa-9.1.1/src/glsl/builtin_compiler/Makefile.am	2013-03-28 14:56:32.483577384 +0100
-@@ -64,13 +64,13 @@ AM_CXXFLAGS = $(AM_CFLAGS)
- include ../Makefile.sources
- 
- noinst_PROGRAMS = builtin_compiler
--noinst_LTLIBRARIES = libglslcore.la libglcpp.la
-+noinst_LIBRARIES = libglslcore.a libglcpp.a
- 
--libglcpp_la_SOURCES =					\
-+libglcpp_a_SOURCES =					\
- 	$(LIBGLCPP_GENERATED_FILES)			\
- 	$(LIBGLCPP_FILES)
- 
--libglslcore_la_SOURCES =				\
-+libglslcore_a_SOURCES =				\
- 	$(BUILTIN_COMPILER_GENERATED_CXX_FILES)		\
- 	$(LIBGLSL_FILES)
- 
-@@ -81,4 +81,4 @@ builtin_compiler_SOURCES = \
- 	$(top_srcdir)/src/mesa/program/symbol_table.c	\
- 	$(BUILTIN_COMPILER_CXX_FILES)			\
- 	$(GLSL_COMPILER_CXX_FILES)
--builtin_compiler_LDADD = libglslcore.la libglcpp.la
-+builtin_compiler_LDADD = libglslcore.a libglcpp.a
-diff -up Mesa-9.1.1/src/glsl/Makefile.am.cross Mesa-9.1.1/src/glsl/Makefile.am
---- Mesa-9.1.1/src/glsl/Makefile.am.cross	2013-03-28 14:56:26.565682626 +0100
-+++ Mesa-9.1.1/src/glsl/Makefile.am	2013-03-28 14:59:13.109723407 +0100
-@@ -73,14 +73,10 @@ tests_ralloc_test_LDADD =				\
- 	$(top_builddir)/src/gtest/libgtest.la		\
- 	$(PTHREAD_LIBS)
- 
--if CROSS_COMPILING
- libglcpp_la_SOURCES =					\
- 	glcpp/glcpp-lex.c				\
- 	glcpp/glcpp-parse.c				\
- 	$(LIBGLCPP_FILES)
--else
--libglcpp_la_LIBADD = builtin_compiler/libglcpp.la
--endif
- 
- glcpp_glcpp_SOURCES =					\
- 	glcpp/glcpp.c					\
-@@ -89,15 +85,10 @@ glcpp_glcpp_LDADD = libglcpp.la
- 
- libglsl_la_SOURCES = builtin_function.cpp
- libglsl_la_LIBADD = libglcpp.la
--if CROSS_COMPILING
- libglsl_la_SOURCES +=					\
- 	glsl_lexer.cpp					\
- 	glsl_parser.cpp					\
- 	$(LIBGLSL_FILES)
--else
--libglsl_la_LIBADD +=					\
--	builtin_compiler/libglslcore.la
--endif
- 
- glsl_test_SOURCES = \
- 	$(top_srcdir)/src/mesa/main/hash_table.c \