From 2bb6a2d1bf91f92fb7eaaf1a93443e73acfeb84f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Dec 2021 22:59:38 +0100 Subject: mesa: upgrade 21.3.0 -> 21.3.1 (From OE-Core rev: 1970fd5764adff10a5d7e643aeea7ce40d318f26) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-gl_21.3.0.bb | 16 ---------------- meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb | 16 ++++++++++++++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_21.3.0.bb | 5 ----- meta/recipes-graphics/mesa/mesa_21.3.1.bb | 5 +++++ 5 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.3.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_21.3.0.bb create mode 100644 meta/recipes-graphics/mesa/mesa_21.3.1.bb diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.3.0.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.0.bb deleted file mode 100644 index 142bb743b1..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_21.3.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -require mesa.inc - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -# At least one DRI rendering engine is required to build mesa. -# When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" -PACKAGECONFIG:class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" - -# 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS -# ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system -DRIDRIVERS ?= "" diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb b/meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb new file mode 100644 index 0000000000..142bb743b1 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_21.3.1.bb @@ -0,0 +1,16 @@ +require mesa.inc + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +# At least one DRI rendering engine is required to build mesa. +# When no X11 is available, use osmesa for the rendering engine. +PACKAGECONFIG ??= "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" +PACKAGECONFIG:class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" + +# 21.0.0 version fails to build when any driver is enabled in DRIDRIVERS +# ./mesa-21.0.0/meson.build:519:4: ERROR: Problem encountered: building dri drivers require at least one windowing system +DRIDRIVERS ?= "" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e601eac581..c894c2dab5 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \ " -SRC_URI[sha256sum] = "a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1" +SRC_URI[sha256sum] = "2b0dc2540cb192525741d00f706dbc4586349185dafc65729c7fda0800cc474d" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_21.3.0.bb b/meta/recipes-graphics/mesa/mesa_21.3.0.bb deleted file mode 100644 index 4cb7e80eb5..0000000000 --- a/meta/recipes-graphics/mesa/mesa_21.3.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${BPN}.inc -DRIDRIVERS ??= "" -DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965" -DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965" - diff --git a/meta/recipes-graphics/mesa/mesa_21.3.1.bb b/meta/recipes-graphics/mesa/mesa_21.3.1.bb new file mode 100644 index 0000000000..4cb7e80eb5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_21.3.1.bb @@ -0,0 +1,5 @@ +require ${BPN}.inc +DRIDRIVERS ??= "" +DRIDRIVERS:append:x86:class-target = ",r100,r200,nouveau,i965" +DRIDRIVERS:append:x86-64:class-target = ",r100,r200,nouveau,i965" + -- cgit v1.2.3-54-g00ecf