From 3bc700a12d4f21a5c7a1575da0972f9f78b4a091 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Mar 2019 18:30:18 +0100 Subject: mesa: update 19.0.0 -> 19.0.1 x.0.0 releases are actually considered 'development' by the upstream, and true releases are x.0.1: https://www.mesa3d.org/relnotes/19.0.0.html (From OE-Core rev: ceb6a4373dd68cc65dd3d2d73cf632bc34dfbeb0) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb | 10 ---------- meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb | 10 ++++++++++ meta/recipes-graphics/mesa/mesa_19.0.0.bb | 19 ------------------- meta/recipes-graphics/mesa/mesa_19.0.1.bb | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_19.0.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa_19.0.1.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb deleted file mode 100644 index d4b1c1c454..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_19.0.0.bb +++ /dev/null @@ -1,10 +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)}" -PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb b/meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb new file mode 100644 index 0000000000..d4b1c1c454 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb @@ -0,0 +1,10 @@ +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)}" +PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_19.0.0.bb b/meta/recipes-graphics/mesa/mesa_19.0.0.bb deleted file mode 100644 index 024acdad0b..0000000000 --- a/meta/recipes-graphics/mesa/mesa_19.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://0001-Simplify-wayland-scanner-lookup.patch \ - file://0002-winsys-svga-drm-Include-sys-types.h.patch \ - file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ - file://0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ -" - -SRC_URI[md5sum] = "d0d76cd8b00bc1308e37985d4a45d3c5" -SRC_URI[sha256sum] = "5a549dfb40ec31e5c36c47aadac04554cb2e2a8d144a046a378fc16da57e38f8" - -#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_19.0.1.bb b/meta/recipes-graphics/mesa/mesa_19.0.1.bb new file mode 100644 index 0000000000..d90be8a074 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_19.0.1.bb @@ -0,0 +1,19 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://0001-Simplify-wayland-scanner-lookup.patch \ + file://0002-winsys-svga-drm-Include-sys-types.h.patch \ + file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ + file://0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ +" + +SRC_URI[md5sum] = "19636bb3da35c21f43040d31e575d5ce" +SRC_URI[sha256sum] = "6884163c0ea9e4c98378ab8fecd72fe7b5f437713a14471beda378df247999d4" + +#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