From 2e213dd1b39615cf0f8ff92b6164c4f6c80b1844 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 6 Mar 2017 12:08:14 +0200 Subject: mesa: Upgrade 17.0.0 -> 17.0.1 This is a bug fix release and first non-development release in 17.0 branch. There are ~50 bug fix commits (plus a few release script commits). (From OE-Core rev: 465a6b49b680e1fedb059e97eb682cf5814cf078) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_17.0.1.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa_17.0.0.bb | 17 ----------------- meta/recipes-graphics/mesa/mesa_17.0.1.bb | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.0.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.0.1.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb deleted file mode 100644 index 85cc396fe3..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.0.0.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.1.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.1.bb new file mode 100644 index 0000000000..85cc396fe3 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.0.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 ${MESA_CRYPTO} ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_17.0.0.bb b/meta/recipes-graphics/mesa/mesa_17.0.0.bb deleted file mode 100644 index 6576e3c62b..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -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 -} diff --git a/meta/recipes-graphics/mesa/mesa_17.0.1.bb b/meta/recipes-graphics/mesa/mesa_17.0.1.bb new file mode 100644 index 0000000000..9e491c28dc --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.0.1.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] = "6a7e768241846c8c69bbadbf904dcc58" +SRC_URI[sha256sum] = "96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c" + +#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