summaryrefslogtreecommitdiffstats
path: root/package/mesa3d
diff options
context:
space:
mode:
Diffstat (limited to 'package/mesa3d')
-rw-r--r--package/mesa3d/mesa3d.hash4
-rw-r--r--package/mesa3d/mesa3d.mk10
2 files changed, 11 insertions, 3 deletions
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index b02624522f..456348f23a 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/mesa-announce/2015-June/000157.html
-sha256 04d06890cd69af8089d6ca76f40e46dcf9cacfe4a9788b32be620574d4638818 mesa-10.5.7.tar.xz
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-June/000158.html
+sha256 f37e2633978deed02ff0522abc36c709586e2b555fd439a82ab71dce2c866c76 mesa-10.6.0.tar.xz
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 2a7e48c410..486a665a7e 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 10.5.7
+MESA3D_VERSION = 10.6.0
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
MESA3D_LICENSE = MIT, SGI, Khronos
@@ -20,6 +20,14 @@ MESA3D_DEPENDENCIES = \
expat \
libdrm
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MESA3D_DEPENDENCIES += openssl
+MESA3D_CONF_OPTS += --with-sha1=libcrypto
+else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+MESA3D_DEPENDENCIES += libgcrypt
+MESA3D_CONF_OPTS += --with-sha1=libgcrypt
+endif
+
ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_DEPENDENCIES += \
xproto_xf86driproto \
OpenPOWER on IntegriCloud