summaryrefslogtreecommitdiff
path: root/package/MesaLib
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-24 16:36:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-24 16:36:52 +0200
commit82cce6038c7fc05bf1107613fc4b5d3ba8aceb83 (patch)
tree3ed19c48bfe55c1a95e7e34ec7798fb13a23922f /package/MesaLib
parent24092f8e8b58464e33d163d8dee9e864895b50a5 (diff)
parentba1dbc96f36abce072ac39a33bb0bd85e12a4e97 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/MesaLib')
-rw-r--r--package/MesaLib/Makefile27
-rw-r--r--package/MesaLib/patches/patch-bin_mklib42
-rw-r--r--package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c39
-rw-r--r--package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h45
-rw-r--r--package/MesaLib/patches/patch-src_glsl_Makefile10
-rw-r--r--package/MesaLib/patches/patch-src_glsl_strtod_c32
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_imports_c33
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_imports_h13
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_querymatrix_c11
9 files changed, 6 insertions, 246 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 9a8d4420a..694c6b0b1 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -4,10 +4,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= MesaLib
-PKG_VERSION:= 8.0.5
-PKG_RELEASE:= 3
-PKG_MD5SUM:= cda5d101f43b8784fa60bdeaca4056f2
-PKG_DESCR:= MESA library
+PKG_VERSION:= 9.2.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= df801a975045150790e10e2ccf32193f
+PKG_DESCR:= MESA 3D graphics library
PKG_SECTION:= libs
PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat
PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm
@@ -40,28 +40,13 @@ CONFIGURE_ARGS+= --disable-static \
--disable-gles1 \
--disable-gles2 \
--with-dri-drivers=${DRI_DRIVERS},swrast
-CONFIGURE_ENV+= PYTHON2=/usr/bin/python
+CONFIGURE_ENV+= PYTHON2=/usr/bin/python MISSING="echo"
-XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
+XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD}
ifeq ($(ADK_NATIVE),y)
XAKE_FLAGS+= RANLIB=ranlib AR=ar
endif
-post-extract:
- (cd ${WRKBUILD}; rm -rf config.{cache,status}; \
- ./configure \
- --disable-static \
- --disable-gallium-llvm \
- --with-gallium-drivers=swrast \
- --with-driver=xlib \
- );
- ${MAKE} -C ${WRKBUILD}/src/glsl
- ${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:
$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
$(CP) $(WRKINST)/usr/lib/libGL*.so* \
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib
deleted file mode 100644
index a361c1105..000000000
--- a/package/MesaLib/patches/patch-bin_mklib
+++ /dev/null
@@ -1,42 +0,0 @@
-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-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}
-- ABI32=`file $1 | grep 32-bit`
-- ARM=`file $1 | grep ARM`
-- # Do not add "-m32" option for arm.
-- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-- OPTS="-m32 ${OPTS}"
-- fi
-
- if [ "${ALTOPTS}" ] ; then
- OPTS=${ALTOPTS}
-@@ -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}
-- ABI32=`file $1 | grep 32-bit`
-- ARM=`file $1 | grep ARM`
-- # Do not add "-m32" option for arm.
-- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
-- OPTS="-m32 ${OPTS}"
-- fi
- if [ "${ALTOPTS}" ] ; then
- OPTS=${ALTOPTS}
- fi
-@@ -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}
-- ABI32=`file $1 | grep 32-bit`
-- if [ "${ABI32}" ] ; then
-- OPTS="-m32 -shared -Wl,-Bdynamic"
-- else
-- OPTS="-m64 -shared -Wl,-Bdynamic"
-- fi
- fi
-
- # If using Sun C++ compiler, need to tell it not to add runpaths
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
deleted file mode 100644
index b5da190a5..000000000
--- a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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-10-08 12:13:11.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)
- {
-@@ -176,12 +159,6 @@ debug_symbol_name(const void *addr, char
- if(buf[0])
- return;
- #endif
--
--#ifdef __GLIBC__
-- debug_symbol_name_glibc(addr, buf, size);
-- if(buf[0])
-- return;
--#endif
-
- util_snprintf(buf, size, "%p", addr);
- buf[size - 1] = 0;
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
deleted file mode 100644
index 5726c5c91..000000000
--- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile
deleted file mode 100644
index f8f85b7ec..000000000
--- a/package/MesaLib/patches/patch-src_glsl_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Mesa-8.0.5.orig/src/glsl/Makefile 2012-10-24 21:03:59.000000000 +0200
-+++ Mesa-8.0.5/src/glsl/Makefile 2013-04-30 12:25:40.000000000 +0200
-@@ -167,6 +167,6 @@ builtin_compiler: $(GLSL2_OBJECTS) $(OBJ
-
- builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
- @echo Regenerating builtin_function.cpp...
-- $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
-+ $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
-
- -include depend
diff --git a/package/MesaLib/patches/patch-src_glsl_strtod_c b/package/MesaLib/patches/patch-src_glsl_strtod_c
deleted file mode 100644
index ce6514dbb..000000000
--- a/package/MesaLib/patches/patch-src_glsl_strtod_c
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index 10cbca86a..000000000
--- a/package/MesaLib/patches/patch-src_mesa_main_imports_c
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index 43896c847..000000000
--- a/package/MesaLib/patches/patch-src_mesa_main_imports_h
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index f178bfef0..000000000
--- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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__)