From 34798fa0c526563a58e1f07bed3b80a216748f00 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. (From OE-Core rev: 897e464cf316e668717c1aed146d0a9adb183986) Signed-off-by: Nicolas Dechesne Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 8 +++++++- meta/recipes-graphics/mesa/mesa_10.6.3.bb | 14 -------------- meta/recipes-graphics/mesa/mesa_11.1.1.bb | 14 ++++++++++++++ 5 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_10.6.3.bb create mode 100644 meta/recipes-graphics/mesa/mesa_11.1.1.bb (limited to 'meta') diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb deleted file mode 100644 index fc2bca9982..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb new file mode 100644 index 0000000000..fc2bca9982 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb @@ -0,0 +1,13 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" 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_10.6.3.bb deleted file mode 100644 index 5da56ad938..0000000000 --- a/meta/recipes-graphics/mesa/mesa_10.6.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/${PV}/mesa-${PV}.tar.xz" - -SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" -SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_11.1.1.bb b/meta/recipes-graphics/mesa/mesa_11.1.1.bb new file mode 100644 index 0000000000..5d73feb5fb --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_11.1.1.bb @@ -0,0 +1,14 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" + +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 +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit v1.2.3-54-g00ecf