poppler: cleanups:

* create a poppler.inc
* create a poppler-fpu.inc to set --enable-fixedpoint when needed
* enable zlib

diff --git a/packages/poppler/poppler-fpu.inc b/packages/poppler/poppler-fpu.inc
new file mode 100644 (file)
index 0000000..a262730
--- /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 (file)
index 0000000..14ae822
--- /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 bdd67a8..ade41a2 100644 (file)
--- 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"