mesa: update 21.0.0 -> 21.0.1
PATCH 1/2 mesa: update 21.0.0 -> 21.0.1
---
.../mesa/{mesa-gl_21.0.0.bb => mesa-gl_21.0.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
meta/recipes-graphics/mesa/{mesa_21.0.0.bb => mesa_21.0.1.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/mesa/{mesa-gl_21.0.0.bb => mesa-gl_21.0.1.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_21.0.0.bb => mesa_21.0.1.bb} (100%)meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb renamed from meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb +0 -0
meta/recipes-graphics/mesa/mesa.inc +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.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+)+)"
meta/recipes-graphics/mesa/mesa_21.0.1.bb renamed from meta/recipes-graphics/mesa/mesa_21.0.0.bb +0 -0
Signature · 1 line
2.29.2
PATCH 2/2 ptest-runner: correct version check
--- meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb +0 -1
@@ -12,7 +12,6 @@ PV .= "+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \ " -UPSTREAM_VERSION_UNKNOWN = "1" S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
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/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.
Quoted 46 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../mesa/{mesa-gl_21.0.0.bb => mesa-gl_21.0.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/{mesa_21.0.0.bb => mesa_21.0.1.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/mesa/{mesa-gl_21.0.0.bb => mesa-gl_21.0.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_21.0.0.bb => mesa_21.0.1.bb}(100%)
meta/recipes-graphics/mesa/mesa-gl_21.0.1.bb renamed from meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb +0
-0meta/recipes-graphics/mesa/mesa.inc +0
-1@@ -21,7 +21,7 @@ SRC_URI = " https://mesa.freedesktop.org/archive/mesa-${PV}.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+)+)"meta/recipes-graphics/mesa/mesa_21.0.1.bb renamed from meta/recipes-graphics/mesa/mesa_21.0.0.bb +0
-1--2.29.2
Quoted 5 lines · Martin Jansa
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
Quoted 9 lines
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.
I'd rather Ross do it, as mesa-gl is 'his' recipe.
Alex
Quoted 11 lines · Martin Jansa
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.
meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb +0 -0
@@ -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 65 lines · On Wed, Mar 31, 2021 at 2:44 PM Alexander Kanavin <[email protected]…
Signed-off-by: Alexander Kanavin <[email protected]
<mailto:[email protected]>>
---
.../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 +-
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.2FWIW: 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!
Quoted 108 lines · Khem Raj
Quoted 6 lines · Martin Jansa
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>Quoted 9 lines
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.
meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb +0
-0@@ -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 10 lines
On Wed, Mar 31, 2021 at 2:44 PM Alexander Kanavin <[email protected] <mailto:[email protected]>> wrote:
Signed-off-by: Alexander Kanavin <[email protected] <mailto:[email protected]>> --- .../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 56 lines
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
Quoted 1 line · Martin Jansa
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).
It also in meta-raspberrypi which will need update if this patch works out ok.
Quoted 154 lines
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 <[email protected] <mailto:[email protected]>> wrote:
On 3/31/21 6:05 AM, Martin Jansa wrote: > 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/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> > <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.bb <http://mesa-gl_21.0.0.bb> b/meta/recipes-graphics/mesa/mesa-gl_21.0.0.bb <http://mesa-gl_21.0.0.bb> index e50782be1c..fc8b4f7504 100644 --- 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.0.bb <http://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)}" > > On Wed, Mar 31, 2021 at 2:44 PM Alexander Kanavin > <[email protected] <mailto:[email protected]> <mailto:[email protected] <mailto:[email protected]>>> wrote: > > Signed-off-by: Alexander Kanavin <[email protected] <mailto:[email protected]> > <mailto:[email protected] <mailto:[email protected]>>> > --- > .../mesa/{mesa-gl_21.0.0.bb <http://mesa-gl_21.0.0.bb> <http://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> <http://mesa-gl_21.0.1.bb <http://mesa-gl_21.0.1.bb>>} | 0 > meta/recipes-graphics/mesa/mesa.inc | 2 +- > meta/recipes-graphics/mesa/{mesa_21.0.0.bb <http://mesa_21.0.0.bb> <http://mesa_21.0.0.bb <http://mesa_21.0.0.bb>> > => mesa_21.0.1.bb <http://mesa_21.0.1.bb> <http://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> > <http://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> > <http://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> > <http://mesa_21.0.0.bb <http://mesa_21.0.0.bb>> => mesa_21.0.1.bb <http://mesa_21.0.1.bb> <http://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> > <http://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> > <http://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> > <http://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> > <http://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> > <https://mesa.freedesktop.org/archive/mesa-$%7BPV%7D.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> > <http://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> > <http://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> > <http://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> > <http://mesa_21.0.1.bb <http://mesa_21.0.1.bb>> > -- > 2.29.2 > > > > > > > >
Quoted 10 lines · Martin Jansa
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!
Look, the autobuilder found no issues whatsoever with this update. This is the line I draw in those oe-core version updates (which are apparently are mostly my problem for the past several years): I do not care for the myriad possible setups that are not a part of the autobuilder matrix.
Alex