diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-07-18 15:58:38 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-20 15:27:39 +0100 |
commit | 07fb4265c95cd18705064a7f25f6463c037836ef (patch) | |
tree | cb6527ca44830bd2ba7925dad3197e3445d87efd /meta | |
parent | c19d858d019ac8081dd51496cd94225b4d11e788 (diff) | |
download | poky-07fb4265c95cd18705064a7f25f6463c037836ef.tar.gz |
clutter-box2d: Replace use of finite macro with C99 compliant isfinite()
(From OE-Core rev: 46a335577506f36714f66135931b7b9669dc1416)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch | 19 |
2 files changed, 23 insertions, 2 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 index ad94aa559a..a0024d06d9 100644 --- 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 | |||
@@ -1,11 +1,13 @@ | |||
1 | require clutter-box2d.inc | 1 | require clutter-box2d.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | 4 | ||
5 | DEPENDS += "clutter-1.6" | 5 | DEPENDS += "clutter-1.6" |
6 | 6 | ||
7 | SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \ | 7 | SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \ |
8 | file://fix-disable-introspection.patch" | 8 | file://fix-disable-introspection.patch \ |
9 | file://isfinite.patch \ | ||
10 | " | ||
9 | 11 | ||
10 | S = "${WORKDIR}/clutter-box2d-${PV}" | 12 | S = "${WORKDIR}/clutter-box2d-${PV}" |
11 | 13 | ||
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch new file mode 100644 index 0000000000..fd2bf74923 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch | |||
@@ -0,0 +1,19 @@ | |||
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-17 02:10:29.833825198 -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 | |||