summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2020-07-28 05:04:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-07 21:20:21 +0100
commitaba2fdcff2a6ddb4ac1872d78ea14086485923c2 (patch)
treec53fc5c1ff823bc9ab7d899fe315648bd3a98e54
parentc25965e378d8fb2eef806bd19f8662c7511c6ffa (diff)
downloadpoky-aba2fdcff2a6ddb4ac1872d78ea14086485923c2.tar.gz
cogl-1.0: correct X11 dependencies
cogl depends on libxdamage when configured for X11 support. A dependency was added for this in 2012 with 959a2f6d88d8fa6874fff83b7a1f0e7d4e36b887, but that addition was lost when the recipe was reworked in 2013 with b508fdd2b19ca30da8d09caf646897dc4cf195c8. That commit also added a dependency on libxi, which is not actually needed. The missing dependency doesn't cause problems in most cases, since mesa also depends on libxdamage, but when an alternative opengl implementation such as libglvnd is used, cogl fails to configure. (From OE-Core rev: 4cbfaae7f6ecdcbb67675da6cbdcf63aed0aaf61) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7651a63c508562caf1a3732cb49af50bccc98e8b) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 1c5d0b79cb..d581ad1c04 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -21,7 +21,7 @@ EDEPENDS_GL = "virtual/libgl libdrm"
21EDEPENDS_GLES2 = "virtual/libgles2" 21EDEPENDS_GLES2 = "virtual/libgles2"
22EDEPENDS_KMS = "libdrm virtual/egl" 22EDEPENDS_KMS = "libdrm virtual/egl"
23EDEPENDS_EGL = "virtual/egl" 23EDEPENDS_EGL = "virtual/egl"
24EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr" 24EDEPENDS_X11 = "virtual/libx11 libxcomposite libxdamage libxfixes libxrandr"
25EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland" 25EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland"
26 26
27# Extra RDEPENDS for PACKAGECONFIG 27# Extra RDEPENDS for PACKAGECONFIG