Re: [OE-core] [PATCH 1/2] mesa: update 21.0.0 -> 21.0.1
From: Martin Jansa <hidden>
Date: 2021-03-31 18:50:29
FWIW: I don't use mesa-gl at all, I've noticed it only in git grep DRIDRIVERS when looking why swrast was still enabled in our normal mesa (and it was because of our own bbappend). But I agree that it's sad that it's OK to break Ross's recipe, when auh says there is an update available, but it's Ross's responsibility now to fix the follow-up breakage from that upgrade. Thanks for the patch Khem! On Wed, Mar 31, 2021 at 7:13 PM Khem Raj [off-list ref] wrote:
quoted hunk ↗ jump to hunk
On 3/31/21 6:05 AM, Martin Jansa wrote:quoted
Are you going to fix meta-gl issue with swrast still in DRIDRIVERS reported on previous upgrade? https://lists.openembedded.org/g/openembedded-core/message/149775 <https://lists.openembedded.org/g/openembedded-core/message/149775> https://lists.openembedded.org/g/openembedded-core/message/149779 <https://lists.openembedded.org/g/openembedded-core/message/149779> I don't know what exactly AB builds, but it's easy to reproduce locally, something like: DISTRO_FEATURES_remove = "x11" PREFERRED_PROVIDER_virtual/libgl = "mesa-gl" PREFERRED_PROVIDER_virtual/mesa = "mesa-gl" bitbake mesa-gl should be enough to see build failure.it is a build regression. mesa and mesa-gl should be updated in sync and especially if you reported the fallout and if it went unaddressed is sad. Could you try a patch somethiing like this and see if it helps.diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bbb/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb index e50782be1c..fc8b4f7504 100644--- a/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb@@ -12,4 +12,4 @@ PACKAGECONFIG ??= "opengl dri${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x1 PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" # When NOT using X11, we need to make sure we have swrast available. -DRIDRIVERS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ',swrast', d)}" +GALLIUMDRIVERS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', ',swrast', d)}"quoted
On Wed, Mar 31, 2021 at 2:44 PM Alexander Kanavin <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>> wrote: Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>> --- .../mesa/{mesa-gl_21.0.0.bb <http://mesa-gl_21.0.0.bb> => mesa-gl_21.0.1.bb <http://mesa-gl_21.0.1.bb>} | 0 meta/recipes-graphics/mesa/mesa.inc |2 +-quoted
meta/recipes-graphics/mesa/{mesa_21.0.0.bb <http://mesa_21.0.0.bb> => mesa_21.0.1.bb <http://mesa_21.0.1.bb>} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/mesa/{mesa-gl_21.0.0.bb <http://mesa-gl_21.0.0.bb> => mesa-gl_21.0.1.bb <http://mesa-gl_21.0.1.bb>} (100%) rename meta/recipes-graphics/mesa/{mesa_21.0.0.bb <http://mesa_21.0.0.bb> => mesa_21.0.1.bb <http://mesa_21.0.1.bb>} (100%) diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb <http://mesa-gl_21.0.0.bb> b/meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb <http://mesa-gl_21.0.1.bb> similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb <http://mesa-gl_21.0.0.bb> rename to meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb <http://mesa-gl_21.0.1.bb> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e9b72ce063..a40dad2b81 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz <https://mesa.freedesktop.org/archive/mesa-$%7BPV%7D.tar.xz> \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84" +SRC_URI[sha256sum] = "379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_21.0.0.bb <http://mesa_21.0.0.bb> b/meta/recipes-graphics/mesa/mesa_21.0.1.bb <http://mesa_21.0.1.bb> similarity index 100% rename from meta/recipes-graphics/mesa/mesa_21.0.0.bb <http://mesa_21.0.0.bb> rename to meta/recipes-graphics/mesa/mesa_21.0.1.bb <http://mesa_21.0.1.bb> -- 2.29.2