summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-25 11:19:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-25 17:50:18 +0100
commitc1da2029935a03acd97fd407c64673ee428501fd (patch)
treef704089205c381c3fc00903c3e2829c3a1bcc7ee
parent33440ee70623394d06a4b214c2be10788cba6d08 (diff)
downloadpoky-c1da2029935a03acd97fd407c64673ee428501fd.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. (From OE-Core rev: afb3ee76cef109c7ba4a760d834839ef277e30fc) 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+"
6STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk" 6STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
7BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}" 7BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
8 8
9DEPENDS = "${STDDEPENDS} virtual/libgl" 9DEPENDS = "${STDDEPENDS} virtual/libgl libdrm"
10EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 10EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
11 11
12FILESPATH = "${FILE_DIRNAME}/clutter" 12FILESPATH = "${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+"
5STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi" 5STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
6BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}" 6BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
7 7
8DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage" 8DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage libdrm"
9EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 9EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
10 10
11FILESPATH = "${FILE_DIRNAME}/cogl" 11FILESPATH = "${FILE_DIRNAME}/cogl"