package/{mesa3d, mesa3d-headers}: bump version to 10.6.0

Mesa3d 10.6 adds optional support for SHA-1:
http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=a24bdce46f95cbe9efd3b26f157d1eb36584861f

Adding "--without-sha1" will cause this failure during configure:

configure: error: Illegal value for --with-sha1: no

so I did not add the else-clause when no SHA-1 provider is enabled.

[Thomas: simplify else ifeq.]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 09794065e54a35eca33a4a75c678f276604254bb..07340f77089277f66dbf00df46b3b09330615217 100644 (file)
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 10.5.7
+MESA3D_HEADERS_VERSION = 10.6.0
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
 MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos

diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index b02624522fda8309ce0682ebed1d236c708b6091..456348f23a813d5c4881935617d6f1d91ad615d3 100644 (file)
--- 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 2a7e48c410992be9578265b565de7b6f976c315f..486a665a7e5fdb746abd7ea9195cc8a7f3f726a9 100644 (file)
--- 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 \