| Message ID | 20250520174529.1173460-1-dmitry.baryshkov@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] mesa: don't build empty libgles3-mesa in GLVND case | expand |
2025. 05. 20. 19:45 keltezéssel, Dmitry Baryshkov via lists.openembedded.org írta: > If GLVND is enabled, there is no libgles2-mesa package to depend on > libgles3-mesa. Stop building unused empty package in this case. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > --- > meta/recipes-graphics/mesa/mesa.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > index 288027bbb996..89ae71595991 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -247,7 +247,7 @@ RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" > # GLES2 and GLES3 implementations are packaged in a single library in libgles2-mesa. > # Add a dependency so the GLES3 dev package is associated with its implementation. > RDEPENDS:libgles2-mesa += "libgles3-mesa" > -ALLOW_EMPTY:libgles3-mesa = "1" > +ALLOW_EMPTY:libgles3-mesa = "${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', '1', d)}" Why not merge the two packages instead? The GLES implementation in Mesa includes both 2.x and 3.x, regardless of being standalone lib or ICD.
On Wed, May 21, 2025 at 11:03:15AM +0200, Böszörményi Zoltán wrote: > 2025. 05. 20. 19:45 keltezéssel, Dmitry Baryshkov via lists.openembedded.org írta: > > If GLVND is enabled, there is no libgles2-mesa package to depend on > > libgles3-mesa. Stop building unused empty package in this case. > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > > --- > > meta/recipes-graphics/mesa/mesa.inc | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > > index 288027bbb996..89ae71595991 100644 > > --- a/meta/recipes-graphics/mesa/mesa.inc > > +++ b/meta/recipes-graphics/mesa/mesa.inc > > @@ -247,7 +247,7 @@ RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" > > # GLES2 and GLES3 implementations are packaged in a single library in libgles2-mesa. > > # Add a dependency so the GLES3 dev package is associated with its implementation. > > RDEPENDS:libgles2-mesa += "libgles3-mesa" > > -ALLOW_EMPTY:libgles3-mesa = "1" > > +ALLOW_EMPTY:libgles3-mesa = "${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', '1', d)}" > > Why not merge the two packages instead? > The GLES implementation in Mesa includes both 2.x and 3.x, > regardless of being standalone lib or ICD. Might be a good idea, indeed.
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 288027bbb996..89ae71595991 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -247,7 +247,7 @@ RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" # GLES2 and GLES3 implementations are packaged in a single library in libgles2-mesa. # Add a dependency so the GLES3 dev package is associated with its implementation. RDEPENDS:libgles2-mesa += "libgles3-mesa" -ALLOW_EMPTY:libgles3-mesa = "1" +ALLOW_EMPTY:libgles3-mesa = "${@bb.utils.contains('PACKAGECONFIG', 'glvnd', '', '1', d)}" RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools spirv-llvm-translator', '', d)}"
If GLVND is enabled, there is no libgles2-mesa package to depend on libgles3-mesa. Stop building unused empty package in this case. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)