From ec79b5c9bc7eb93a4d0b1762fb08e609c662fabb Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 13 Aug 2018 12:32:12 +0200 Subject: [PATCH] INSTALL, configure: replace Jasper with OpenJPEG. Just realizing we haven't updated the INSTALL file with the dependency change. (cherry picked from commit fb57133d55f88e88fafadec8b09a0a3084585b88) --- INSTALL.in | 4 ++-- configure.ac | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/INSTALL.in b/INSTALL.in index a305177a10..8a77cd40fe 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -103,7 +103,7 @@ header files installed. 12. You may want to install other third party libraries or programs that are needed for some of the available plug-ins. We recommend - to check that the following libraries are installed: libjasper, + to check that the following libraries are installed: openjpeg, webkit, libmng, librsvg, libwmf, libaa and libgs (Ghostscript). 13. HEIF support depends on the libheif library. If you don't have @@ -176,13 +176,13 @@ header files installed. gs - ghostscript libaa - ASCII art libheif @LIBHEIF_REQUIRED_VERSION@ HEIF - libjasper - JPEG 2000 libmng - MNG libwebp @WEBP_REQUIRED_VERSION@ WebP (built with --enable-libwebpmux and --enable-libwebpdemux) libwmf @WMF_REQUIRED_VERSION@ WMF libXcursor - X11 Mouse Cursor libxpm - XPM openexr @OPENEXR_REQUIRED_VERSION@ OpenEXR + OpenJPEG @OPENJPEG_REQUIRED_VERSION@ JPEG 2000 python 2 @PYTHON2_REQUIRED_VERSION@ Python plug-ins webkit @WEBKIT_REQUIRED_VERSION@ Help browser & webpage diff --git a/configure.ac b/configure.ac index 8801183486..b60efda4da 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,7 @@ WMF_REQUIRED_VERSION=wmf_required_version POPPLER_REQUIRED_VERSION=poppler_required_version POPPLER_DATA_REQUIRED_VERSION=poppler_data_required_version OPENEXR_REQUIRED_VERSION=openexr_required_version +OPENJPEG_REQUIRED_VERSION=openjpeg_required_version INTLTOOL_REQUIRED_VERSION=intltool_required_version PERL_REQUIRED_VERSION=perl_required_version PYTHON2_REQUIRED_VERSION=python2_required_version @@ -201,6 +202,7 @@ AC_SUBST(WMF_REQUIRED_VERSION) AC_SUBST(POPPLER_REQUIRED_VERSION) AC_SUBST(POPPLER_DATA_REQUIRED_VERSION) AC_SUBST(OPENEXR_REQUIRED_VERSION) +AC_SUBST(OPENJPEG_REQUIRED_VERSION) AC_SUBST(INTLTOOL_REQUIRED_VERSION) AC_SUBST(PERL_REQUIRED_VERSION) AC_SUBST(PYTHON2_REQUIRED_VERSION)