From 897e464cf316e668717c1aed146d0a9adb183986 Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Mon, 8 Feb 2016 14:59:08 +0000 Subject: mesa: upgrade 10.6.3 -> 11.1.1 * update SRC_URI and checksum. * add PACKAGECONFIG to offer choice of crypto implementation (for sha1 functions) * use libcrypto by default. In upstream commit a24bdce4, support for SHA-1 was copied from xserver repo, so let's use the same default for --with-sha1 option that we use in xserver recipe in OE core. Signed-off-by: Nicolas Dechesne Signed-off-by: Ross Burton --- meta/recipes-graphics/mesa/mesa.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/mesa/mesa.inc') diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 9b316e1854..5ce96dd965 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OECONF = "--enable-shared-glapi" -PACKAGECONFIG ??= "egl gles dri \ +PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ " @@ -62,6 +62,12 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" +# Mesa requires one of the following crypto implementation, pick one of them +MESA_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" + # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" -- cgit 1.2.3-korg