Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / lfs / poppler

diff --git a/lfs/poppler b/lfs/poppler
index c8fdd65e77ed6215598e22a8c700f94135573943..a63001c464a5c5832eb8911753e403c7241f36de 100644 (file)
--- a/lfs/poppler
+++ b/lfs/poppler
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.52.0
+VER        = 21.05.0
 
 THISAPP    = poppler-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dfdd55d5df39685bbb82b0c08fa4ef66
+$(DL_FILE)_MD5 = 109c337462c2a4ac916226588a2c23f7
 
 install : $(TARGET)
 
@@ -70,16 +70,17 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && \
-               ./configure \
-                       --prefix=/usr \
-                       --enable-cairo-output \
-                       --enable-cms=lcms2 \
-                       --enable-libjpeg \
-                       --enable-libpng \
-                       --enable-xpdf-headers
-
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && mkdir -pv build
+       cd $(DIR_APP)/build && cmake \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DTESTDATADIR=$PWD/testfiles \
+               -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
+               -DENABLE_QT5=OFF \
+               ..
+
+       cd $(DIR_APP)/build && make $(MAKETUNING)
+       cd $(DIR_APP)/build && make install
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)