summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2016-02-08 14:59:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:47 +0000
commit34798fa0c526563a58e1f07bed3b80a216748f00 (patch)
tree825b6e069c8a284978c5efee412980aa16bbcf3e /meta/recipes-graphics
parent7edea7c0a48656e0279d0ac00bb6ad7ceac7100e (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc8
-rw-r--r--meta/recipes-graphics/mesa/mesa_11.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa_10.6.3.bb)6
3 files changed, 10 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb
index fc2bca9982..fc2bca9982 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb
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
25EXTRA_OECONF = "--enable-shared-glapi" 25EXTRA_OECONF = "--enable-shared-glapi"
26 26
27PACKAGECONFIG ??= "egl gles dri \ 27PACKAGECONFIG ??= "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,
62export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" 62export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
63PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" 63PACKAGECONFIG[xa] = "--enable-xa, --disable-xa"
64 64
65# Mesa requires one of the following crypto implementation, pick one of them
66MESA_CRYPTO ??= "openssl"
67PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
68PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
69PACKAGECONFIG[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)
66FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" 72FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
67 73
diff --git a/meta/recipes-graphics/mesa/mesa_10.6.3.bb b/meta/recipes-graphics/mesa/mesa_11.1.1.bb
index 5da56ad938..5d73feb5fb 100644
--- a/meta/recipes-graphics/mesa/mesa_10.6.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_11.1.1.bb
@@ -1,9 +1,9 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/${PV}/mesa-${PV}.tar.xz" 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz"
4 4
5SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" 5SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427"
6SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" 6SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20"
7 7
8#because we cannot rely on the fact that all apps will use pkgconfig, 8#because we cannot rely on the fact that all apps will use pkgconfig,
9#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 9#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER