diff mbox series

[PATCH/next,2/2] package/ghostscript: add optional dependency to openjpeg

Message ID 20191106211005.16734-2-bernd.kuhls@t-online.de
State Accepted
Headers show
Series [PATCH/next,1/2] package/ghostscript: add optional dependency to jbig2dec | expand

Commit Message

Bernd Kuhls Nov. 6, 2019, 9:10 p.m. UTC 
Remove openjpeg source files included in upstream tarball as well.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ghostscript/ghostscript.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk
index d0f46187c3..1d6f8d04a0 100644
--- a/package/ghostscript/ghostscript.mk
+++ b/package/ghostscript/ghostscript.mk
@@ -28,7 +28,8 @@  GHOSTSCRIPT_DEPENDENCIES = \
 # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html
 define GHOSTSCRIPT_REMOVE_LIBS
 	rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jbig2dec $(@D)/jpeg \
-		$(@D)/lcms2mt $(@D)/libpng $(@D)/tiff $(@D)/zlib
+		$(@D)/lcms2mt $(@D)/libpng $(@D)/openjpeg $(@D)/tiff \
+		$(@D)/zlib
 endef
 GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS
 
@@ -60,6 +61,13 @@  else
 GHOSTSCRIPT_CONF_OPTS += --without-libidn
 endif
 
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+GHOSTSCRIPT_DEPENDENCIES += openjpeg
+GHOSTSCRIPT_CONF_OPTS += --enable-openjpeg
+else
+GHOSTSCRIPT_CONF_OPTS += --disable-openjpeg
+endif
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
 GHOSTSCRIPT_DEPENDENCIES += xlib_libX11
 GHOSTSCRIPT_CONF_OPTS += --with-x