From 11504a13530f483c1955d0f28f92d510885e4cee Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 28 Feb 2018 09:25:14 +0800 Subject: mesa: 17.3.5 -> 17.3.6 Upgrade mesa form 17.3.5 to 17.3.6. Signed-off-by: HuangQiyu Signed-off-by: Ross Burton --- meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb | 9 --------- meta/recipes-graphics/mesa/mesa-gl_17.3.6.bb | 9 +++++++++ meta/recipes-graphics/mesa/mesa_17.3.5.bb | 23 ----------------------- meta/recipes-graphics/mesa/mesa_17.3.6.bb | 23 +++++++++++++++++++++++ 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.3.6.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.3.5.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.3.6.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.5.bb deleted file mode 100644 index 73267eb4f0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.3.5.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_17.3.6.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.6.bb new file mode 100644 index 0000000000..73267eb4f0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.3.6.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_17.3.5.bb b/meta/recipes-graphics/mesa/mesa_17.3.5.bb deleted file mode 100644 index 3ce7135f28..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.3.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ - file://disable-asm-on-non-gcc.patch \ - file://Use-Python-3-to-execute-the-scripts.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ - file://0002-hardware-gloat.patch \ - file://llvm-config-version.patch \ - file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ - " - -SRC_URI[md5sum] = "bf73288c33cf12abe62045c25e2196b4" -SRC_URI[sha256sum] = "eb9228fc8aaa71e0205c1481c5b157752ebaec9b646b030d27478e25a6d7936a" - -#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.3.6.bb b/meta/recipes-graphics/mesa/mesa_17.3.6.bb new file mode 100644 index 0000000000..1ace5fd244 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.3.6.bb @@ -0,0 +1,23 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + file://disable-asm-on-non-gcc.patch \ + file://Use-Python-3-to-execute-the-scripts.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ + file://0002-hardware-gloat.patch \ + file://llvm-config-version.patch \ + file://0001-winsys-svga-drm-Include-sys-types.h.patch \ + file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + " + +SRC_URI[md5sum] = "ba66ae0f09b9b84482268608557cd175" +SRC_URI[sha256sum] = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8" + +#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