diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2011-11-22 13:56:29 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:50:45 +0000 |
| commit | f49f3cbdbf06f9c4b2fcbbbdc892d8de7997c527 (patch) | |
| tree | 4fe4d56b74449890c28b9f1d05402f6d0010b0fc | |
| parent | 4607b8bdf1565d404c32c45a634d37e1ae2ee4aa (diff) | |
| download | openembedded-core-contrib-f49f3cbdbf06f9c4b2fcbbbdc892d8de7997c527.tar.gz | |
clutter: move STDDEPENDS to inc
We only build clutter-1.8 now so move the additional STDDEPENDS from the
recipe to the inc file. This has the added benefit of fixing
clutter_git.
This patch also fixes the LIC_FILES_CHKSUM for clutter_git
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter_git.bb | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb index 7d15318d77..7deac9e9dc 100644 --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb +++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb @@ -6,9 +6,6 @@ PR = "r3" # We're API/ABI compatible and this may make things easier for layers PROVIDES += "clutter-1.6" -# Internal json-glib was removed in Clutter 1.5.2 -STDDEPENDS += "json-glib cogl atk" - PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc index 54f65c5357..24cb30de2d 100644 --- a/meta/recipes-graphics/clutter/clutter.inc +++ b/meta/recipes-graphics/clutter/clutter.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Clutter graphics library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" +# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8 +STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk" BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" DEPENDS = "${STDDEPENDS} virtual/libgl" diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb index 897f5ffd97..db8c712241 100644 --- a/meta/recipes-graphics/clutter/clutter_git.bb +++ b/meta/recipes-graphics/clutter/clutter_git.bb @@ -1,9 +1,7 @@ require clutter.inc require clutter-package.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -DEPENDS += "cogl" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b" PV = "1.8.0+git${SRCPV}" |