mesa: make runtime variables depend on PACKAGECONFIG
PATCH 1/4 mesa: make runtime variables depend on PACKAGECONFIG
- This solves a conflict between mesa-gl and a custom library, both providing a libgles2 package, although being disabled in mesa-gl.
Signed-off-by Andreas Oberritter <[email protected]>
--- meta/recipes-graphics/mesa/mesa.inc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
meta/recipes-graphics/mesa/mesa.inc +11 -6
@@ -105,11 +105,16 @@ do_install_append () { # they don't get Debian-renamed (which would remove the -mesa suffix), and # RPROVIDEs/RCONFLICTs on the generic libgl name. python __anonymous() { - for p in (("libegl", "libegl1"), ("libgl", "libgl1"), - ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), - ("libgles3",)): - fullp = p[0] + "-mesa" - pkgs = " ".join(p) + pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() + for p in (("egl", "libegl", "libegl1"), + ("dri", "libgl", "libgl1"), + ("gles", "libgles1", "libglesv1-cm1"), + ("gles", "libgles2", "libglesv2-2"), + ("gles", "libgles3",)): + if not p[0] in pkgconfig: + continue + fullp = p[1] + "-mesa" + pkgs = " ".join(p[1:]) d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs)
@@ -117,7 +122,7 @@ python __anonymous() { # For -dev, the first element is both the Debian and original name fullp += "-dev" - pkgs = p[0] + "-dev" + pkgs = p[1] + "-dev" d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs)
Signature · 1 line
1.8.1.2
PATCH 2/4 mesa-gl: use base_set_filespath
- Fixes FILESEXTRAPATHS being ignored in mesa-gl bbappend.
Signed-off-by Andreas Oberritter <[email protected]>
--- meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb +1 -1
@@ -2,7 +2,7 @@ require mesa_${PV}.bb SUMMARY += " (OpenGL only, no EGL/GLES)" -FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/mesa" +FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}", "${FILE_DIRNAME}/mesa"], d)}" PROVIDES = "virtual/libgl virtual/mesa"
Signature · 1 line
1.8.1.2
PATCH 3/4 cogl-1.0: depend on virtual/mesa
In reply to Andreas Oberritter- Wayland support depends on wayland-egl, which is provided by mesa.
Signed-off-by Andreas Oberritter <[email protected]>
--- meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/cogl/cogl-1.0.inc +1 -1
@@ -21,7 +21,7 @@ EDEPENDS_GLES2 = "virtual/libgles2" EDEPENDS_KMS = "libdrm virtual/egl" EDEPENDS_EGL = "virtual/egl" EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" -EDEPENDS_WAYLAND = "wayland" +EDEPENDS_WAYLAND = "virtual/mesa wayland" # Extra RDEPENDS for PACKAGECONFIG # This has to be explictly listed, because cogl dlopens the backends
Signature · 1 line
1.8.1.2
PATCH 4/4 cogl-1.0: explicitly disable cairo
In reply to Andreas Oberritter- Cairo was auto-detected, but not listed as a dependency.
Signed-off-by Andreas Oberritter <[email protected]>
--- meta/recipes-graphics/cogl/cogl-1.0.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-graphics/cogl/cogl-1.0.inc +1 -0
@@ -33,6 +33,7 @@ EXTRA_OECONF += "--disable-introspection \ --enable-examples-install \ --enable-debug \ --disable-gles1 \ + --disable-cairo \ " # OpenGL/GLX
Signature · 1 line
1.8.1.2
Re: [PATCH 4/4] cogl-1.0: explicitly disable cairo
Ping.
Quoted 20 lines · Andreas Oberritter
- Cairo was auto-detected, but not listed as a dependency.
Signed-off-by Andreas Oberritter <[email protected]>--- meta/recipes-graphics/cogl/cogl-1.0.inc | 1 + 1 file changed, 1 insertion(+)meta/recipes-graphics/cogl/cogl-1.0.inc +1
-0@@ -33,6 +33,7 @@ EXTRA_OECONF += "--disable-introspection \ --enable-examples-install \ --enable-debug \ --disable-gles1 \ + --disable-cairo \ " # OpenGL/GLX