poppler: version bump 0.61.1 -> 0.80.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 27 insertions, 50 deletions

diff --git a/rules/cups-filters.in b/rules/cups-filters.in
index 478468a77..e54984ce0 100644
--- a/rules/cups-filters.in
+++ b/rules/cups-filters.in
@@ -43,9 +43,6 @@ config CUPS_FILTERS_POPPLER
 	help
 	  Build with poppler support, needed for pdfto* filters and banners.
 
-comment "poppler support will not build with POPPLER_SPLASH_FIXED!"
-	depends on (POPPLER_SPLASH_FIXED && CUPS_FILTERS_POPPLER)
-
 config CUPS_FILTERS_IMAGEFILTERS
 	bool "build image filters"
 	help
diff --git a/rules/poppler.in b/rules/poppler.in
index 41f9b8a44..fba4d6f94 100644
--- a/rules/poppler.in
+++ b/rules/poppler.in
@@ -19,10 +19,6 @@ menuconfig POPPLER
 	select ZLIB				if POPPLER_ZLIB
 	select LIBCURL				if POPPLER_CURL
 	select LCMS				if POPPLER_CMS
-	select QT4				if POPPLER_QT4
-	select QT4_BUILD_GUI			if POPPLER_QT4
-	select QT4_BUILD_XML			if POPPLER_QT4
-	select QT4_BUILD_QTESTLIB		if POPPLER_QT4
 	select QT5				if POPPLER_QT5
 	select QT5_GUI				if POPPLER_QT5
 	select QT5_MODULE_QTBASE		if POPPLER_QT5
@@ -119,14 +115,6 @@ config POPPLER_SPLASH_SINGLE
 	  Use single precision instead of double precision floating point
 	  arithmetic in Splash backend
 
-config POPPLER_SPLASH_FIXED
-	bool
-	prompt "use fixed point arithmetic"
-	depends on !POPPLER_SPLASH_SINGLE && !POPPLER_SPLASH_DOUBLE
-	help
-	  If enabled, the Splash backend will use floating point operations
-	  instead of fixed-point arithmetic.
-
 endif # POPPLER_SPLASH
 
 comment "--- Features --- "
diff --git a/rules/poppler.make b/rules/poppler.make
index c22276ee1..90e81d0e1 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_POPPLER) += poppler
 #
 # Paths and names
 #
-POPPLER_VERSION	:= 0.61.1
-POPPLER_MD5	:= 2d3dcea88d6a814317fac74d2a16c3cd
+POPPLER_VERSION	:= 0.80.0
+POPPLER_MD5	:= 8ff9964d1fcc9c334a9c66f6f426ab9c
 POPPLER		:= poppler-$(POPPLER_VERSION)
 POPPLER_SUFFIX	:= tar.xz
 POPPLER_URL	:= http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX)
@@ -42,48 +42,43 @@ POPPLER_ENV 	:= $(CROSS_ENV)
 #
 # CMake
 #
-# FindThreads.cmake tries to determine if our compiler understands -pthread by
-# compiling a file and running the binary. We set -DTHREADS_PTHREAD_ARG=2 to
-# tell CMake that this binary returns 2, which means -pthread. is understood.
-#
 POPPLER_CONF_TOOL	:= cmake
 POPPLER_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
+	-DBUILD_CPP_TESTS=NO \
+	-DBUILD_GTK_TESTS=NO \
+	-DBUILD_QT5_TESTS=NO \
 	-DBUILD_SHARED_LIBS=ON \
-	-DEXTRA_WARN=NO \
-	-DTHREADS_PTHREAD_ARG=2 \
-	-DFONT_CONFIGURATION=fontconfig \
-	-DENABLE_UTILS=$(call ptx/onoff,PTXCONF_POPPLER_BIN) \
-	-DENABLE_XPDF_HEADERS=$(call ptx/onoff,PTXCONF_POPPLER_XPDF) \
+	-DENABLE_CMS=$(call ptx/ifdef,PTXCONF_POPPLER_CMS,lcms2,none) \
 	-DENABLE_CPP=$(call ptx/onoff,PTXCONF_POPPLER_CPP) \
-	-DWITH_Iconv=ON \
-	-DBUILD_CPP_TESTS=NO \
+	-DENABLE_DCTDECODER=$(call ptx/ifdef,PTXCONF_POPPLER_JPEG,libjpeg,none) \
 	-DENABLE_GLIB=$(call ptx/onoff,PTXCONF_POPPLER_GLIB) \
