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:54 +0000 |
| commit | 50e32043a1a15cef916dbff74aaab920bc27d054 (patch) | |
| tree | 429baa7c6bc394d97647071380e5e3efcc4d8b5e /meta | |
| parent | 8e4e51825fa7df17f9f11ffed0d3cd2fb0d2efaf (diff) | |
| download | poky-50e32043a1a15cef916dbff74aaab920bc27d054.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
(From OE-Core rev: f49f3cbdbf06f9c4b2fcbbbdc892d8de7997c527)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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" | |||
| 6 | # We're API/ABI compatible and this may make things easier for layers | 6 | # We're API/ABI compatible and this may make things easier for layers |
| 7 | PROVIDES += "clutter-1.6" | 7 | PROVIDES += "clutter-1.6" |
| 8 | 8 | ||
| 9 | # Internal json-glib was removed in Clutter 1.5.2 | ||
| 10 | STDDEPENDS += "json-glib cogl atk" | ||
| 11 | |||
| 12 | PACKAGES =+ "${PN}-examples" | 9 | PACKAGES =+ "${PN}-examples" |
| 13 | FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" | 10 | FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" |
| 14 | 11 | ||
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" | |||
| 2 | HOMEPAGE = "http://www.clutter-project.org/" | 2 | HOMEPAGE = "http://www.clutter-project.org/" |
| 3 | LICENSE = "LGPL" | 3 | LICENSE = "LGPL" |
| 4 | 4 | ||
| 5 | STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" | 5 | # Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8 |
| 6 | STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk" | ||
| 6 | BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" | 7 | BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" |
| 7 | 8 | ||
| 8 | DEPENDS = "${STDDEPENDS} virtual/libgl" | 9 | 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 @@ | |||
| 1 | require clutter.inc | 1 | require clutter.inc |
| 2 | require clutter-package.inc | 2 | require clutter-package.inc |
| 3 | 3 | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
| 5 | |||
| 6 | DEPENDS += "cogl" | ||
| 7 | 5 | ||
| 8 | SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b" | 6 | SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b" |
| 9 | PV = "1.8.0+git${SRCPV}" | 7 | PV = "1.8.0+git${SRCPV}" |