diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2016-02-08 14:59:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-11 12:27:47 +0000 |
commit | 34798fa0c526563a58e1f07bed3b80a216748f00 (patch) | |
tree | 825b6e069c8a284978c5efee412980aa16bbcf3e /meta/recipes-graphics/mesa/mesa.inc | |
parent | 7edea7c0a48656e0279d0ac00bb6ad7ceac7100e (diff) | |
download | poky-34798fa0c526563a58e1f07bed3b80a216748f00.tar.gz |
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.
(From OE-Core rev: 897e464cf316e668717c1aed146d0a9adb183986)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 8 |
1 files changed, 7 insertions, 1 deletions
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" | |||
24 | 24 | ||
25 | EXTRA_OECONF = "--enable-shared-glapi" | 25 | EXTRA_OECONF = "--enable-shared-glapi" |
26 | 26 | ||
27 | PACKAGECONFIG ??= "egl gles dri \ | 27 | PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \ |
28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ | 28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ |
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ | 29 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ |
30 | " | 30 | " |
@@ -62,6 +62,12 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, | |||
62 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" | 62 | export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" |
63 | PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" | 63 | PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" |
64 | 64 | ||
65 | # Mesa requires one of the following crypto implementation, pick one of them | ||
66 | MESA_CRYPTO ??= "openssl" | ||
67 | PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" | ||
68 | PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" | ||
69 | PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" | ||
70 | |||
65 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) | 71 | # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) |
66 | FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" | 72 | FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" |
67 | 73 | ||