diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-11-29 13:09:23 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:50:54 +0000 |
| commit | da1c3e3f95852a929bed3e5ad608dddfc87a67ec (patch) | |
| tree | efc7cbfbb14856aa95dbcdbd04b0ae1330e81b3c /meta/recipes-graphics | |
| parent | b231f147925d1b0ffd928fd455722c30f4bd4982 (diff) | |
| download | poky-da1c3e3f95852a929bed3e5ad608dddfc87a67ec.tar.gz | |
clutter-box2d: drop unbuildable clutter-box2d-1.6_0.10.0
It's very old at this point and doesn't build with recent clutter
(From OE-Core rev: 04d2bb8e83aaac856f03f3fc9772285bd82182e4)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
3 files changed, 0 insertions, 73 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 deleted file mode 100644 index a0024d06d9..0000000000 --- a/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require clutter-box2d.inc | ||
| 2 | |||
| 3 | PR = "r1" | ||
| 4 | |||
| 5 | DEPENDS += "clutter-1.6" | ||
| 6 | |||
| 7 | SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \ | ||
| 8 | file://fix-disable-introspection.patch \ | ||
| 9 | file://isfinite.patch \ | ||
| 10 | " | ||
| 11 | |||
| 12 | S = "${WORKDIR}/clutter-box2d-${PV}" | ||
| 13 | |||
| 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | ||
| 15 | |||
| 16 | BASE_CONF += "--disable-introspection" | ||
| 17 | |||
| 18 | do_configure_prepend () { | ||
| 19 | # Disable DOLT | ||
| 20 | sed -i -e 's/^DOLT//' ${S}/configure.ac | ||
| 21 | } | ||
| 22 | |||
| 23 | SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d" | ||
| 24 | SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f" | ||
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch deleted file mode 100644 index 58f2729209..0000000000 --- a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | Even with introspection disabled clutter-box2d would try to install the gir | ||
| 2 | files. | ||
| 3 | This patch ignored the while introspection related section of the Makefile if | ||
| 4 | introspection is disabled. | ||
| 5 | |||
| 6 | JL 28/03/11 | ||
| 7 | josh@linux.intel.com | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [configuration] | ||
| 10 | |||
| 11 | Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am | ||
| 12 | =================================================================== | ||
| 13 | --- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am | ||
| 14 | +++ clutter-box2d-0.10.0/clutter-box2d/Makefile.am | ||
| 15 | @@ -41,6 +41,8 @@ EXTRA_DIST = \ | ||
| 16 | |||
| 17 | BUILT_GIRSOURCES = | ||
| 18 | |||
| 19 | +if HAVE_INTROSPECTION | ||
| 20 | + | ||
| 21 | ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la | ||
| 22 | $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \ | ||
| 23 | --namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \ | ||
| 24 | @@ -70,3 +72,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 25 | |||
| 26 | CLEANFILES= | ||
| 27 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 28 | + | ||
| 29 | +endif | ||
| 30 | \ No newline at end of file | ||
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch deleted file mode 100644 index bcdbe24d06..0000000000 --- a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | _finite is obsoleted and C99 has isfinite instead so we should use it | ||
| 2 | |||
| 3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | Index: clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h | ||
| 8 | =================================================================== | ||
| 9 | --- clutter-box2d-0.10.0.orig/box2d/Source/Common/b2Math.h 2008-12-16 06:42:10.000000000 -0800 | ||
| 10 | +++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h 2011-07-20 16:41:02.046430743 -0700 | ||
| 11 | @@ -60,7 +60,7 @@ | ||
| 12 | #ifdef _MSC_VER | ||
| 13 | return _finite(x) != 0; | ||
| 14 | #else | ||
| 15 | - return finite(x) != 0; | ||
| 16 | + return std::isfinite(x) != 0; | ||
| 17 | #endif | ||
| 18 | } | ||
| 19 | |||
