Skip to contentSkip to conversation

package/ghostscript: add optional dependency to jbig2dec

PATCH New Bernd Kuhls 2 participants 3 messages Nov 6, 2019 – Mar 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/ghostscript: add optional dependency to jbig2dec

Remove jbig2dec source files included in upstream tarball as well.

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

---
 package/ghostscript/ghostscript.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
package/ghostscript/ghostscript.mk +9 -3
index a6e85d9894..d0f46187c3 100644
@@ -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
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/ghostscript: add optional dependency to openjpeg

Remove openjpeg source files included in upstream tarball as well.

---
 package/ghostscript/ghostscript.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/ghostscript/ghostscript.mk +9 -1
index d0f46187c3..1d6f8d04a0 100644
@@ -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
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 package/ghostscript: add optional dependency to jbig2dec

In reply to Bernd Kuhls
Quoted 8 lines · On Wed, 6 Nov 2019 22:10:04 +0100 Bernd Kuhls <[email protected]> wrote:

Remove jbig2dec source files included in upstream tarball as well.

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

---
 package/ghostscript/ghostscript.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Both applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com