summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-12-26 16:56:59 +0000
committerKoen Kooi <koen@openembedded.org>2006-12-26 16:56:59 +0000
commit729fb4872a95d30f8197c96b04282a8ea28943c0 (patch)
tree01b7970682b2cdfc3a9fb6935dca8fcbf124ca46
parent1b73b56f62b2308b724caba2e567ba17f44503a9 (diff)
parent367efff872c112572bc4e54a2e3ef4cb4578fb14 (diff)
merge of '315f8d949ff4e2e3c22ae6f04a8b05818b5a7403'
and 'c1c4d0a65a54044d7912fc57f4f76f391fb4df16'
-rw-r--r--packages/poppler/poppler-fpu.inc6
-rw-r--r--packages/poppler/poppler.inc23
-rw-r--r--packages/poppler/poppler_0.5.4.bb16
3 files changed, 31 insertions, 14 deletions
diff --git a/packages/poppler/poppler-fpu.inc b/packages/poppler/poppler-fpu.inc
new file mode 100644
index 0000000000..a26273020a
--- /dev/null
+++ b/packages/poppler/poppler-fpu.inc
@@ -0,0 +1,6 @@
+
+def get_poppler_fpu_setting(bb, d):
+ if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+ return "--enable-fixedpoint"
+ return ""
+
diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc
new file mode 100644
index 0000000000..14ae8220a8
--- /dev/null
+++ b/packages/poppler/poppler.inc
@@ -0,0 +1,23 @@
+DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-xpdf-headers \
+ --disable-gtk-test \
+ --disable-poppler-qt \
+ --enable-zlib \
+ "
+
+#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require poppler-fpu.inc
+EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
+
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb
index bdd67a8c12..ade41a276a 100644
--- a/packages/poppler/poppler_0.5.4.bb
+++ b/packages/poppler/poppler_0.5.4.bb
@@ -1,14 +1,2 @@
-DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-DEPENDS = "fontconfig jpeg gtk+ cairo"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-xpdf-headers --disable-gtk-test --disable-poppler-qt"
-
-do_stage() {
- autotools_stage_all
-}
+require poppler.inc
+PR = "r1"