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>
This commit is contained in:
Joshua Lock 2011-11-29 13:09:23 -08:00 committed by Richard Purdie
parent b231f14792
commit da1c3e3f95
5 changed files with 3 additions and 76 deletions

View File

@ -42,9 +42,9 @@ BBCLASSEXTEND_append_pn-cairo = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-calibrateproto = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-chkconfig = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-clutter-1.8 = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-clutter-gst-1.8 = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-clutter-box2d = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-compositeproto = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-connman-gnome = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-connman = " ${MULTILIBS}"

View File

@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r12"
PR = "r13"
PACKAGES = "\
task-core-tools-debug \
@ -97,5 +97,5 @@ RDEPENDS_task-core-tools-testapps = "\
xwininfo \
xprop \
xvideo-tests \
clutter-box2d-1.6 \
clutter-box2d \
"

View File

@ -1,24 +0,0 @@
require clutter-box2d.inc
PR = "r1"
DEPENDS += "clutter-1.6"
SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \
file://fix-disable-introspection.patch \
file://isfinite.patch \
"
S = "${WORKDIR}/clutter-box2d-${PV}"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
BASE_CONF += "--disable-introspection"
do_configure_prepend () {
# Disable DOLT
sed -i -e 's/^DOLT//' ${S}/configure.ac
}
SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d"
SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f"

View File

@ -1,30 +0,0 @@
Even with introspection disabled clutter-box2d would try to install the gir
files.
This patch ignored the while introspection related section of the Makefile if
introspection is disabled.
JL 28/03/11
josh@linux.intel.com
Upstream-Status: Inappropriate [configuration]
Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
===================================================================
--- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am
+++ clutter-box2d-0.10.0/clutter-box2d/Makefile.am
@@ -41,6 +41,8 @@ EXTRA_DIST = \
BUILT_GIRSOURCES =
+if HAVE_INTROSPECTION
+
ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la
$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
--namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \
@@ -70,3 +72,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
CLEANFILES=
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
+
+endif
\ No newline at end of file

View File

@ -1,19 +0,0 @@
_finite is obsoleted and C99 has isfinite instead so we should use it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h
===================================================================
--- clutter-box2d-0.10.0.orig/box2d/Source/Common/b2Math.h 2008-12-16 06:42:10.000000000 -0800
+++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h 2011-07-20 16:41:02.046430743 -0700
@@ -60,7 +60,7 @@
#ifdef _MSC_VER
return _finite(x) != 0;
#else
- return finite(x) != 0;
+ return std::isfinite(x) != 0;
#endif
}