summaryrefslogtreecommitdiffstats
path: root/rules/poppler.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2011-10-25 20:57:46 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-12-09 09:32:39 +0100
commit2afc7b55c64b6aa0919c0ed72d2a6c4131fbd9bb (patch)
treebd75496d48773e671962b6e654a4e1133cb84b99 /rules/poppler.make
parentbfdcef7157e0d9fcdd6fa9dcddbd32f84efe20f5 (diff)
downloadptxdist-2afc7b55c64b6aa0919c0ed72d2a6c4131fbd9bb.tar.gz
ptxdist-2afc7b55c64b6aa0919c0ed72d2a6c4131fbd9bb.tar.xz
poppler: version bump 0.16.6 -> 0.18.0
The 0.16.6 version is not able to cope with glib-2.30, so we update to the current stable version. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> [mol: cleanup configure options] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/poppler.make')
-rw-r--r--rules/poppler.make39
1 files changed, 22 insertions, 17 deletions
diff --git a/rules/poppler.make b/rules/poppler.make
index 359e66b42..e1804bde8 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_POPPLER) += poppler
#
# Paths and names
#
-POPPLER_VERSION := 0.16.6
-POPPLER_MD5 := 592a564fb7075a845f75321ed6425424
+POPPLER_VERSION := 0.18.0
+POPPLER_MD5 := 4cd3bf2a0a13fa8eaf00d31368915f77
POPPLER := poppler-$(POPPLER_VERSION)
POPPLER_SUFFIX := tar.gz
POPPLER_URL := http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX)
@@ -46,26 +46,31 @@ POPPLER_ENV := $(CROSS_ENV)
POPPLER_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
- --disable-abiword-output \
- --disable-gdk \
- --disable-gtk-test \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-poppler-cpp \
- --disable-poppler-qt \
- --without-x \
- --$(call ptx/endis, PTXCONF_POPPLER_GLIB)-poppler-glib \
- --$(call ptx/endis, PTXCONF_POPPLER_QT4)-poppler-qt4 \
- --$(call ptx/endis, PTXCONF_POPPLER_CAIRO)-cairo-output \
- --$(call ptx/endis, PTXCONF_POPPLER_SPLASH)-splash-output \
+ --disable-xpdf-headers \
+ --$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)-single-precision \
+ --disable-fixedpoint \
+ --disable-libopenjpeg \
+ --disable-libtiff \
--$(call ptx/endis, PTXCONF_POPPLER_ZLIB)-zlib \
--$(call ptx/endis, PTXCONF_POPPLER_LIB)-libcurl \
--$(call ptx/endis, PTXCONF_POPPLER_JPEG)-libjpeg \
--$(call ptx/endis, PTXCONF_POPPLER_PNG)-libpng \
- --$(call ptx/endis, PTXCONF_POPPLER_CMS)-cms \
+ --$(call ptx/endis, PTXCONF_POPPLER_SPLASH)-splash-output \
+ --$(call ptx/endis, PTXCONF_POPPLER_CAIRO)-cairo-output \
+ --$(call ptx/endis, PTXCONF_POPPLER_GLIB)-poppler-glib \
+ --disable-introspection \
+ --disable-gtk-doc \
+ --disable-gtk-doc-html \
+ --disable-gtk-doc-pdf \
+ --$(call ptx/endis, PTXCONF_POPPLER_QT4)-poppler-qt4 \
+ --disable-poppler-cpp \
+ --disable-gtk-test \
--$(call ptx/endis, PTXCONF_POPPLER_BIN)-utils \
- --$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)-single-precision
+ --disable-compile-warnings \
+ --$(call ptx/endis, PTXCONF_POPPLER_CMS)-cms \
+ --without-x \
+ --with-font-configuration=fontconfig \
+ --without-libiconv-prefix
# ----------------------------------------------------------------------------
# Target-Install