summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/multilib.conf2
-rw-r--r--meta/recipes-core/tasks/task-core-tools.bb4
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb24
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch30
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch19
5 files changed, 3 insertions, 76 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 3689482d44..1540f9cd1d 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -42,9 +42,9 @@ BBCLASSEXTEND_append_pn-cairo = " ${MULTILIBS}"
42BBCLASSEXTEND_append_pn-calibrateproto = " ${MULTILIBS}" 42BBCLASSEXTEND_append_pn-calibrateproto = " ${MULTILIBS}"
43BBCLASSEXTEND_append_pn-chkconfig = " ${MULTILIBS}" 43BBCLASSEXTEND_append_pn-chkconfig = " ${MULTILIBS}"
44BBCLASSEXTEND_append_pn-clutter-1.8 = " ${MULTILIBS}" 44BBCLASSEXTEND_append_pn-clutter-1.8 = " ${MULTILIBS}"
45BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = " ${MULTILIBS}"
46BBCLASSEXTEND_append_pn-clutter-gst-1.8 = " ${MULTILIBS}" 45BBCLASSEXTEND_append_pn-clutter-gst-1.8 = " ${MULTILIBS}"
47BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = " ${MULTILIBS}" 46BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = " ${MULTILIBS}"
47BBCLASSEXTEND_append_pn-clutter-box2d = " ${MULTILIBS}"
48BBCLASSEXTEND_append_pn-compositeproto = " ${MULTILIBS}" 48BBCLASSEXTEND_append_pn-compositeproto = " ${MULTILIBS}"
49BBCLASSEXTEND_append_pn-connman-gnome = " ${MULTILIBS}" 49BBCLASSEXTEND_append_pn-connman-gnome = " ${MULTILIBS}"
50BBCLASSEXTEND_append_pn-connman = " ${MULTILIBS}" 50BBCLASSEXTEND_append_pn-connman = " ${MULTILIBS}"
diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
index 3159e0668c..12d4ff94e4 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r12" 9PR = "r13"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-tools-debug \ 12 task-core-tools-debug \
@@ -97,5 +97,5 @@ RDEPENDS_task-core-tools-testapps = "\
97 xwininfo \ 97 xwininfo \
98 xprop \ 98 xprop \
99 xvideo-tests \ 99 xvideo-tests \
100 clutter-box2d-1.6 \ 100 clutter-box2d \
101 " 101 "
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 @@
1require clutter-box2d.inc
2
3PR = "r1"
4
5DEPENDS += "clutter-1.6"
6
7SRC_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
12S = "${WORKDIR}/clutter-box2d-${PV}"
13
14LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
15
16BASE_CONF += "--disable-introspection"
17
18do_configure_prepend () {
19 # Disable DOLT
20 sed -i -e 's/^DOLT//' ${S}/configure.ac
21}
22
23SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d"
24SRC_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 @@
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
9Upstream-Status: Inappropriate [configuration]
10
11Index: 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
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6
7Index: 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