From e4ffcaea2282f08bf7a7079330b5102ef7d26128 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 28 Feb 2017 11:26:56 +0200 Subject: mesa: Upgrade 13.0.4 -> 17.0.0 17.0.0 is considered a development release: 17.0.1 is expected to be the first stable in this series. Typically the .1 release comes about two weeks after .0. * New feature release with lots of changes * Versioning change (17 as in 2017, no longer relates to GL bumps) * OpenGL 4.5 support on Haswell * mesa now implements its own sha1 instead of having 5 configurable sha-providers * Remove libxvmcsoftpipe packaging, the library hasn't existed since 2013 (From OE-Core rev: be95558834eed0564ec00c65ac8067c7c65006c5) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 11 +---------- meta/recipes-graphics/mesa/mesa_13.0.4.bb | 18 ------------------ meta/recipes-graphics/mesa/mesa_17.0.0.bb | 17 +++++++++++++++++ 5 files changed, 31 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_13.0.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.0.0.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb deleted file mode 100644 index 85cc396fe3..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.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 ${MESA_CRYPTO} ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb new file mode 100644 index 0000000000..85cc396fe3 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.0.0.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 ${MESA_CRYPTO} ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 87c6821e65..f0d01c6b23 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 ??= "gbm egl gles dri ${MESA_CRYPTO} \ +PACKAGECONFIG ??= "gbm egl gles dri \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ " @@ -66,12 +66,6 @@ PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" -# 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" @@ -93,7 +87,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libwayland-egl libwayland-egl-dev \ - libxvmcsoftpipe libxvmcsoftpipe-dev \ libxatracker libxatracker-dev \ mesa-megadriver \ " @@ -177,7 +170,6 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" -FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" FILES_libxatracker = "${libdir}/libxatracker.so.*" FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" @@ -190,7 +182,6 @@ FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/p FILES_libgles3-mesa-dev = "${includedir}/GLES3" FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" -FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ ${libdir}/pkgconfig/xatracker.pc" diff --git a/meta/recipes-graphics/mesa/mesa_13.0.4.bb b/meta/recipes-graphics/mesa/mesa_13.0.4.bb deleted file mode 100644 index 1416c9f8b8..0000000000 --- a/meta/recipes-graphics/mesa/mesa_13.0.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ - file://disable-asm-on-non-gcc.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ -" - -SRC_URI[md5sum] = "d088a921e935218833a8071cb672a574" -SRC_URI[sha256sum] = "a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726" - -#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_17.0.0.bb b/meta/recipes-graphics/mesa/mesa_17.0.0.bb new file mode 100644 index 0000000000..6576e3c62b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.0.0.bb @@ -0,0 +1,17 @@ +require ${BPN}.inc + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ +" +SRC_URI[md5sum] = "932e4171a86b14940c06812356486155" +SRC_URI[sha256sum] = "39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481" + +#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