- 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 <o...@opendreambox.org>
---
meta/recipes-graphics/mesa/mesa.inc | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index afc795c..3e8041b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -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)
--
1.8.1.2
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
