summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/mesa/mesa.inc
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-10-17 13:31:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 15:48:48 +0100
commitc9148c89532f0989771e4846259f1f10a924bc68 (patch)
tree2de4f2e53dae0b61eafd3c21a935d9b6fe3fb3a3 /meta/recipes-graphics/mesa/mesa.inc
parentcc41cb61707da1b4ae029de70c922802067166c2 (diff)
downloadopenembedded-core-c9148c89532f0989771e4846259f1f10a924bc68.tar.gz
openembedded-core-c9148c89532f0989771e4846259f1f10a924bc68.tar.bz2
openembedded-core-c9148c89532f0989771e4846259f1f10a924bc68.zip
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 <obi@opendreambox.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc17
1 files changed, 11 insertions, 6 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index afc795c5d2..3e8041b463 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)