Просмотр исходного кода

package/poppler: bump version to 0.32.0

This commit also adds an optional dependency on openjpeg: if
--enable-openjpeg=none is not passed, poppler assumes openjpeg is
available.

[Thomas:
  - add optional dependency on openjpeg instead of mandatory
    dependency.
  - remove --enable-xpdf-headers, since there was no justification for
    it.]

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Olivier Schonken 10 лет назад
Родитель
Сommit
03671be949
2 измененных файлов с 9 добавлено и 2 удалено
  1. 1 1
      package/poppler/poppler.hash
  2. 8 1
      package/poppler/poppler.mk

+ 1 - 1
package/poppler/poppler.hash

@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84	poppler-0.24.5.tar.xz
+sha256	4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98	poppler-0.32.0.tar.xz

+ 8 - 1
package/poppler/poppler.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POPPLER_VERSION = 0.24.5
+POPPLER_VERSION = 0.32.0
 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
 POPPLER_SITE = http://poppler.freedesktop.org
 POPPLER_DEPENDENCIES = fontconfig
@@ -69,4 +69,11 @@ else
 POPPLER_CONF_OPTS += --disable-poppler-qt4
 endif
 
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+POPPLER_DEPENDENCIES += openjpeg
+POPPLER_CONF_OPTS += -enable-libopenjpeg=openjpeg2
+else
+POPPLER_CONF_OPTS += -enable-libopenjpeg=none
+endif
+
 $(eval $(autotools-package))