summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch100
-rw-r--r--meta-oe/recipes-support/poppler/poppler_0.79.0.bb9
2 files changed, 0 insertions, 109 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
deleted file mode 100644
index 3c231fe938..0000000000
--- a/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From 6287663e7db04df7e6dec58a1fc5bb5d510e8bde Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Mon, 9 Apr 2018 19:11:20 +0200
4Subject: [PATCH] CairoOutputDev.cc: fix build error when using fixedpoint
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Fixes:
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
61Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
62---
63 poppler/CairoOutputDev.cc | 12 ++++++++++++
64 1 file changed, 12 insertions(+)
65
66diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
67index 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--
992.14.3
100
diff --git a/meta-oe/recipes-support/poppler/poppler_0.79.0.bb b/meta-oe/recipes-support/poppler/poppler_0.79.0.bb
index b285eecd2a..903817f18a 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.79.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.79.0.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4 4
5SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ 5SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
6 file://0001-Do-not-overwrite-all-our-build-flags.patch \ 6 file://0001-Do-not-overwrite-all-our-build-flags.patch \
7 file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \
8 file://basename-include.patch \ 7 file://basename-include.patch \
9 " 8 "
10SRC_URI[md5sum] = "0aac1fcb6466f8b7bdf51871264c7e83" 9SRC_URI[md5sum] = "0aac1fcb6466f8b7bdf51871264c7e83"
@@ -44,14 +43,6 @@ do_configure_append() {
44 sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja 43 sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja
45} 44}
46 45
47# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
48def get_poppler_fpu_setting(bb, d):
49 if d.getVar('TARGET_FPU') in [ 'soft' ]:
50 return "-DUSE_FIXEDPOINT=ON"
51 return ""
52
53EXTRA_OECMAKE += "${@get_poppler_fpu_setting(bb, d)}"
54
55PACKAGES =+ "libpoppler libpoppler-glib" 46PACKAGES =+ "libpoppler libpoppler-glib"
56FILES_libpoppler = "${libdir}/libpoppler.so.*" 47FILES_libpoppler = "${libdir}/libpoppler.so.*"
57FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" 48FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-28 05:41:45 +0000