merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'

     and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'

1 files changed, 33 insertions, 7 deletions

diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc
index b89070f3ea..63773ad530 100644
--- a/packages/clutter/clutter.inc
+++ b/packages/clutter/clutter.inc
@@ -2,20 +2,47 @@ DESCRIPTION = "Clutter graphics library"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPL"
 
-DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+"
+COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|beagleboard|overo|omap3evm)"
 
-inherit autotools pkgconfig
+STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
+BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
-EXTRA_OECONF = "--disable-gtk-doc "
+DEPENDS = "${STDDEPENDS} mesa"
+EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
+
+DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
+EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
+LDFLAGS_append_zylonite = " -lnws -lstdc++ "
+
+DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib"
+EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}"
+LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ "
+
+DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib"
+EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglx"
+PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
+
+DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib"
+EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglx"
+PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
+
+DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib"
+EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
+LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
+
+inherit autotools pkgconfig gtk-doc
+
+PACKAGES =+ "clutter-examples"
+FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require clutter-fpu.inc
 
-EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}"
-
 #Fix up some weirdness in the docs
 do_configure_prepend() {
-	touch ${S}/gtk-doc.make
         sed -i s:doc/reference/Makefile::g ${S}/configure.ac
         sed -i s:doc::g ${S}/Makefile.am
 }
@@ -23,4 +50,3 @@ do_configure_prepend() {
 do_stage () {
         autotools_stage_all
 }
-