summaryrefslogtreecommitdiff
path: root/package/MesaLib
diff options
context:
space:
mode:
Diffstat (limited to 'package/MesaLib')
-rw-r--r--package/MesaLib/Makefile17
-rw-r--r--package/MesaLib/patches/patch-configure_ac6
-rw-r--r--package/MesaLib/patches/patch-include_c11_threads_posix_h11
-rw-r--r--package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h6
-rw-r--r--package/MesaLib/patches/patch-src_mesa_main_querymatrix_c6
5 files changed, 31 insertions, 15 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index c6e1811a5..97bbee79b 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -4,17 +4,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= MesaLib
-PKG_VERSION:= 9.2.2
-PKG_RELEASE:= 2
-PKG_MD5SUM:= df801a975045150790e10e2ccf32193f
+PKG_VERSION:= 10.1.0
+PKG_SUBVER:= 10.1
+PKG_RELEASE:= 3
+PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315
PKG_DESCR:= MESA 3D graphics library
PKG_SECTION:= libs
PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat
PKG_DEPENDS+= libxml2 libxml2-python
-PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes libXxf86vm libdrm
-PKG_BUILDDEP+= dri2proto glproto expat libXext
+PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes
+PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext
+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_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/
PKG_NEED_CXX:= 1
PKG_LIBNAME:= mesalib
PKG_OPTS:= dev
@@ -58,6 +61,8 @@ mesalib-install:
$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
$(CP) $(WRKINST)/usr/lib/libGL*.so* \
$(IDIR_MESALIB)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libglapi.so* \
+ $(IDIR_MESALIB)/usr/lib
${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \
${IDIR_MESALIB}/usr/lib/dri/
ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
diff --git a/package/MesaLib/patches/patch-configure_ac b/package/MesaLib/patches/patch-configure_ac
index c788ea1cd..32b3d8053 100644
--- a/package/MesaLib/patches/patch-configure_ac
+++ b/package/MesaLib/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- Mesa-9.2.2.orig/configure.ac 2013-10-19 01:36:09.000000000 +0200
-+++ Mesa-9.2.2/configure.ac 2013-12-01 14:08:00.000000000 +0100
-@@ -69,7 +69,7 @@ AC_PATH_PROG([PERL], [perl])
+--- 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
diff --git a/package/MesaLib/patches/patch-include_c11_threads_posix_h b/package/MesaLib/patches/patch-include_c11_threads_posix_h
new file mode 100644
index 000000000..2e79238f7
--- /dev/null
+++ b/package/MesaLib/patches/patch-include_c11_threads_posix_h
@@ -0,0 +1,11 @@
+--- 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);
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
index 021601b7f..b929e8758 100644
--- a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
+++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
@@ -1,6 +1,6 @@
---- Mesa-9.2.2.orig/src/gallium/include/pipe/p_config.h 2013-10-18 00:26:23.000000000 +0200
-+++ Mesa-9.2.2/src/gallium/include/pipe/p_config.h 2014-01-06 12:26:04.042469119 +0100
-@@ -126,7 +126,7 @@
+--- 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.
*/
diff --git a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
index 4ca3a2708..db87901d3 100644
--- a/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
+++ b/package/MesaLib/patches/patch-src_mesa_main_querymatrix_c
@@ -1,6 +1,6 @@
---- Mesa-9.2.2.orig/src/mesa/main/querymatrix.c 2013-04-08 20:21:04.000000000 +0200
-+++ Mesa-9.2.2/src/mesa/main/querymatrix.c 2013-10-24 17:06:31.000000000 +0200
-@@ -74,7 +74,7 @@ fpclassify(double x)
+--- 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__) || \