From 21240081c0d7d6ee31579a2e950c6fea591270b1 Mon Sep 17 00:00:00 2001 From: Nathan Hartman Date: Thu, 5 Mar 2020 07:41:19 -0800 Subject: mesa: updated to 20.0 release Updated mesa and mesa-gl recipes to 20.0 release. The license checksum difference is due to a small change in the license formatting. The asterisk for footnotes was changed to a '[1]' See: https://gitlab.freedesktop.org/mesa/mesa/-/commit/199572b65b7a03ffc887783e7f0f96f95bf1f99d glxgears runs successfully at 60 fps on a rpi4. (From OE-Core rev: 0ee03e11bc2ae3faa6a2fcfdfae2ea35f7ba70ba) Signed-off-by: Nathan Hartman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb | 10 ---------- meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb | 10 ++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_19.3.4.bb | 25 ------------------------- meta/recipes-graphics/mesa/mesa_20.0.0.bb | 25 +++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_19.3.4.bb create mode 100644 meta/recipes-graphics/mesa/mesa_20.0.0.bb (limited to 'meta') diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb deleted file mode 100644 index d4b1c1c454..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_19.3.4.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_20.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb new file mode 100644 index 0000000000..d4b1c1c454 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_20.0.0.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.inc b/meta/recipes-graphics/mesa/mesa.inc index 54d7ea8961..b7ef496fdc 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f7" PE = "2" diff --git a/meta/recipes-graphics/mesa/mesa_19.3.4.bb b/meta/recipes-graphics/mesa/mesa_19.3.4.bb deleted file mode 100644 index 5f456c2429..0000000000 --- a/meta/recipes-graphics/mesa/mesa_19.3.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ - file://0002-meson.build-make-TLS-ELF-optional.patch \ - file://0003-Allow-enable-DRI-without-DRI-drivers.patch \ - file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ - file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ - file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ - " - -SRC_URI[md5sum] = "09e7700d9af511384d131fb77b5802cb" -SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" - -UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" - -CFLAGS += "-fcommon" - -#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/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_20.0.0.bb b/meta/recipes-graphics/mesa/mesa_20.0.0.bb new file mode 100644 index 0000000000..2ed7ca2252 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_20.0.0.bb @@ -0,0 +1,25 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ + file://0002-meson.build-make-TLS-ELF-optional.patch \ + file://0003-Allow-enable-DRI-without-DRI-drivers.patch \ + file://0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch \ + file://0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch \ + file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ + " + +SRC_URI[md5sum] = "681229d992bbd6250a5be4f308708795" +SRC_URI[sha256sum] = "bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34" + +UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" + +CFLAGS += "-fcommon" + +#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/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit v1.2.3-54-g00ecf