diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-04-09 19:19:29 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:45 -0700 |
commit | 418e53ec5fb1f12c59d426e2b67b9cfb55499778 (patch) | |
tree | 6039816c6e39ce957fb72671a3cff66b0da745d7 /meta-oe/recipes-support | |
parent | 5a86c18e012d40a1c52bc7940392f46f921be32e (diff) | |
download | meta-openembedded-418e53ec5fb1f12c59d426e2b67b9cfb55499778.tar.gz |
poppler: fix build for TARGET_FPU = "soft"
Detected for qemuarm on autobuilder
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch | 100 | ||||
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.63.0.bb | 1 |
2 files changed, 101 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch b/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch new file mode 100644 index 000000000..3c231fe93 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch | |||
@@ -0,0 +1,100 @@ | |||
1 | From 6287663e7db04df7e6dec58a1fc5bb5d510e8bde Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Mon, 9 Apr 2018 19:11:20 +0200 | ||
4 | Subject: [PATCH] CairoOutputDev.cc: fix build error when using fixedpoint | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Fixes: | ||
10 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashRound(SplashCoord)': | ||
11 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1604:28: error: call of overloaded 'floor(FixedPoint)' is ambiguous | ||
12 | | return (int)floor(x + 0.5); | ||
13 | | ^ | ||
14 | | In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, | ||
15 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, | ||
16 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, | ||
17 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, | ||
18 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: | ||
19 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double) | ||
20 | | __MATHCALLX (floor,, (_Mdouble_ __x), (__const__)); | ||
21 | | ^ | ||
22 | | In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0, | ||
23 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46: | ||
24 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:260:3: note: candidate: constexpr float std::floor(float) | ||
25 | | floor(float __x) | ||
26 | | ^~~~~ | ||
27 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:264:3: note: candidate: constexpr long double std::floor(long double) | ||
28 | | floor(long double __x) | ||
29 | | ^~~~~ | ||
30 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashCeil(SplashCoord)': | ||
31 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1608:21: error: call of overloaded 'ceil(SplashCoord&)' is ambiguous | ||
32 | | return (int)ceil(x); | ||
33 | | ^ | ||
34 | | In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, | ||
35 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, | ||
36 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, | ||
37 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, | ||
38 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: | ||
39 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:159:1: note: candidate: double ceil(double) | ||
40 | | __MATHCALLX (ceil,, (_Mdouble_ __x), (__const__)); | ||
41 | | ^ | ||
42 | | In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/math.h:36:0, | ||
43 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:46: | ||
44 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:165:3: note: candidate: constexpr float std::ceil(float) | ||
45 | | ceil(float __x) | ||
46 | | ^~~~ | ||
47 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cmath:169:3: note: candidate: constexpr long double std::ceil(long double) | ||
48 | | ceil(long double __x) | ||
49 | | ^~~~ | ||
50 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc: In function 'int splashFloor(SplashCoord)': | ||
51 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:1612:22: error: call of overloaded 'floor(SplashCoord&)' is ambiguous | ||
52 | | return (int)floor(x); | ||
53 | | ^ | ||
54 | | In file included from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/features.h:428:0, | ||
55 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/os_defines.h:39, | ||
56 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/arm-oe-linux-gnueabi/bits/c++config.h:533, | ||
57 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdint:38, | ||
58 | | from <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/poppler-0.63.0/poppler/CairoOutputDev.cc:44: | ||
59 | | <tmpdir>/oe-core-glibc/work/armv5te-oe-linux-gnueabi/poppler/0.63.0-r0/recipe-sysroot/usr/include/bits/mathcalls.h:165:1: note: candidate: double floor(double) | ||
60 | |||
61 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
62 | --- | ||
63 | poppler/CairoOutputDev.cc | 12 ++++++++++++ | ||
64 | 1 file changed, 12 insertions(+) | ||
65 | |||
66 | diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc | ||
67 | index 18124b8f..4c85ad65 100644 | ||
68 | --- a/poppler/CairoOutputDev.cc | ||
69 | +++ b/poppler/CairoOutputDev.cc | ||
70 | @@ -1602,15 +1602,27 @@ void CairoOutputDev::endActualText(GfxState *state) | ||
71 | } | ||
72 | |||
73 | static inline int splashRound(SplashCoord x) { | ||
74 | +#if defined(USE_FIXEDPOINT) | ||
75 | + return FixedPoint::floor(x + 0.5); | ||
76 | +#else | ||
77 | return (int)floor(x + 0.5); | ||
78 | +#endif | ||
79 | } | ||
80 | |||
81 | static inline int splashCeil(SplashCoord x) { | ||
82 | +#if defined(USE_FIXEDPOINT) | ||
83 | + return FixedPoint::ceil(x); | ||
84 | +#else | ||
85 | return (int)ceil(x); | ||
86 | +#endif | ||
87 | } | ||
88 | |||
89 | static inline int splashFloor(SplashCoord x) { | ||
90 | +#if defined(USE_FIXEDPOINT) | ||
91 | + return FixedPoint::floor(x); | ||
92 | +#else | ||
93 | return (int)floor(x); | ||
94 | +#endif | ||
95 | } | ||
96 | |||
97 | static | ||
98 | -- | ||
99 | 2.14.3 | ||
100 | |||
diff --git a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb index 143df3f73..8acb35628 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.63.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.63.0.bb | |||
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | |||
5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
6 | http://poppler.freedesktop.org/${BP}.tar.xz \ | 6 | http://poppler.freedesktop.org/${BP}.tar.xz \ |
7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ | 7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ |
8 | file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ | ||
8 | " | 9 | " |
9 | SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821" | 10 | SRC_URI[md5sum] = "66a54da4896b1408611699feda5c1821" |
10 | SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111" | 11 | SRC_URI[sha256sum] = "27cc8addafc791e1a26ce6acc2b490926ea73a4f89196dd8a7742cff7cf8a111" |