diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-07-15 23:25:35 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-07-15 23:27:40 +0200 |
| commit | 1ad40a0b1edef0b328ed3b5e21d8565bd11b2c00 (patch) | |
| tree | 24cda6f53488fb89598da78f59126942a6a14d14 | |
| parent | 35768463dd2ed43003ad81d736d2ff0218bd3ed4 (diff) | |
clutter-box2d: update to 0.10.0
| -rw-r--r-- | recipes/clutter/clutter-box2d.inc | 6 | ||||
| -rw-r--r-- | recipes/clutter/clutter-box2d/introspection.diff | 31 | ||||
| -rw-r--r-- | recipes/clutter/clutter-box2d_0.10.0.bb | 9 | ||||
| -rw-r--r-- | recipes/clutter/clutter-box2d_svn.bb | 11 |
4 files changed, 42 insertions, 15 deletions
diff --git a/recipes/clutter/clutter-box2d.inc b/recipes/clutter/clutter-box2d.inc index 8189d12bbb..2b39916ade 100644 --- a/recipes/clutter/clutter-box2d.inc +++ b/recipes/clutter/clutter-box2d.inc @@ -2,16 +2,14 @@ DESCRIPTION = "Clutter Box2D" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "GPLv2" -DEPENDS = "clutter" +DEPENDS = "clutter-1.0" # The main clutter lib is machine specific so we need to be too PACKAGE_ARCH = "${MACHINE_ARCH}" inherit autotools pkgconfig gtk-doc -do_stage () { - autotools_stage_all -} +EXTRA_OECONF += "--disable-introspection" do_install_append () { install -d ${D}${bindir} diff --git a/recipes/clutter/clutter-box2d/introspection.diff b/recipes/clutter/clutter-box2d/introspection.diff new file mode 100644 index 0000000000..e38b8372f4 --- /dev/null +++ b/recipes/clutter/clutter-box2d/introspection.diff @@ -0,0 +1,31 @@ +From dae84a82efe22b284cba8ca1985ce14bb4e86c99 Mon Sep 17 00:00:00 2001 +From: Damien Lespiau <damien.lespiau@intel.com> +Date: Mon, 03 Aug 2009 10:47:41 +0000 +Subject: [build] Don't build introspection stuff when configure said we can't + +Surround the instrospection file generation with if HAVE_INTROSPECTION / +endif +--- +diff --git a/clutter-box2d/Makefile.am b/clutter-box2d/Makefile.am +index 8da23a7..6db8aae 100644 +--- a/clutter-box2d/Makefile.am ++++ b/clutter-box2d/Makefile.am +@@ -39,6 +39,8 @@ DISTCLEANFILES = $(MARSHALFILES) + EXTRA_DIST = \ + clutter-box2d-marshal.list + ++if HAVE_INTROSPECTION ++ + BUILT_GIRSOURCES = + + ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la +@@ -68,5 +70,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + %.typelib: %.gir $(INTROSPECTION_COMPILER) + $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F) + ++endif # HAVE_INTROSPECTION ++ + CLEANFILES= + CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) +-- +cgit v0.8.3.1-30-gff3a diff --git a/recipes/clutter/clutter-box2d_0.10.0.bb b/recipes/clutter/clutter-box2d_0.10.0.bb new file mode 100644 index 0000000000..5f3a063617 --- /dev/null +++ b/recipes/clutter/clutter-box2d_0.10.0.bb @@ -0,0 +1,9 @@ +require clutter-box2d.inc + +SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \ + file://introspection.diff \ +" + +SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d" +SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f" + diff --git a/recipes/clutter/clutter-box2d_svn.bb b/recipes/clutter/clutter-box2d_svn.bb deleted file mode 100644 index aa2156a587..0000000000 --- a/recipes/clutter/clutter-box2d_svn.bb +++ /dev/null @@ -1,11 +0,0 @@ -require clutter-box2d.inc - -PV = "0.0+svnr${SRCPV}" -PR = "r4" -SRCREV = "3197" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http" - -S = "${WORKDIR}/${PN}" - - |