From 367efff872c112572bc4e54a2e3ef4cb4578fb14 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 26 Dec 2006 16:56:42 +0000
Subject: poppler: cleanups: * create a poppler.inc * create a poppler-fpu.inc
 to set --enable-fixedpoint when needed * enable zlib

---
 packages/poppler/poppler-fpu.inc  |  6 ++++++
 packages/poppler/poppler.inc      | 23 +++++++++++++++++++++++
 packages/poppler/poppler_0.5.4.bb | 16 ++--------------
 3 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 packages/poppler/poppler-fpu.inc
 create mode 100644 packages/poppler/poppler.inc

(limited to 'packages')

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"
-- 
cgit 1.2.3-korg