summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb20
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d.inc4
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch28
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d_git.bb2
4 files changed, 51 insertions, 3 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb b/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
new file mode 100644
index 0000000000..cad8cfcc86
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
@@ -0,0 +1,20 @@
1require clutter-box2d.inc
2
3PR = "r0"
4
5SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \
6 file://fix-disable-introspection.patch"
7
8S = "${WORKDIR}/clutter-box2d-${PV}"
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
11
12BASE_CONF += "--disable-introspection"
13
14do_configure_prepend () {
15 # Disable DOLT
16 sed -i -e 's/^DOLT//' ${S}/configure.ac
17}
18
19SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d"
20SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 0249984b17..0574db3d51 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
@@ -2,8 +2,6 @@ DESCRIPTION = "Clutter Box2D"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "Catto" 3LICENSE = "Catto"
4 4
5DEPENDS = "clutter-1.4"
6
7# The main clutter lib is machine specific so we need to be too 5# The main clutter lib is machine specific so we need to be too
8PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${MACHINE_ARCH}"
9 7
@@ -13,3 +11,5 @@ do_install_append () {
13 install -d ${D}${bindir} 11 install -d ${D}${bindir}
14 install ${S}/examples/.libs/blockbox ${D}${bindir} 12 install ${S}/examples/.libs/blockbox ${D}${bindir}
15} 13}
14
15FILESPATH = "${FILE_DIRNAME}/clutter-box2d"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
new file mode 100644
index 0000000000..cfb50dc703
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
@@ -0,0 +1,28 @@
1Even with introspection disabled clutter-box2d would try to install the gir
2files.
3This patch ignored the while introspection related section of the Makefile if
4introspection is disabled.
5
6JL 28/03/11
7josh@linux.intel.com
8
9Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
10===================================================================
11--- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am
12+++ clutter-box2d-0.10.0/clutter-box2d/Makefile.am
13@@ -41,6 +41,8 @@ EXTRA_DIST = \
14
15 BUILT_GIRSOURCES =
16
17+if HAVE_INTROSPECTION
18+
19 ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la
20 $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
21 --namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \
22@@ -70,3 +72,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
23
24 CLEANFILES=
25 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
26+
27+endif
28\ No newline at end of file
diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index 6b718d5bed..62b5c802d1 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -9,4 +9,4 @@ SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12 12DEPENDS += "clutter-1.4"