aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-25 11:19:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-15 13:05:22 +0000
commited4029055bb84f4da5fcdc77705c509796c45e69 (patch)
tree3892ada85a3872f9b8acd45711050a2698b1a00b
parent1fb5a50a8bbda7ca717125abcc4cb99b50ba6ead (diff)
downloadopenembedded-core-ed4029055bb84f4da5fcdc77705c509796c45e69.tar.gz
cogl/clutter: Explicitly depend on libdrm for GLX
cogl and clutter explicitly rely on libdrm being present when using the glx backend. If its not listed in DEPENDS and an alternative to mesa is used, it may not actually be present. This patch ensures it is and fixes a build race condition which could see dependencies like clutter-box2d failing to compile due to missing pkgconfig dependencies. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/clutter/clutter.inc2
-rw-r--r--meta/recipes-graphics/clutter/cogl.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index ce54ac2940..5a912afbac 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
-DEPENDS = "${STDDEPENDS} virtual/libgl"
+DEPENDS = "${STDDEPENDS} virtual/libgl libdrm"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
FILESPATH = "${FILE_DIRNAME}/clutter"
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index 68786244ca..26f7889ca4 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1+"
STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
-DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage"
+DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage libdrm"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
FILESPATH = "${FILE_DIRNAME}/cogl"