mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
mesa: don't set RCONFLICTS / PROVIDES if glvnd is enabled
If glvnd is enabled, mesa packages do not provide full library implementations (instead it provides two ICDs, one for EGL, one for GLX). This means that there is no more conflict between mesa packages and other vendor packages. Stop setting those extra tags for mesa packages. (From OE-Core rev: b1b8a0f69dafe23c992754cffb7aaf575753e564) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1fba128384
commit
3ad50d41db
|
@ -274,9 +274,9 @@ python __anonymous() {
|
||||||
|
|
||||||
d.setVar("DEBIAN_NOAUTONAME:%slibopencl-mesa%s" % (mlprefix, suffix), "1")
|
d.setVar("DEBIAN_NOAUTONAME:%slibopencl-mesa%s" % (mlprefix, suffix), "1")
|
||||||
|
|
||||||
|
if 'glvnd' not in pkgconfig:
|
||||||
for p in (("egl", "libegl", "libegl1"),
|
for p in (("egl", "libegl", "libegl1"),
|
||||||
("opengl", "libgl", "libgl1"),
|
("opengl", "libgl", "libgl1"),
|
||||||
("glvnd", "libglx",),
|
|
||||||
("gles", "libgles1", "libglesv1-cm1"),
|
("gles", "libgles1", "libglesv1-cm1"),
|
||||||
("gles", "libgles2", "libglesv2-2", "libgles3")):
|
("gles", "libgles2", "libglesv2-2", "libgles3")):
|
||||||
if not p[0] in pkgconfig:
|
if not p[0] in pkgconfig:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user