-	-DWITH_GLIB=$(call ptx/onoff,PTXCONF_POPPLER_GLIB) \
-	-DWITH_GObjectIntrospection=$(call ptx/onoff,PTXCONF_POPPLER_INTROSPECTION) \
-	-DENABLE_QT4=$(call ptx/onoff,PTXCONF_POPPLER_QT4) \
-	-DWITH_Qt4=$(call ptx/onoff,PTXCONF_POPPLER_QT4) \
-	-DBUILD_QT4_TESTS=NO \
-	-DENABLE_QT5=$(call ptx/onoff,PTXCONF_POPPLER_QT5) \
-	-DBUILD_QT5_TESTS=NO \
-	-DWITH_Cairo=$(call ptx/onoff,PTXCONF_POPPLER_CAIRO) \
-	-DWITH_GTK=NO \
-	-DBUILD_GTK_TESTS=NO \
+	-DENABLE_GOBJECT_INTROSPECTION=$(call ptx/onoff,PTXCONF_POPPLER_INTROSPECTION) \
 	-DENABLE_GTK_DOC=NO \
+	-DENABLE_LIBCURL=$(call ptx/onoff,PTXCONF_POPPLER_CURL) \
+	-DENABLE_LIBOPENJPEG=$(call ptx/ifdef,PTXCONF_POPPLER_OPENJPEG,openjpeg2,none) \
+	-DENABLE_QT5=$(call ptx/onoff,PTXCONF_POPPLER_QT5) \
+	-DENABLE_QT_STRICT_ITERATORS=ON \
 	-DENABLE_SPLASH=$(call ptx/onoff,PTXCONF_POPPLER_SPLASH) \
+	-DENABLE_UNSTABLE_API_ABI_HEADERS=OFF \
+	-DENABLE_UTILS=$(call ptx/onoff,PTXCONF_POPPLER_BIN) \
+	-DENABLE_XPDF_HEADERS=$(call ptx/onoff,PTXCONF_POPPLER_XPDF) \
+	-DENABLE_ZLIB=$(call ptx/onoff,PTXCONF_POPPLER_ZLIB) \
+	-DENABLE_ZLIB_UNCOMPRESS=NO \
+	-DEXTRA_WARN=NO \
+	-DFONT_CONFIGURATION=fontconfig \
 	-DSPLASH_CMYK=$(call ptx/onoff,PTXCONF_POPPLER_SPLASH_CMYK) \
+	-DTESTDATADIR=. \
 	-DUSE_FLOAT=$(call ptx/onoff,PTXCONF_POPPLER_SPLASH_SINGLE) \
-	-DUSE_FIXEDPOINT=$(call ptx/onoff,PTXCONF_POPPLER_SPLASH_FIXED) \
-	-DWITH_PNG=$(call ptx/onoff,PTXCONF_POPPLER_PNG) \
+	-DWITH_Cairo=$(call ptx/onoff,PTXCONF_POPPLER_CAIRO) \
+	-DWITH_GLIB=$(call ptx/onoff,PTXCONF_POPPLER_GLIB) \
+	-DWITH_GObjectIntrospection=$(call ptx/onoff,PTXCONF_POPPLER_INTROSPECTION) \
+	-DWITH_GTK=NO \
+	-DWITH_Iconv=ON \
 	-DWITH_JPEG=$(call ptx/onoff,PTXCONF_POPPLER_JPEG) \
-	-DENABLE_DCTDECODER=$(call ptx/ifdef,PTXCONF_POPPLER_JPEG,libjpeg,none) \
-	-DENABLE_LIBOPENJPEG=$(call ptx/ifdef,PTXCONF_POPPLER_OPENJPEG,openjpeg2,none) \
-	-DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF) \
 	-DWITH_NSS3=$(call ptx/onoff,PTXCONF_POPPLER_NSS) \
-	-DENABLE_ZLIB=$(call ptx/onoff,PTXCONF_POPPLER_ZLIB) \
-	-DENABLE_ZLIB_UNCOMPRESS=NO \
-	-DENABLE_LIBCURL=$(call ptx/onoff,PTXCONF_POPPLER_CURL) \
-	-DENABLE_CMS=$(call ptx/ifdef,PTXCONF_POPPLER_CMS,lcms2,)
+	-DWITH_PNG=$(call ptx/onoff,PTXCONF_POPPLER_PNG) \
+	-DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF)
 
 ifdef PTXCONF_POPPLER_QT5
 POPPLER_COMPILE_ENV := \
@@ -117,9 +112,6 @@ endif
 ifdef PTXCONF_POPPLER_GLIB
 	@$(call install_lib, poppler, 0, 0, 0644, libpoppler-glib)
 endif
-ifdef PTXCONF_POPPLER_QT4
-	@$(call install_lib, poppler, 0, 0, 0644, libpoppler-qt4)
-endif
 ifdef PTXCONF_POPPLER_QT5
 	@$(call install_lib, poppler, 0, 0, 0644, libpoppler-qt5)
 endif