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:27 +0000 |
| commit | 897e464cf316e668717c1aed146d0a9adb183986 (patch) | |
| tree | ab554c96c51c932b0b4ccb5c6f254d56861299a6 /meta/recipes-graphics | |
| parent | 00a45d2e50c4f044ee4099940dd7d13ca44f7187 (diff) | |
| download | openembedded-core-897e464cf316e668717c1aed146d0a9adb183986.tar.gz openembedded-core-897e464cf316e668717c1aed146d0a9adb183986.tar.bz2 openembedded-core-897e464cf316e668717c1aed146d0a9adb183986.zip | |
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 <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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.inc | 8 | ||||
| -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" 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" 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 @@ require ${BPN}.inc -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/${PV}/mesa-${PV}.tar.xz" +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" -SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" -SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" +SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427" +SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |