diff mbox series

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

Message ID 20191106211005.16734-1-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 jbig2dec source files included in upstream tarball as well.

Needs http://patchwork.ozlabs.org/patch/1161981/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ghostscript/ghostscript.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni March 29, 2020, 8:56 p.m. UTC | #1 
On Wed,  6 Nov 2019 22:10:04 +0100
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Remove jbig2dec source files included in upstream tarball as well.
> 
> Needs http://patchwork.ozlabs.org/patch/1161981/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/ghostscript/ghostscript.mk | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)

Both applied to master. Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk
index a6e85d9894..d0f46187c3 100644
--- a/package/ghostscript/ghostscript.mk
+++ b/package/ghostscript/ghostscript.mk
@@ -27,8 +27,8 @@  GHOSTSCRIPT_DEPENDENCIES = \
 # Inspired by linuxfromscratch:
 # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html
 define GHOSTSCRIPT_REMOVE_LIBS
-	rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jpeg $(@D)/lcms2mt \
-		$(@D)/libpng $(@D)/tiff $(@D)/zlib
+	rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jbig2dec $(@D)/jpeg \
+		$(@D)/lcms2mt $(@D)/libpng $(@D)/tiff $(@D)/zlib
 endef
 GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS
 
@@ -43,10 +43,16 @@  GHOSTSCRIPT_CONF_OPTS = \
 	--with-fontpath=/usr/share/fonts \
 	--enable-freetype \
 	--disable-gtk \
-	--without-jbig2dec \
 	--without-libpaper \
 	--with-system-libtiff
 
+ifeq ($(BR2_PACKAGE_JBIG2DEC),y)
+GHOSTSCRIPT_DEPENDENCIES += jbig2dec
+GHOSTSCRIPT_CONF_OPTS += --with-jbig2dec
+else
+GHOSTSCRIPT_CONF_OPTS += --without-jbig2dec
+endif
+
 ifeq ($(BR2_PACKAGE_LIBIDN),y)
 GHOSTSCRIPT_DEPENDENCIES += libidn
 GHOSTSCRIPT_CONF_OPTS += --with-libidn