Message ID | 20250801-mesa-libclc-panfrost-v4-3-101c6dcf564f@cherry.de |
---|---|
State | New |
Headers | show |
Series | mesa: lighten up target's libclc dependencies and fix panfrost support | expand |
> On 1 Aug 2025, at 12:03, Quentin Schulz <foss+yocto@0leil.net> wrote: > > From: Quentin Schulz <quentin.schulz@cherry.de> > > There currently are two recipes including mesa.inc, mesa-gl and mesa. > The former overrides PROVIDES and the latter just inherits it from > mesa.inc. > Let's just move PROVIDES to where it makes sense the mesa recipe. > > No intended change in behavior. Doesn’t this remove the provides from mesa-gl? Ross
Hi Ross, On 8/6/25 12:50 PM, Ross Burton via lists.openembedded.org wrote: > > >> On 1 Aug 2025, at 12:03, Quentin Schulz <foss+yocto@0leil.net> wrote: >> >> From: Quentin Schulz <quentin.schulz@cherry.de> >> >> There currently are two recipes including mesa.inc, mesa-gl and mesa. >> The former overrides PROVIDES and the latter just inherits it from >> mesa.inc. >> Let's just move PROVIDES to where it makes sense the mesa recipe. >> >> No intended change in behavior. > > Doesn’t this remove the provides from mesa-gl? > No. The current mesa-gl recipe does: """ require mesa.inc [...] PROVIDES = "virtual/libgl virtual/mesa" """ so whatever PROVIDES is set to in mesa.inc is ignored anyway, as explained (worded differently though) in the commit log. Do you have a suggestion on how to rephrase to make this clearer to the reader? Cheers, Quentin
On Mon, Aug 11, 2025 at 03:08:01PM +0200, Quentin Schulz wrote: > Hi Ross, > > On 8/6/25 12:50 PM, Ross Burton via lists.openembedded.org wrote: > > > > > > > On 1 Aug 2025, at 12:03, Quentin Schulz <foss+yocto@0leil.net> wrote: > > > > > > From: Quentin Schulz <quentin.schulz@cherry.de> > > > > > > There currently are two recipes including mesa.inc, mesa-gl and mesa. > > > The former overrides PROVIDES and the latter just inherits it from > > > mesa.inc. > > > Let's just move PROVIDES to where it makes sense the mesa recipe. > > > > > > No intended change in behavior. > > > > Doesn’t this remove the provides from mesa-gl? > > > > No. The current mesa-gl recipe does: > > """ > require mesa.inc > [...] > PROVIDES = "virtual/libgl virtual/mesa" > """ Hmm, this might need a fix for GLVND, but this is again a separate topic. > > so whatever PROVIDES is set to in mesa.inc is ignored anyway, as explained > (worded differently though) in the commit log. Do you have a suggestion on > how to rephrase to make this clearer to the reader? Maybe "Move PROVIDES from mesa.inc to mesa.bb, keeping the value in mesa-gl.bb intact." ?
diff --git a/meta/recipes-graphics/mesa/mesa.bb b/meta/recipes-graphics/mesa/mesa.bb index 305b18070d6a47a53f204906a16bc8d4833fd9d6..51d0384ef5930f36ff2f5c20ebad2d7ad8b817a9 100644 --- a/meta/recipes-graphics/mesa/mesa.bb +++ b/meta/recipes-graphics/mesa/mesa.bb @@ -12,3 +12,14 @@ PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd nouveau svga" PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd nouveau svga" PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel amd nouveau svga" PACKAGECONFIG:append:class-native = " libclc gallium-llvm amd nouveau svga" + +GLPROVIDES = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ +" +PROVIDES = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', d.getVar('GLPROVIDES'), d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ + virtual/mesa \ +" diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 0dd9f9cb882014fc6784b0a71b7645072714a3b4..6da99293ca844a253705d4759f72bf148f5a72c8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -42,16 +42,6 @@ do_install:append() { DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native python3-pyyaml-native" EXTRANATIVEPATH += "chrpath-native" -GLPROVIDES = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ -" -PROVIDES = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', d.getVar('GLPROVIDES'), d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ - virtual/mesa \ - " inherit meson pkgconfig python3native gettext features_check rust