mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

mesa: make runtime variables depend on PACKAGECONFIG

Browse Source 
- 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>
This commit is contained in:
Andreas Oberritter
2013-10-17 13:31:25 +02:00
committed by Richard Purdie
parent 823299e5a7
commit 526488c168
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/mesa/mesa.inc
+11 -6
View File
@@ -105,11 +105,16 @@ do_install_append () {
# they don't get Debian-renamed (which would remove the -mesa suffix), and # they don't get Debian-renamed (which would remove the -mesa suffix), and
# RPROVIDEs/RCONFLICTs on the generic libgl name. # RPROVIDEs/RCONFLICTs on the generic libgl name.
python __anonymous() { python __anonymous() {
for p in (("libegl", "libegl1"), ("libgl", "libgl1"), pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), for p in (("egl", "libegl", "libegl1"),
("libgles3",)): ("dri", "libgl", "libgl1"),
fullp = p[0] + "-mesa" ("gles", "libgles1", "libglesv1-cm1"),
pkgs = " ".join(p) ("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.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RREPLACES_" + fullp, pkgs)
d.appendVar("RPROVIDES_" + 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 # For -dev, the first element is both the Debian and original name
fullp += "-dev" fullp += "-dev"
pkgs = p[0] + "-dev" pkgs = p[1] + "-dev"
d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RREPLACES_" + fullp, pkgs)
d.appendVar("RPROVIDES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs)