[oe-commits] org.oe.dev poppler: cleanups:

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c1c4d0a65a54044d7912fc57f4f76f391fb4df16
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c1c4d0a65a54044d7912fc57f4f76f391fb4df16
Files:
1
packages/poppler/poppler-fpu.inc
packages/poppler/poppler.inc
packages/poppler/poppler_0.5.4.bb
Diffs:

#
# mt diff -r7a9c6dcd00355e7f104559fd3a74974aad0d5967 -rc1c4d0a65a54044d7912fc57f4f76f391fb4df16
#
# 
# 
# add_file "packages/poppler/poppler-fpu.inc"
#  content [ed0ae3ee031912ba8f59b292d490f1d85139b0b2]
# 
# add_file "packages/poppler/poppler.inc"
#  content [1d05bd34565da7977c70a3bf10f251465a57554f]
# 
# patch "packages/poppler/poppler_0.5.4.bb"
#  from [2c9f70100d30f6a77f6bfdc7975bb034af4dd99a]
#    to [7b73955e77f54420d2adf35bfa5adb0bc6ebaf24]
# 
============================================================
--- packages/poppler/poppler-fpu.inc	ed0ae3ee031912ba8f59b292d490f1d85139b0b2
+++ packages/poppler/poppler-fpu.inc	ed0ae3ee031912ba8f59b292d490f1d85139b0b2
@@ -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 ""
+
============================================================
--- packages/poppler/poppler.inc	1d05bd34565da7977c70a3bf10f251465a57554f
+++ packages/poppler/poppler.inc	1d05bd34565da7977c70a3bf10f251465a57554f
@@ -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
+}
============================================================
--- packages/poppler/poppler_0.5.4.bb	2c9f70100d30f6a77f6bfdc7975bb034af4dd99a
+++ packages/poppler/poppler_0.5.4.bb	7b73955e77f54420d2adf35bfa5adb0bc6ebaf24
@@ -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"