From afb3ee76cef109c7ba4a760d834839ef277e30fc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Oct 2012 11:19:06 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter.inc | 2 +- meta/recipes-graphics/clutter/cogl.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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" -- cgit v1.2.3