package/ghostscript: add cups support
PATCH v2 1/1 package/ghostscript: add cups support
Ghostscript can be used for cups printing.
In current version it's disabled, but may be needed for some customers.
This patch add cups support if cups enabled. Also patch fix configure.ac for cross-compilation.
---
Changes v1 -> v2:
- use $(STAGING_DIR) for GHOSTSCRIPT_CUPS_CONFIG_FIX
--- .../ghostscript/0002-add-cups-support.patch | 54 +++++++++++++++++++ package/ghostscript/ghostscript.mk | 13 +++++ 2 files changed, 67 insertions(+) create mode 100644 package/ghostscript/0002-add-cups-support.patch
package/ghostscript/0002-add-cups-support.patch new file +54 -0
@@ -0,0 +1,54 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -199,30 +199,6 @@ + + dnl pkg-config is used for several tests now... + AC_PATH_TOOL(PKGCONFIG, pkg-config) +- +-# this is an unpleasant hack +-# but if we are cross compiling, and there isn't a matching +-# pkconfig for the --host setting, then don't use the 'local' +-# pkconfig at all +-if test x"$cross_compiling" = x"yes"; then +- AC_PATH_PROG(BUILD_PKGCONFIG, pkg-config) +- if test x"$BUILD_PKGCONFIG" = x"$PKGCONFIG" ; then +- PKGCONFIG= +- fi +-fi +- +-AC_PATH_TOOL(STRIP_XE, strip) +- +-# this is an unpleasant hack +-# but if we are cross compiling, and there isn't a matching +-# pkconfig for the --host setting, then don't use the 'local' +-# pkconfig at all +-if test x"$cross_compiling" = x"yes"; then +- AC_PATH_PROG(BUILD_STRIP_XE, strip) +- if test x"$BUILD_STRIP_XE" = x"$STRIP_XE" ; then +- STRIP_XE= +- fi +-fi + + dnl -------------------------------------------------- + dnl Allow excluding the contributed drivers +@@ -1432,12 +1408,6 @@ + if test x$with_local_cups != xyes; then + if test x"$CUPSCONFIG" = x""; then + AC_PATH_TOOL(CUPSCONFIG,cups-config) +- if test x"$cross_compiling" = x"yes"; then +- AC_PATH_PROG(BUILD_CUPSCONFIG, cups-config) +- if test x"$BUILD_CUPSCONFIG" = x"$CUPSCONFIG" ; then +- CUPSCONFIG= +- fi +- fi + fi + # check for a libcups header + AC_CHECK_HEADER([cups/cups.h],[],[CUPSCONFIG=""]) +@@ -1473,7 +1443,6 @@ + else + CUPSDATA="`$CUPSCONFIG --datadir`" + fi +- + CUPSINCLUDE="include $srcdir/cups/cups.mak" + CUPSDEV="cups" +
package/ghostscript/ghostscript.mk +13 -0
@@ -10,6 +10,7 @@ GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE # 0001-Fix-cross-compilation-issue.patch +GHOSTSCRIPT_INSTALL_STAGING = YES GHOSTSCRIPT_AUTORECONF = YES GHOSTSCRIPT_DEPENDENCIES = \ host-lcms2 \
@@ -68,6 +69,18 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-openjpeg endif +define GHOSTSCRIPT_CUPS_CONFIG_FIX +cp $(STAGING_DIR)/usr/bin/cups-config $(HOST_DIR)/usr/bin/ +endef + +ifeq ($(BR2_PACKAGE_CUPS),y) +GHOSTSCRIPT_DEPENDENCIES += cups +GHOSTSCRIPT_PRE_CONFIGURE_HOOKS += GHOSTSCRIPT_CUPS_CONFIG_FIX +GHOSTSCRIPT_CONF_OPTS += --enable-cups +else +GHOSTSCRIPT_CONF_OPTS += --disable-cups +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 GHOSTSCRIPT_CONF_OPTS += --with-x
Signature · 1 line
2.17.1
PATCH v2 1/1 package/ghostscript: add cups support
Alexey, All,
On 2020-05-01 11:26 +0300, Alexey Lukyanchuk spake thusly:
package/ghostscript/0002-add-cups-support.patch
Quoted 25 lines
Ghostscript can be used for cups printing.
In current version it's disabled, but may be needed for some customers.
This patch add cups support if cups enabled. Also patch fix configure.ac for cross-compilation.
Signed-off-by Alexey Lukyanchuk <[email protected]>---
Changes v1 -> v2:
- use $(STAGING_DIR) forGHOSTSCRIPT_CUPS_CONFIG_FIX--- .../ghostscript/0002-add-cups-support.patch | 54 +++++++++++++++++++ package/ghostscript/ghostscript.mk | 13 +++++ 2 files changed, 67 insertions(+) create mode 100644 package/ghostscript/0002-add-cups-support.patchpackage/ghostscript/0002-add-cups-support.patch new file +0
-0
This patch must have a subject and a commit log, and must bear your SoB line as well. And sicne ghostscript is hosted in a git repository, thios patch should be a proper git commit exported with 'git format-patch'.
[--SNIP--]
package/ghostscript/0002-add-cups-support.patch line 51
Quoted 5 lines
+@@ -1473,7 +1443,6 @@
package/ghostscript/0002-add-cups-support.patch new file +4
-0+ else + CUPSDATA="`$CUPSCONFIG --datadir`" + fi +-
This hunk is most probably useless...
Quoted 16 lines
package/ghostscript/0002-add-cups-support.patch new file +3
-0+ CUPSINCLUDE="include $srcdir/cups/cups.mak" + CUPSDEV="cups" +package/ghostscript/ghostscript.mk +1
-0@@ -10,6 +10,7 @@ GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE # 0001-Fix-cross-compilation-issue.patch +GHOSTSCRIPT_INSTALL_STAGING = YES GHOSTSCRIPT_AUTORECONF = YES GHOSTSCRIPT_DEPENDENCIES = \ host-lcms2 \
package/ghostscript/ghostscript.mk else · line 74
Quoted 6 lines
package/ghostscript/ghostscript.mk +3
-0@@ -68,6 +69,18 @@ else GHOSTSCRIPT_CONF_OPTS += --disable-openjpeg endif +define GHOSTSCRIPT_CUPS_CONFIG_FIX +cp $(STAGING_DIR)/usr/bin/cups-config $(HOST_DIR)/usr/bin/ +endef
You must not do that; instead pass:
GHOSTSCRIPT_CONF_OPTS += \
CUPSCONFIG=$(STAGING_DIR)/usr/bin/cups-config \
--enable-cupsRegards,
Yann E. MORIN.
Quoted 18 lines
package/ghostscript/ghostscript.mk +8
-0+ifeq ($(BR2_PACKAGE_CUPS),y) +GHOSTSCRIPT_DEPENDENCIES += cups +GHOSTSCRIPT_PRE_CONFIGURE_HOOKS += GHOSTSCRIPT_CUPS_CONFIG_FIX +GHOSTSCRIPT_CONF_OPTS += --enable-cups +else +GHOSTSCRIPT_CONF_OPTS += --disable-cups +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) GHOSTSCRIPT_DEPENDENCIES += xlib_libX11 GHOSTSCRIPT_CONF_OPTS += --with-xSignature · 6 lines
2.17.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'