From 2e42ded224eaf68fcf165f5d9763e426ec6630e8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 18 Jun 2018 16:14:47 -0300 Subject: mesa: Update 18.1.1 -> 18.1.2 This includes bug fixes for 18.1.x series. For list of changes check: https://www.mesa3d.org/relnotes/18.1.2.html (From OE-Core rev: 0cfc7488d67346bdc3975767366220e65f8de7d7) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb | 9 --------- meta/recipes-graphics/mesa/mesa-gl_18.1.2.bb | 9 +++++++++ meta/recipes-graphics/mesa/mesa_18.1.1.bb | 22 ---------------------- meta/recipes-graphics/mesa/mesa_18.1.2.bb | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_18.1.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_18.1.1.bb create mode 100644 meta/recipes-graphics/mesa/mesa_18.1.2.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb deleted file mode 100644 index 73267eb4f0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.1.2.bb b/meta/recipes-graphics/mesa/mesa-gl_18.1.2.bb new file mode 100644 index 0000000000..73267eb4f0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_18.1.2.bb @@ -0,0 +1,9 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_18.1.1.bb b/meta/recipes-graphics/mesa/mesa_18.1.1.bb deleted file mode 100644 index aab4a19315..0000000000 --- a/meta/recipes-graphics/mesa/mesa_18.1.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ - file://0002-Simplify-wayland-scanner-lookup.patch \ - file://0003-winsys-svga-drm-Include-sys-types.h.patch \ - file://0004-hardware-gloat.patch \ - file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ - file://0006-Use-Python-3-to-execute-the-scripts.patch \ - file://0007-dri-i965-Add-missing-time.h-include.patch \ -" - -SRC_URI[md5sum] = "063468c930ff61d211ece0191874fa95" -SRC_URI[sha256sum] = "d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781" - -#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_18.1.2.bb b/meta/recipes-graphics/mesa/mesa_18.1.2.bb new file mode 100644 index 0000000000..2c06b1eb7b --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_18.1.2.bb @@ -0,0 +1,22 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + file://0002-Simplify-wayland-scanner-lookup.patch \ + file://0003-winsys-svga-drm-Include-sys-types.h.patch \ + file://0004-hardware-gloat.patch \ + file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ + file://0006-Use-Python-3-to-execute-the-scripts.patch \ + file://0007-dri-i965-Add-missing-time.h-include.patch \ +" + +SRC_URI[md5sum] = "a2d4f031eb6bd6111d44d84004476918" +SRC_URI[sha256sum] = "070bf0648ba5b242d7303ceed32aed80842f4c0ba16e5acc1a650a46eadfb1f9" + +#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