summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
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:59:13 +0100
commit526488c1688b5daeece339802fdfe7df37bac3e8 (patch)
tree36f9a23e2cc263a6dc4f02b6438fa8fdcfd8fc2e /meta/recipes-graphics
parent823299e5a7a30377d3e5f6b60883c4eedb656965 (diff)
downloadpoky-526488c1688b5daeece339802fdfe7df37bac3e8.tar.gz
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. (From OE-Core rev: c9148c89532f0989771e4846259f1f10a924bc68) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-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 () {
105# they don't get Debian-renamed (which would remove the -mesa suffix), and 105# they don't get Debian-renamed (which would remove the -mesa suffix), and
106# RPROVIDEs/RCONFLICTs on the generic libgl name. 106# RPROVIDEs/RCONFLICTs on the generic libgl name.
107python __anonymous() { 107python __anonymous() {
108 for p in (("libegl", "libegl1"), ("libgl", "libgl1"), 108 pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
109 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), 109 for p in (("egl", "libegl", "libegl1"),
110 ("libgles3",)): 110 ("dri", "libgl", "libgl1"),
111 fullp = p[0] + "-mesa" 111 ("gles", "libgles1", "libglesv1-cm1"),
112 pkgs = " ".join(p) 112 ("gles", "libgles2", "libglesv2-2"),
113 ("gles", "libgles3",)):
114 if not p[0] in pkgconfig:
115 continue
116 fullp = p[1] + "-mesa"
117 pkgs = " ".join(p[1:])
113 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 118 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
114 d.appendVar("RREPLACES_" + fullp, pkgs) 119 d.appendVar("RREPLACES_" + fullp, pkgs)
115 d.appendVar("RPROVIDES_" + fullp, pkgs) 120 d.appendVar("RPROVIDES_" + fullp, pkgs)
@@ -117,7 +122,7 @@ python __anonymous() {
117 122
118 # For -dev, the first element is both the Debian and original name 123 # For -dev, the first element is both the Debian and original name
119 fullp += "-dev" 124 fullp += "-dev"
120 pkgs = p[0] + "-dev" 125 pkgs = p[1] + "-dev"
121 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") 126 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
122 d.appendVar("RREPLACES_" + fullp, pkgs) 127 d.appendVar("RREPLACES_" + fullp, pkgs)
123 d.appendVar("RPROVIDES_" + fullp, pkgs) 128 d.appendVar("RPROVIDES_" + fullp, pkgs)