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

8 files changed, 165 insertions, 5 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index d62773bd3..008c4eb4f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
 PKG_VERSION:=		8.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cda5d101f43b8784fa60bdeaca4056f2
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib
index 2f53c152c..a361c1105 100644
--- a/package/MesaLib/patches/patch-bin_mklib
+++ b/package/MesaLib/patches/patch-bin_mklib
@@ -1,7 +1,7 @@
 diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
 --- Mesa-8.0.5.orig/bin/mklib	2012-10-24 21:03:58.000000000 +0200
-+++ Mesa-8.0.5/bin/mklib	2013-04-30 13:06:28.000000000 +0200
-@@ -333,12 +333,6 @@
++++ Mesa-8.0.5/bin/mklib	2013-09-19 11:59:49.000000000 +0200
+@@ -333,12 +333,6 @@ case $ARCH in
  	    # Check if objects are 32-bit and we're running in 64-bit
  	    # environment.  If so, pass -m32 flag to linker.
  	    set ${OBJECTS}
@@ -14,7 +14,7 @@ diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
  
              if [ "${ALTOPTS}" ] ; then
                  OPTS=${ALTOPTS}
-@@ -392,12 +386,6 @@
+@@ -392,12 +386,6 @@ case $ARCH in
  	    # Check if objects are 32-bit and we're running in 64-bit
  	    # environment.  If so, pass -m32 flag to linker.
  	    set ${OBJECTS}
@@ -27,7 +27,7 @@ diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
              if [ "${ALTOPTS}" ] ; then
                  OPTS=${ALTOPTS}
              fi
-@@ -466,12 +454,6 @@
+@@ -466,12 +454,6 @@ case $ARCH in
  		# Check if objects are 32-bit and we're running in 64-bit
  		# environment.  If so, pass -m32 flag to linker.
  		set ${OBJECTS}
diff --git a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
new file mode 100644
index 000000000..f1d92ca8c
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
@@ -0,0 +1,26 @@
+--- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c	2013-09-25 17:45:12.000000000 +0200
+@@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad
+ }
+ #endif
+ 
+-#ifdef __GLIBC__
+-#include <execinfo.h>
+-
+-/* This can only provide dynamic symbols, or binary offsets into a file.
+- *
+- * To fix this, post-process the output with tools/addr2line.sh
+- */
+-static INLINE void
+-debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
+-{
+-   char** syms = backtrace_symbols((void**)&addr, 1);
+-   strncpy(buf, syms[0], size);
+-   buf[size - 1] = 0;
+-   free(syms);
+-}
+-#endif
+-
+ void
+ debug_symbol_name(const void *addr, char* buf, unsigned size)
+ {
diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
new file mode 100644
index 000000000..5726c5c91
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
@@ -0,0 +1,45 @@
+--- Mesa-8.0.5.orig/src/gallium/include/pipe/p_config.h	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/include/pipe/p_config.h	2013-09-19 12:27:54.000000000 +0200
+@@ -111,7 +111,6 @@
+  * Endian detection.
+  */
+ 
+-#ifdef __GLIBC__
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+@@ -120,34 +119,6 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+ 
+-#elif defined(__APPLE__)
+-#include <machine/endian.h>
+-
+-#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
+-# define PIPE_ARCH_LITTLE_ENDIAN
+-#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
+-# define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#elif defined(__sun)
+-#include <sys/isa_defs.h>
+-
+-#if defined(_LITTLE_ENDIAN)
+-# define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(_BIG_ENDIAN)
+-# define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#else
+-
+-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
+-#define PIPE_ARCH_LITTLE_ENDIAN
+-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64)
+-#define PIPE_ARCH_BIG_ENDIAN
+-#endif
+-
+-#endif
+-
+ #if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN)
+ #error Unknown Endianness
+ #endif
diff --git a/package/MesaLib/patches/patch-src_glsl_strtod_c b/package/MesaLib/patches/patch-src_glsl_strtod_c
new file mode 100644
index 000000000..ce6514dbb
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_glsl_strtod_c
@@ -0,0 +1,32 @@
+--- Mesa-8.0.5.orig/src/glsl/strtod.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/glsl/strtod.c	2013-09-25 17:34:06.000000000 +0200
+@@ -25,14 +25,6 @@
+ 
+ 
+ #include <stdlib.h>
+-
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+ #include "strtod.h"
+ 
+ 
+@@ -44,14 +36,5 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtod_l(s, end, loc);
+-#else
+    return strtod(s, end);
+-#endif
+ }
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c
new file mode 100644
index 000000000..10cbca86a
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_c
@@ -0,0 +1,33 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.c	2013-09-25 17:41:11.000000000 +0200
+@@ -49,14 +49,6 @@
+ #include "mtypes.h"
+ #include "version.h"
+ 
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+-
+ #define MAXSTRING 4000  /* for vsnprintf() */
+ 
+ #ifdef WIN32
+@@ -766,14 +758,7 @@ _mesa_strdup( const char *s )
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(ANDROID) && !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtof_l(s, end, loc);
+-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
++#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+    return strtof(s, end);
+ #else
+    return (float)strtod(s, end);
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_h b/package/MesaLib/patches/patch-src_mesa_main_imports_h
new file mode 100644
index 000000000..43896c847
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_h
@@ -0,0 +1,13 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.h	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.h	2013-09-19 12:39:53.000000000 +0200
+@@ -568,10 +568,8 @@ _mesa_init_sqrt_table(void);
+ 
+ #ifdef __GNUC__
+ 
+-#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID) || defined(__APPLE__)
+ #define ffs __builtin_ffs
+ #define ffsll __builtin_ffsll
+-#endif
+ 
+ #define _mesa_ffs(i)  ffs(i)
+ #define _mesa_ffsll(i)  ffsll(i)
diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
new file mode 100644
index 000000000..f178bfef0
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
@@ -0,0 +1,11 @@
+--- Mesa-8.0.5.orig/src/mesa/main/querymatrix.c	2012-03-30 18:19:03.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/querymatrix.c	2013-09-19 12:19:01.000000000 +0200
+@@ -70,7 +70,7 @@ fpclassify(double x)
+     }
+ }
+ 
+-#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
++#elif defined(fpclassify) || 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__)