From 494012830f049214adf7aaca10f46caed0c64409 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 6 Dec 2016 01:19:17 +0100 Subject: mesa: update to 13.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (From OE-Core rev: 0b3e3415c51dd534d8fc585ea1e3916375ddcc66) Signed-off-by: Andreas Müller Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb | 13 ------------- meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb | 13 +++++++++++++ meta/recipes-graphics/mesa/mesa_13.0.1.bb | 18 ------------------ meta/recipes-graphics/mesa/mesa_13.0.2.bb | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_13.0.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa_13.0.2.bb (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb deleted file mode 100644 index f06a3e9b58..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_13.0.1.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.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.2.bb new file mode 100644 index 0000000000..f06a3e9b58 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_13.0.2.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.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/mesa/mesa_13.0.1.bb b/meta/recipes-graphics/mesa/mesa_13.0.1.bb deleted file mode 100644 index 37ac15fdba..0000000000 --- a/meta/recipes-graphics/mesa/mesa_13.0.1.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] = "72b7f4d0c2407f367484abd201cb8276" -SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731" - -#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_13.0.2.bb b/meta/recipes-graphics/mesa/mesa_13.0.2.bb new file mode 100644 index 0000000000..bef1fa5c38 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_13.0.2.bb @@ -0,0 +1,18 @@ +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] = "9442c2dee914cde3d1f090371ab04113" +SRC_URI[sha256sum] = "a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5" + +#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 1.2.3-korg