All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups
@ 2015-09-17 12:23 Olivier Schonken
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0 Olivier Schonken
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Olivier Schonken @ 2015-09-17 12:23 UTC (permalink / raw)
  To: buildroot

I'm resubbmitting this patch series.  It seems that the previous sub-
mission got lost due to a mail server or other issue.  The versions
has been updated to the latest available.  
CUPS 2.1.0 adds support for 3D printing. Lots of possibilities...

CUPS-filters provides backends, filters, and other software that was once 
part of the core CUPS distribution but is no longer maintained by Apple Inc.
From CUPS 1.6.0 forward, cups-filters is required for using printer drivers
with CUPS under linux.  It is maintained by the openprinting group of the
linux foundation.

Changes V1 -> V2
Modify Cups makefile to not use -fPIE and -pie when doing static builds.
(Vicente Olivert Riera)

Changes V2 -> V3 (Suggestions by Thomas Pettazoni)
Cups:
Modify Cups patches to show [PATCH] instead of [PATCH 1/2].
Add comment to cups genstrings patch to explain why it is being built.
Remove AVAHI configuration selection, enable/disable according to 
BR_PACKAGE_AVAHI
Add BR2_PACKAGE_CUPS_PDFTOPS to Config.in.legacy
Add locally calculated sh256 hash to cups.hash
Add zlib as cups dependency

HPLIP:
Remove +HPLIP_MAKE_OPTS += LDFLAGS+=-lpthread - Not necessary for succesful 
compilation

Cups-filters
Add dependencies depends on lines and comments for when the dependencies are
not available.
Remove AVAHI configuration selection, enable/disable according to 
BR_PACKAGE_AVAHI
Fix indentation in cups-filters.mk
Remove --disable-avahi and --without-png from default configuration.
Create a separate commit to enable xpdf-headers for poppler
Add selection of BR2_PACKAGE_CUPS_FILTERS_PDFTOPS to Config.in.legacy

Olivier Schonken (5):
  package/poppler: bump version to 0.35.0
  package/cups: Un-deprecate, and update CUPS to 2.1.0
  package/hplip: Un-deprecate and bump version to 3.15.7
  package/gutenprint: Un-deprecate and bump version to 5.2.10
  package/cups-filters: Add new package cups-filters 1.0.74

 package/Config.in                                  |  1 +
 package/cups-filters/Config.in                     | 47 ++++++++++++++++
 package/cups-filters/cups-filters.hash             |  2 +
 package/cups-filters/cups-filters.mk               | 65 ++++++++++++++++++++++
 ...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++
 package/cups/0001-fix-static.patch                 | 28 ----------
 package/cups/0002-Do-not-use-genstrings.patch      | 27 +++++++++
 package/cups/0002-fix-stack-protector-check.patch  | 25 ---------
 package/cups/0003-mantohtml.patch                  | 11 ----
 package/cups/Config.in                             | 19 ++++---
 package/cups/cups.hash                             |  2 +
 package/cups/cups.mk                               | 44 +++++++++------
 package/gutenprint/Config.in                       |  1 -
 package/gutenprint/gutenprint.hash                 |  2 +-
 package/gutenprint/gutenprint.mk                   |  2 +-
 package/hplip/Config.in                            |  1 -
 package/hplip/hplip.hash                           |  2 +-
 package/hplip/hplip.mk                             |  4 +-
 ...invalid-shell-comparaison-in-libtiff-test.patch | 23 --------
 package/poppler/poppler.hash                       |  2 +-
 package/poppler/poppler.mk                         | 13 ++++-
 21 files changed, 227 insertions(+), 121 deletions(-)
 create mode 100644 package/cups-filters/Config.in
 create mode 100644 package/cups-filters/cups-filters.hash
 create mode 100644 package/cups-filters/cups-filters.mk
 create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch
 delete mode 100644 package/cups/0001-fix-static.patch
 create mode 100644 package/cups/0002-Do-not-use-genstrings.patch
 delete mode 100644 package/cups/0002-fix-stack-protector-check.patch
 delete mode 100644 package/cups/0003-mantohtml.patch
 create mode 100644 package/cups/cups.hash
 delete mode 100644 package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch

-- 
1.9.1

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0
  2015-09-17 12:23 [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups Olivier Schonken
@ 2015-09-17 12:23 ` Olivier Schonken
  2015-09-17 13:30   ` Ryan Barnett
  2016-01-19 21:46   ` Samuel Martin
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 2/5] package/hplip: Un-deprecate and bump version to 3.15.7 Olivier Schonken
                   ` (3 subsequent siblings)
  4 siblings, 2 replies; 12+ messages in thread
From: Olivier Schonken @ 2015-09-17 12:23 UTC (permalink / raw)
  To: buildroot

Remove 0001-fix-static.patch - Fixed upstream
Remove 0002-fix-stack-protector-check.patch - Fixed upstream
Remove 0003-mantohtml.patch - Replaced by 0001-Remove-building-html-from-man-
makefile.patch
Add 0002-Do-not-use-genstrings.patch
Add CUPS_PDFTOPS option to Config.in.legacy - This support was moved to the
cups-filters package.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 Config.in.legacy                                   |  7 +++
 ...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++++
 package/cups/0001-fix-static.patch                 | 28 -----------
 package/cups/0002-Do-not-use-genstrings.patch      | 30 ++++++++++++
 package/cups/0002-fix-stack-protector-check.patch  | 25 ----------
 package/cups/0003-mantohtml.patch                  | 11 -----
 package/cups/Config.in                             | 17 +------
 package/cups/cups.hash                             |  4 ++
 package/cups/cups.mk                               | 55 +++++++++++++++-------
 9 files changed, 107 insertions(+), 97 deletions(-)
 create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch
 delete mode 100644 package/cups/0001-fix-static.patch
 create mode 100644 package/cups/0002-Do-not-use-genstrings.patch
 delete mode 100644 package/cups/0002-fix-stack-protector-check.patch
 delete mode 100644 package/cups/0003-mantohtml.patch
 create mode 100644 package/cups/cups.hash

diff --git a/Config.in.legacy b/Config.in.legacy
index 18231fd..fafae00 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.11"
 
+config BR2_PACKAGE_CUPS_PDFTOPS
+	bool "Pdftops support has been removed from Cups"
+	select BR2_LEGACY
+	help
+	  Pdftops support has been removed from the cups package
+	  It is now part of the cups-filters package.
+
 config BR2_PACKAGE_BLACKBOX
 	bool "blackbox package has been removed"
 	select BR2_LEGACY
diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch
new file mode 100644
index 0000000..5468c92
--- /dev/null
+++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch
@@ -0,0 +1,27 @@
+From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Wed, 18 Mar 2015 20:30:39 +0200
+Subject: [PATCH] Remove building html from man makefile
+
+Building and using mantohtml causes problems for cross-compiling
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ man/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/Makefile b/man/Makefile
+index dc1a8c0..0ad42a1 100644
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -73,7 +73,7 @@ MAN8	=	cupsaccept.$(MAN8EXT) \
+ # Make everything...
+ #
+
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) html
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+
+
+ #
+--
+1.9.1
diff --git a/package/cups/0001-fix-static.patch b/package/cups/0001-fix-static.patch
deleted file mode 100644
index 4c9d0d4..0000000
--- a/package/cups/0001-fix-static.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-cups: fix static linking
-
-Append -lz to the cups linking libs to fix a problem like this one:
-
-../cups/libcups.a(file.o): In function `cupsFileSeek':
-/home/test/test/1/output/build/cups-1.3.11/cups/file.c:1444: undefined 
-reference to `inflateEnd'
-collect2: error: ld returned 1 exit status
-make[2]: *** [ipp] Error 1
-make[2]: *** Waiting for unfinished jobs....
-
-This solution is the same used upstream in newer versions.
-
-Fixes:
-   http://autobuild.buildroot.net/results/f3d/f3d4f67ce7ee1d54f5bd4c87dfddb7417db614e5/
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---- cups-1.3.11/Makedefs.in.orig	2014-03-05 13:28:10.175437880 +0000
-+++ cups-1.3.11/Makedefs.in	2014-03-05 13:28:35.398845162 +0000
-@@ -132,7 +132,7 @@ LDFLAGS		=	-L../cups -L../filter @LDARCH
- LEGACY_BACKENDS	=	@LEGACY_BACKENDS@
- LIBCUPSORDER	=	@LIBCUPSORDER@
- LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
--LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
-+LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(LIBZ)
- LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
- LIBS		=	$(LINKCUPS) $(COMMONLIBS)
- OPTIM		=	@OPTIM@
diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch
new file mode 100644
index 0000000..03af0c8
--- /dev/null
+++ b/package/cups/0002-Do-not-use-genstrings.patch
@@ -0,0 +1,30 @@
+From a863814f6dadda054c964897210789eafff6f605 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Wed, 18 Mar 2015 20:33:41 +0200
+Subject: [PATCH] Do not use genstrings
+
+Using cross compiled genstrings while cross-compiling will break compilation.
+Genstrings is still compiled because some power users might want to do ppd
+compilation on their target machine, and for that they would need to use the
+native compiled genstrings binary, to generate a sample.c file for their target
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ ppdc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ppdc/Makefile b/ppdc/Makefile
+index bc8bb64..f6bae25 100644
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -243,7 +243,7 @@ genstrings:		genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
+		libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
+		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Generating localization strings...
+-	./genstrings >sample.c
++	#./genstrings >sample.c
+
+
+ #
+--
+1.9.1
diff --git a/package/cups/0002-fix-stack-protector-check.patch b/package/cups/0002-fix-stack-protector-check.patch
deleted file mode 100644
index 1db35ff..0000000
--- a/package/cups/0002-fix-stack-protector-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH]: use AC_TRY_LINK for stack protector check
-
-Actually try to link an executable to test for stack protector support,
-as gcc seems to accept the -fstack-protector argument even when it's
-compiled with --disable-libssp (but linking fails with a error
-finding -lssp_nonshared).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- config-scripts/cups-compiler.m4 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: cups-1.3.9/config-scripts/cups-compiler.m4
-===================================================================
---- cups-1.3.9.orig/config-scripts/cups-compiler.m4
-+++ cups-1.3.9/config-scripts/cups-compiler.m4
-@@ -109,7 +109,7 @@ if test -n "$GCC"; then
- 	AC_MSG_CHECKING(if GCC supports -fstack-protector)
- 	OLDCFLAGS="$CFLAGS"
- 	CFLAGS="$CFLAGS -fstack-protector"
--	AC_TRY_COMPILE(,,
-+	AC_TRY_LINK(,,
- 		OPTIM="$OPTIM -fstack-protector"
- 		AC_MSG_RESULT(yes),
- 		AC_MSG_RESULT(no))
diff --git a/package/cups/0003-mantohtml.patch b/package/cups/0003-mantohtml.patch
deleted file mode 100644
index e6a10b0..0000000
--- a/package/cups/0003-mantohtml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cups-1.3.5/man/Makefile	2007-07-12 21:01:14.000000000 -0400
-+++ cups-1.3.5/man/Makefile	2008-02-11 08:55:24.000000000 -0500
-@@ -173,7 +173,7 @@ html:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
- 	done
- 
- mantohtml:	mantohtml.o
--	$(CC) $(LDFLAGS) -o $@ mantohtml.o
-+	gcc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml
- 
- 
- #
diff --git a/package/cups/Config.in b/package/cups/Config.in
index 8e60221..0ef0761 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -1,23 +1,10 @@
 config BR2_PACKAGE_CUPS
 	bool "cups"
-	# serious security issues, needs upgrading
-	depends on BR2_DEPRECATED_SINCE_2015_05
+	# needs libstdcpp for ppdc
+	depends on BR2_INSTALL_LIBSTDCPP
 	# needs fork()
 	depends on BR2_USE_MMU
 	help
 	  The Common Unix Printing System
 
 	  http://www.cups.org
-
-if BR2_PACKAGE_CUPS
-
-config BR2_PACKAGE_CUPS_PDFTOPS
-	bool "pdftops support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	  Enable pdftops support
-
-comment "pdftops support needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
-
-endif
diff --git a/package/cups/cups.hash b/package/cups/cups.hash
new file mode 100644
index 0000000..76af0be
--- /dev/null
+++ b/package/cups/cups.hash
@@ -0,0 +1,4 @@
+# From https://www.cups.org/
+md5	c4e57a66298bfdba66bb3d5bedd317a4	cups-2.1.0-source.tar.bz2
+# Locally calculated
+sha256 ba0238418442b8d84e09a865d0df6a728a20399826c5b466b14b1e9ab8c6d2c9  cups-2.1.0-source.tar.bz2
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index c028ef4..3921b4f 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CUPS_VERSION = 1.3.11
+CUPS_VERSION = 2.1.0
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
 CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
 CUPS_LICENSE = GPLv2 LGPLv2
@@ -12,20 +12,29 @@ CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+
+# Don't use -fPIE and -pie for static builds
+ifeq ($(BR2_STATIC_LIBS),y)
+define CUPS_REMOVE_PIEFLAGS
+	$(SED) s/@PIEFLAGS@// $(@D)/Makedefs.in
+endef
+CUPS_PRE_CONFIGURE_HOOKS += CUPS_REMOVE_PIEFLAGS
+endif
+
 CUPS_CONF_OPTS = \
 	--without-perl \
 	--without-java \
 	--without-php \
-	--disable-gnutls \
 	--disable-gssapi \
 	--libdir=/usr/lib
 CUPS_CONFIG_SCRIPTS = cups-config
-
 CUPS_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_ZLIB),zlib) \
-	$(if $(BR2_PACKAGE_LIBPNG),libpng) \
-	$(if $(BR2_PACKAGE_JPEG),jpeg) \
-	$(if $(BR2_PACKAGE_TIFF),tiff)
+	$(if $(BR2_PACKAGE_ZLIB),zlib)
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+CUPS_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
+CUPS_DEPENDENCIES += systemd
+endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 CUPS_CONF_OPTS += --enable-dbus
@@ -34,8 +43,11 @@ else
 CUPS_CONF_OPTS += --disable-dbus
 endif
 
-ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-CUPS_DEPENDENCIES += xlib_libX11
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+CUPS_CONF_OPTS += --enable-gnutls
+CUPS_DEPENDENCIES += gnutls
+else
+CUPS_CONF_OPTS += --disable-gnutls
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
@@ -45,18 +57,25 @@ else
 CUPS_CONF_OPTS += --without-python
 endif
 
-ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
-CUPS_CONF_OPTS += --enable-pdftops
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+CUPS_CONF_OPTS += --enable-libusb
+CUPS_DEPENDENCIES += libusb
 else
-CUPS_CONF_OPTS += --disable-pdftops
+CUPS_CONF_OPTS += --disable-libusb
 endif
 
-# standard autoreconf fails with autoheader failures
-define CUPS_FIXUP_AUTOCONF
-	cd $(@D) && $(AUTOCONF)
-endef
-CUPS_DEPENDENCIES += host-autoconf
+ifeq ($(BR2_PACKAGE_LIBPAPER),y)
+CUPS_CONF_OPTS += --enable-libpaper
+CUPS_DEPENDENCIES += libpaper
+else
+CUPS_CONF_OPTS += --disable-libpaper
+endif
 
-CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF
+ifeq ($(BR2_PACKAGE_AVAHI),y)
+CUPS_DEPENDENCIES += avahi
+CUPS_CONF_OPTS += --enable-avahi
+else
+CUPS_CONF_OPTS += --disable-avahi
+endif
 
 $(eval $(autotools-package))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 2/5] package/hplip: Un-deprecate and bump version to 3.15.7
  2015-09-17 12:23 [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups Olivier Schonken
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0 Olivier Schonken
@ 2015-09-17 12:23 ` Olivier Schonken
  2016-01-19 21:46   ` Samuel Martin
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 3/5] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Olivier Schonken @ 2015-09-17 12:23 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 package/hplip/Config.in  | 1 -
 package/hplip/hplip.hash | 2 +-
 package/hplip/hplip.mk   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/hplip/Config.in b/package/hplip/Config.in
index a8a5f69..780c69e 100644
--- a/package/hplip/Config.in
+++ b/package/hplip/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_HPLIP
 	bool "hplip"
 	# because of cups security issues
-	depends on BR2_DEPRECATED_SINCE_2015_05
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_CUPS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
diff --git a/package/hplip/hplip.hash b/package/hplip/hplip.hash
index fb7d4e7..98f4262 100644
--- a/package/hplip/hplip.hash
+++ b/package/hplip/hplip.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d  hplip-3.13.10.tar.gz
+sha256  d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d	hplip-3.15.7.tar.gz
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index 2cdddca..d0a25c8 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HPLIP_VERSION = 3.13.10
+HPLIP_VERSION = 3.15.7
 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
 HPLIP_AUTORECONF = YES
 HPLIP_DEPENDENCIES = cups libusb jpeg
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 3/5] package/gutenprint: Un-deprecate and bump version to 5.2.10
  2015-09-17 12:23 [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups Olivier Schonken
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0 Olivier Schonken
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 2/5] package/hplip: Un-deprecate and bump version to 3.15.7 Olivier Schonken
@ 2015-09-17 12:23 ` Olivier Schonken
  2016-01-19 21:47   ` Samuel Martin
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 4/5] Enable xpdf-headers in poppler to enable building of cups-filters Olivier Schonken
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 5/5] package/cups-filters: Add new package cups-filters 1.0.74 Olivier Schonken
  4 siblings, 1 reply; 12+ messages in thread
From: Olivier Schonken @ 2015-09-17 12:23 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 package/gutenprint/Config.in       | 1 -
 package/gutenprint/gutenprint.hash | 2 +-
 package/gutenprint/gutenprint.mk   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
index 686dbce..2826594 100644
--- a/package/gutenprint/Config.in
+++ b/package/gutenprint/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_GUTENPRINT
 	bool "gutenprint"
 	# because of cups security issues
-	depends on BR2_DEPRECATED_SINCE_2015_05
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_CUPS
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
diff --git a/package/gutenprint/gutenprint.hash b/package/gutenprint/gutenprint.hash
index 3cfe0e1..36c12cc 100644
--- a/package/gutenprint/gutenprint.hash
+++ b/package/gutenprint/gutenprint.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0  gutenprint-5.2.9.tar.bz2
+sha256  431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59  gutenprint-5.2.10.tar.bz2
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 3ff05b6..0bdc3bc 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 GUTENPRINT_VERSION_MAJOR = 5.2
-GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).9
+GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).10
 GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
 GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
 GUTENPRINT_LICENSE = GPLv2+
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 4/5] Enable xpdf-headers in poppler to enable building of cups-filters
  2015-09-17 12:23 [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups Olivier Schonken
                   ` (2 preceding siblings ...)
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 3/5] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
@ 2015-09-17 12:23 ` Olivier Schonken
  2016-01-19 21:55   ` Samuel Martin
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 5/5] package/cups-filters: Add new package cups-filters 1.0.74 Olivier Schonken
  4 siblings, 1 reply; 12+ messages in thread
From: Olivier Schonken @ 2015-09-17 12:23 UTC (permalink / raw)
  To: buildroot

Add --enable-xpdf-headers to poppler.mk. Required for succesfull
build of cups-filters.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 package/poppler/poppler.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index 6142cba..1113e4b 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -11,7 +11,8 @@ POPPLER_DEPENDENCIES = fontconfig host-pkgconf
 POPPLER_LICENSE = GPLv2+
 POPPLER_LICENSE_FILES = COPYING
 POPPLER_INSTALL_STAGING = YES
-POPPLER_CONF_OPTS = --with-font-configuration=fontconfig
+POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
+	--enable-xpdf-headers
 
 ifeq ($(BR2_PACKAGE_LCMS2),y)
 POPPLER_CONF_OPTS += --enable-cms=lcms2
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 5/5] package/cups-filters: Add new package cups-filters 1.0.74
  2015-09-17 12:23 [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups Olivier Schonken
                   ` (3 preceding siblings ...)
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 4/5] Enable xpdf-headers in poppler to enable building of cups-filters Olivier Schonken
@ 2015-09-17 12:23 ` Olivier Schonken
  2016-01-19 21:55   ` Samuel Martin
  4 siblings, 1 reply; 12+ messages in thread
From: Olivier Schonken @ 2015-09-17 12:23 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 Config.in.legacy                       |  1 +
 package/Config.in                      |  1 +
 package/cups-filters/Config.in         | 57 ++++++++++++++++++++++++++++++++++
 package/cups-filters/cups-filters.hash |  2 ++
 package/cups-filters/cups-filters.mk   | 57 ++++++++++++++++++++++++++++++++++
 5 files changed, 118 insertions(+)
 create mode 100644 package/cups-filters/Config.in
 create mode 100644 package/cups-filters/cups-filters.hash
 create mode 100644 package/cups-filters/cups-filters.mk

diff --git a/Config.in.legacy b/Config.in.legacy
index fafae00..b0d6421 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -109,6 +109,7 @@ comment "Legacy options removed in 2015.11"
 
 config BR2_PACKAGE_CUPS_PDFTOPS
 	bool "Pdftops support has been removed from Cups"
+	select BR2_PACKAGE_CUPS_FILTERS_PDFTOPS
 	select BR2_LEGACY
 	help
 	  Pdftops support has been removed from the cups package
diff --git a/package/Config.in b/package/Config.in
index e2f669a..988a205 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1221,6 +1221,7 @@ menu "Networking applications"
 	source "package/crda/Config.in"
 	source "package/ctorrent/Config.in"
 	source "package/cups/Config.in"
+	source "package/cups-filters/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/dhcp/Config.in"
 endif
diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in
new file mode 100644
index 0000000..20e4eaa
--- /dev/null
+++ b/package/cups-filters/Config.in
@@ -0,0 +1,57 @@
+config BR2_PACKAGE_CUPS_FILTERS
+	bool "cups-filters"
+	depends on BR2_PACKAGE_CUPS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_IJS
+	select BR2_PACKAGE_LCMS2
+	select BR2_PACKAGE_POPPLER
+	select BR2_PACKAGE_QPDF
+	# needs fork()
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_LIBGLIB2
+	depends on BR2_PACKAGE_IJS
+	depends on BR2_PACKAGE_LCMS2
+	depends on BR2_PACKAGE_POPPLER
+	depends on BR2_PACKAGE_QPDF
+	help
+	  This project provides backends, filters, and other software that was
+	  once part of the core CUPS distribution but is no longer maintained
+	  by Apple Inc. In addition it contains additional filters and software
+	  developed independently of Apple, especially filters for the PDF-
+	  centric printing workflow introduced by OpenPrinting and a daemon
+	  to browse Bonjour broadcasts of remote CUPS printers to make these
+	  printers available locally and to provide backward compatibility to
+	  the old CUPS broadcasting and browsing of CUPS 1.5.x and older.
+	  From CUPS 1.6.0 on, this package is required for using printer drivers
+	  with CUPS under Linux. With CUPS 1.5.x and earlier this package can be
+	  used optionally to switch over to PDF-based printing.
+
+	  http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
+
+comment "cups-filters depends on libglib2"
+	depends on !BR2_PACKAGE_LIBGLIB2
+
+comment "cups-filters depends on ijs"
+	depends on !BR2_PACKAGE_IJS
+
+comment "cups-filters depends on lcms2"
+	depends on !BR2_PACKAGE_LCMS2
+
+comment "cups-filters depends on poppler"
+	depends on !BR2_PACKAGE_POPPLER
+
+comment "cups-filters depends on qpdf"
+	depends on !BR2_PACKAGE_QPDF
+
+if BR2_PACKAGE_CUPS_FILTERS
+
+config BR2_PACKAGE_CUPS_FILTERS_PDFTOPS
+	bool "pdftops support"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Enable pdftops support
+
+comment "pdftops support needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+endif
diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash
new file mode 100644
index 0000000..cb300d4
--- /dev/null
+++ b/package/cups-filters/cups-filters.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256	c091938a7c25a600138c501075b222611ef333157e2554376bb60189032591c5  cups-filters-1.0.74.tar.gz
diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk
new file mode 100644
index 0000000..5d46e60
--- /dev/null
+++ b/package/cups-filters/cups-filters.mk
@@ -0,0 +1,57 @@
+################################################################################
+#
+# cups-filters
+#
+################################################################################
+
+CUPS_FILTERS_VERSION = 1.0.74
+CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters/
+CUPS_FILTERS_LICENSE = GPLv2+
+CUPS_FILTERS_LICENSE_FILES = COPYING
+
+CUPS_FILTERS_DEPENDENCIES = cups libglib2 ijs lcms2 poppler qpdf
+
+CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
+	--with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
+	--with-sysroot=$(STAGING_DIR)
+
+ifeq ($(BR2_PACKAGE_CUPS_FILTERS_PDFTOPS),y)
+CUPS_FILTERS_CONF_OPTS += --with-pdftops=pdftops
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+CUPS_FILTERS_CONF_OPTS += --with-jpeg
+CUPS_FILTERS_DEPENDENCIES += jpeg
+else
+CUPS_FILTERS_CONF_OPTS += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+CUPS_FILTERS_CONF_OPTS += --with-png
+CUPS_FILTERS_DEPENDENCIES += libpng
+else
+CUPS_FILTERS_CONF_OPTS += --without-png
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+CUPS_FILTERS_CONF_OPTS += --with-tiff
+CUPS_FILTERS_DEPENDENCIES += tiff
+else
+CUPS_FILTERS_CONF_OPTS += --without-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+CUPS_FILTERS_CONF_OPTS += --enable-dbus
+CUPS_FILTERS_DEPENDENCIES += dbus
+else
+CUPS_FILTERS_CONF_OPTS += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_AVAHI),y)
+CUPS_FILTERS_DEPENDENCIES += avahi
+CUPS_FILTERS_CONF_OPTS += --enable-avahi
+else
+CUPS_FILTERS_CONF_OPTS += --disable-avahi
+endif
+
+$(eval $(autotools-package))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0 Olivier Schonken
@ 2015-09-17 13:30   ` Ryan Barnett
  2016-01-19 21:46   ` Samuel Martin
  1 sibling, 0 replies; 12+ messages in thread
From: Ryan Barnett @ 2015-09-17 13:30 UTC (permalink / raw)
  To: buildroot

Olivier,

On Thu, Sep 17, 2015 at 7:23 AM, Olivier Schonken
<olivier.schonken@gmail.com> wrote:

[..]

> diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> new file mode 100644
> index 0000000..5468c92
> --- /dev/null
> +++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> @@ -0,0 +1,27 @@
> +From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
> +From: Olivier Schonken <olivier.schonken@gmail.com>
> +Date: Wed, 18 Mar 2015 20:30:39 +0200
> +Subject: [PATCH] Remove building html from man makefile
> +
> +Building and using mantohtml causes problems for cross-compiling
> +
> +Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> +---
> + man/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)

Would it make more sense to just disable the build of the
documentation all together?

Usually it has been the practice to disable the building of man pages
or any documentation since they are stripped from the target anyways.
I'm not sure if this is possible or not from a conf option because I
haven't look around on the package.

> +diff --git a/man/Makefile b/man/Makefile
> +index dc1a8c0..0ad42a1 100644
> +--- a/man/Makefile
> ++++ b/man/Makefile
> +@@ -73,7 +73,7 @@ MAN8 =       cupsaccept.$(MAN8EXT) \
> + # Make everything...
> + #
> +
> +-all:  $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
> ++all:  $(MAN1) $(MAN5) $(MAN7) $(MAN8)
> +
> +
> + #
> +--
> +1.9.1

[..]

Thanks,
-Ryan

-- 
Ryan Barnett / Sr Software Engineer
Airborne Information Systems / Security Systems and Software
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
ryan.barnett at rockwellcollins.com
www.rockwellcollins.com

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0 Olivier Schonken
  2015-09-17 13:30   ` Ryan Barnett
@ 2016-01-19 21:46   ` Samuel Martin
  1 sibling, 0 replies; 12+ messages in thread
From: Samuel Martin @ 2016-01-19 21:46 UTC (permalink / raw)
  To: buildroot

Hi Olivier,

Thanks for this series, and apologies for not coming back sooner to you :-s

On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken
<olivier.schonken@gmail.com> wrote:
> Remove 0001-fix-static.patch - Fixed upstream
> Remove 0002-fix-stack-protector-check.patch - Fixed upstream
> Remove 0003-mantohtml.patch - Replaced by 0001-Remove-building-html-from-man-
> makefile.patch
> Add 0002-Do-not-use-genstrings.patch
> Add CUPS_PDFTOPS option to Config.in.legacy - This support was moved to the
> cups-filters package.
>
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
>  Config.in.legacy                                   |  7 +++
>  ...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++++
>  package/cups/0001-fix-static.patch                 | 28 -----------
>  package/cups/0002-Do-not-use-genstrings.patch      | 30 ++++++++++++
>  package/cups/0002-fix-stack-protector-check.patch  | 25 ----------
>  package/cups/0003-mantohtml.patch                  | 11 -----
>  package/cups/Config.in                             | 17 +------
>  package/cups/cups.hash                             |  4 ++
>  package/cups/cups.mk                               | 55 +++++++++++++++-------
>  9 files changed, 107 insertions(+), 97 deletions(-)
>  create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch
>  delete mode 100644 package/cups/0001-fix-static.patch
>  create mode 100644 package/cups/0002-Do-not-use-genstrings.patch
>  delete mode 100644 package/cups/0002-fix-stack-protector-check.patch
>  delete mode 100644 package/cups/0003-mantohtml.patch
>  create mode 100644 package/cups/cups.hash
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 18231fd..fafae00 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -107,6 +107,13 @@ endif
>  ###############################################################################
>  comment "Legacy options removed in 2015.11"
This obviously will need to be updated ;-)

>
> +config BR2_PACKAGE_CUPS_PDFTOPS
> +       bool "Pdftops support has been removed from Cups"
> +       select BR2_LEGACY
> +       help
> +         Pdftops support has been removed from the cups package
> +         It is now part of the cups-filters package.
> +
>  config BR2_PACKAGE_BLACKBOX
>         bool "blackbox package has been removed"
>         select BR2_LEGACY
> diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> new file mode 100644
> index 0000000..5468c92
> --- /dev/null
> +++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> @@ -0,0 +1,27 @@
> +From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
> +From: Olivier Schonken <olivier.schonken@gmail.com>
> +Date: Wed, 18 Mar 2015 20:30:39 +0200
> +Subject: [PATCH] Remove building html from man makefile
> +
> +Building and using mantohtml causes problems for cross-compiling
> +
> +Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> +---
> + man/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/man/Makefile b/man/Makefile
> +index dc1a8c0..0ad42a1 100644
> +--- a/man/Makefile
> ++++ b/man/Makefile
> +@@ -73,7 +73,7 @@ MAN8 =       cupsaccept.$(MAN8EXT) \
> + # Make everything...
> + #
> +
> +-all:  $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
> ++all:  $(MAN1) $(MAN5) $(MAN7) $(MAN8)

As Ryan already said, we don't really care about manpages on the target
Instead of this patch only disabling some part of the man, how about
disabling the whole man build (i.e. [1])?

[> @@ -1,11 +0,0 @@
> ---- cups-1.3.5/man/Makefile    2007-07-12 21:01:14.000000000 -0400
> -+++ cups-1.3.5/man/Makefile    2008-02-11 08:55:24.000000000 -0500
> -@@ -173,7 +173,7 @@ html:      $(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
> -       done
> -
> - mantohtml:    mantohtml.o
> --      $(CC) $(LDFLAGS) -o $@ mantohtml.o
> -+      gcc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml
> -
> -
> - #
> diff --git a/package/cups/Config.in b/package/cups/Config.in
> index 8e60221..0ef0761 100644
> --- a/package/cups/Config.in
> +++ b/package/cups/Config.in
> @@ -1,23 +1,10 @@
>  config BR2_PACKAGE_CUPS
>         bool "cups"
> -       # serious security issues, needs upgrading
> -       depends on BR2_DEPRECATED_SINCE_2015_05
> +       # needs libstdcpp for ppdc
> +       depends on BR2_INSTALL_LIBSTDCPP
Here you are adding a toolchain dependency, please add a comment when
this dependency is not met [2].

>         # needs fork()
>         depends on BR2_USE_MMU
>         help
>           The Common Unix Printing System
>
>           http://www.cups.org
> -
> -if BR2_PACKAGE_CUPS
> -
> -config BR2_PACKAGE_CUPS_PDFTOPS
> -       bool "pdftops support"
> -       depends on BR2_INSTALL_LIBSTDCPP
> -       help
> -         Enable pdftops support
> -
> -comment "pdftops support needs a toolchain w/ C++"
> -       depends on !BR2_INSTALL_LIBSTDCPP
> -
> -endif
> diff --git a/package/cups/cups.hash b/package/cups/cups.hash
> new file mode 100644
> index 0000000..76af0be
> --- /dev/null
> +++ b/package/cups/cups.hash
> @@ -0,0 +1,4 @@
> +# From https://www.cups.org/
> +md5    c4e57a66298bfdba66bb3d5bedd317a4        cups-2.1.0-source.tar.bz2
> +# Locally calculated
> +sha256 ba0238418442b8d84e09a865d0df6a728a20399826c5b466b14b1e9ab8c6d2c9  cups-2.1.0-source.tar.bz2
> diff --git a/package/cups/cups.mk b/package/cups/cups.mk
> index c028ef4..3921b4f 100644
> --- a/package/cups/cups.mk
> +++ b/package/cups/cups.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>
> -CUPS_VERSION = 1.3.11
> +CUPS_VERSION = 2.1.0
>  CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
>  CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
>  CUPS_LICENSE = GPLv2 LGPLv2
> @@ -12,20 +12,29 @@ CUPS_LICENSE_FILES = LICENSE.txt
>  CUPS_INSTALL_STAGING = YES
>  CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
>  CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
> +
> +# Don't use -fPIE and -pie for static builds
> +ifeq ($(BR2_STATIC_LIBS),y)
> +define CUPS_REMOVE_PIEFLAGS
> +       $(SED) s/@PIEFLAGS@// $(@D)/Makedefs.in
> +endef
> +CUPS_PRE_CONFIGURE_HOOKS += CUPS_REMOVE_PIEFLAGS
> +endif
I doubt this is needed.
I give a try with this defconfig [3], without this hook, it builds fine.

> +
>  CUPS_CONF_OPTS = \
>         --without-perl \
>         --without-java \
>         --without-php \
> -       --disable-gnutls \
>         --disable-gssapi \
>         --libdir=/usr/lib
>  CUPS_CONFIG_SCRIPTS = cups-config
> -
>  CUPS_DEPENDENCIES = \
> -       $(if $(BR2_PACKAGE_ZLIB),zlib) \
> -       $(if $(BR2_PACKAGE_LIBPNG),libpng) \
> -       $(if $(BR2_PACKAGE_JPEG),jpeg) \
> -       $(if $(BR2_PACKAGE_TIFF),tiff)
> +       $(if $(BR2_PACKAGE_ZLIB),zlib)
> +
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +CUPS_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
Please, here add the --enable-systemd, and the corresponding
else-block, otherwise the defconfig [3] does not build.

> +CUPS_DEPENDENCIES += systemd
> +endif
>
[...]

[1] http://code.bulix.org/3t2b52-90353
[2] http://nightly.buildroot.org/manual.html#dependencies-target-toolchain-options
[3] http://code.bulix.org/2lwfad-90448

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 2/5] package/hplip: Un-deprecate and bump version to 3.15.7
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 2/5] package/hplip: Un-deprecate and bump version to 3.15.7 Olivier Schonken
@ 2016-01-19 21:46   ` Samuel Martin
  0 siblings, 0 replies; 12+ messages in thread
From: Samuel Martin @ 2016-01-19 21:46 UTC (permalink / raw)
  To: buildroot

Hi Olivier,

On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken
<olivier.schonken@gmail.com> wrote:
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
>  package/hplip/Config.in  | 1 -
>  package/hplip/hplip.hash | 2 +-
>  package/hplip/hplip.mk   | 2 +-
>  3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/package/hplip/Config.in b/package/hplip/Config.in
> index a8a5f69..780c69e 100644
> --- a/package/hplip/Config.in
> +++ b/package/hplip/Config.in
> @@ -1,7 +1,6 @@
>  config BR2_PACKAGE_HPLIP
>         bool "hplip"
>         # because of cups security issues
This comment is no longer appropriate, right? If so, remove it, please.

> -       depends on BR2_DEPRECATED_SINCE_2015_05
>         depends on BR2_INSTALL_LIBSTDCPP
>         depends on BR2_PACKAGE_CUPS
>         depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
> diff --git a/package/hplip/hplip.hash b/package/hplip/hplip.hash
> index fb7d4e7..98f4262 100644
> --- a/package/hplip/hplip.hash
> +++ b/package/hplip/hplip.hash
> @@ -1,2 +1,2 @@
>  # Locally computed:
> -sha256  a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d  hplip-3.13.10.tar.gz
> +sha256  d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d       hplip-3.15.7.tar.gz
> diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
> index 2cdddca..d0a25c8 100644
> --- a/package/hplip/hplip.mk
> +++ b/package/hplip/hplip.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>
> -HPLIP_VERSION = 3.13.10
> +HPLIP_VERSION = 3.15.7
>  HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
>  HPLIP_AUTORECONF = YES
>  HPLIP_DEPENDENCIES = cups libusb jpeg
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 3/5] package/gutenprint: Un-deprecate and bump version to 5.2.10
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 3/5] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
@ 2016-01-19 21:47   ` Samuel Martin
  0 siblings, 0 replies; 12+ messages in thread
From: Samuel Martin @ 2016-01-19 21:47 UTC (permalink / raw)
  To: buildroot

Hi Olivier,

On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken
<olivier.schonken@gmail.com> wrote:
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
>  package/gutenprint/Config.in       | 1 -
>  package/gutenprint/gutenprint.hash | 2 +-
>  package/gutenprint/gutenprint.mk   | 2 +-
>  3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/package/gutenprint/Config.in b/package/gutenprint/Config.in
> index 686dbce..2826594 100644
> --- a/package/gutenprint/Config.in
> +++ b/package/gutenprint/Config.in
> @@ -1,7 +1,6 @@
>  config BR2_PACKAGE_GUTENPRINT
>         bool "gutenprint"
>         # because of cups security issues
This comment is no longer appropriate, right? If so, remove it, please.

> -       depends on BR2_DEPRECATED_SINCE_2015_05
>         depends on BR2_INSTALL_LIBSTDCPP
>         depends on BR2_PACKAGE_CUPS
>         select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
> diff --git a/package/gutenprint/gutenprint.hash b/package/gutenprint/gutenprint.hash
> index 3cfe0e1..36c12cc 100644
> --- a/package/gutenprint/gutenprint.hash
> +++ b/package/gutenprint/gutenprint.hash
> @@ -1,2 +1,2 @@
>  # Locally computed:
> -sha256  4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0  gutenprint-5.2.9.tar.bz2
> +sha256  431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59  gutenprint-5.2.10.tar.bz2
> diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
> index 3ff05b6..0bdc3bc 100644
> --- a/package/gutenprint/gutenprint.mk
> +++ b/package/gutenprint/gutenprint.mk
> @@ -5,7 +5,7 @@
>  ################################################################################
>
>  GUTENPRINT_VERSION_MAJOR = 5.2
> -GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).9
> +GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).10
>  GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
>  GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
>  GUTENPRINT_LICENSE = GPLv2+
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 4/5] Enable xpdf-headers in poppler to enable building of cups-filters
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 4/5] Enable xpdf-headers in poppler to enable building of cups-filters Olivier Schonken
@ 2016-01-19 21:55   ` Samuel Martin
  0 siblings, 0 replies; 12+ messages in thread
From: Samuel Martin @ 2016-01-19 21:55 UTC (permalink / raw)
  To: buildroot

Hi Olivier,

On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken
<olivier.schonken@gmail.com> wrote:
> Add --enable-xpdf-headers to poppler.mk. Required for succesfull
> build of cups-filters.
>
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Buildroot] [PATCH v3 5/5] package/cups-filters: Add new package cups-filters 1.0.74
  2015-09-17 12:23 ` [Buildroot] [PATCH v3 5/5] package/cups-filters: Add new package cups-filters 1.0.74 Olivier Schonken
@ 2016-01-19 21:55   ` Samuel Martin
  0 siblings, 0 replies; 12+ messages in thread
From: Samuel Martin @ 2016-01-19 21:55 UTC (permalink / raw)
  To: buildroot

Hi Olivier,

On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken
<olivier.schonken@gmail.com> wrote:
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
>  Config.in.legacy                       |  1 +
>  package/Config.in                      |  1 +
>  package/cups-filters/Config.in         | 57 ++++++++++++++++++++++++++++++++++
>  package/cups-filters/cups-filters.hash |  2 ++
>  package/cups-filters/cups-filters.mk   | 57 ++++++++++++++++++++++++++++++++++
>  5 files changed, 118 insertions(+)
>  create mode 100644 package/cups-filters/Config.in
>  create mode 100644 package/cups-filters/cups-filters.hash
>  create mode 100644 package/cups-filters/cups-filters.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index fafae00..b0d6421 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -109,6 +109,7 @@ comment "Legacy options removed in 2015.11"
>
>  config BR2_PACKAGE_CUPS_PDFTOPS
>         bool "Pdftops support has been removed from Cups"
> +       select BR2_PACKAGE_CUPS_FILTERS_PDFTOPS
>         select BR2_LEGACY
>         help
>           Pdftops support has been removed from the cups package
> diff --git a/package/Config.in b/package/Config.in
> index e2f669a..988a205 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1221,6 +1221,7 @@ menu "Networking applications"
>         source "package/crda/Config.in"
>         source "package/ctorrent/Config.in"
>         source "package/cups/Config.in"
> +       source "package/cups-filters/Config.in"
>  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
>         source "package/dhcp/Config.in"
>  endif
> diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in
> new file mode 100644
> index 0000000..20e4eaa
> --- /dev/null
> +++ b/package/cups-filters/Config.in
> @@ -0,0 +1,57 @@
> +config BR2_PACKAGE_CUPS_FILTERS
> +       bool "cups-filters"
> +       depends on BR2_PACKAGE_CUPS
Use "select BR2_PACKAGE_CUPS" instead.
Also, when you'll remove the "depends on", the rendering in menuconfig
will be a slightly different (better IMOH ;-]).

> +       select BR2_PACKAGE_LIBGLIB2
> +       select BR2_PACKAGE_IJS
> +       select BR2_PACKAGE_LCMS2
> +       select BR2_PACKAGE_POPPLER
> +       select BR2_PACKAGE_QPDF
> +       # needs fork()
> +       depends on BR2_USE_MMU
Move this line up please, (we usually place the "depends on" statement
right after the "bool" one).

> +       depends on BR2_PACKAGE_LIBGLIB2
> +       depends on BR2_PACKAGE_IJS
> +       depends on BR2_PACKAGE_LCMS2
> +       depends on BR2_PACKAGE_POPPLER
> +       depends on BR2_PACKAGE_QPDF
Do not depends on something and select it at the same time, this is
causing recursive dependencies at the kconfig level.
In Buildroot, we usually use "select" on package symbols.

> +       help
> +         This project provides backends, filters, and other software that was
> +         once part of the core CUPS distribution but is no longer maintained
> +         by Apple Inc. In addition it contains additional filters and software
> +         developed independently of Apple, especially filters for the PDF-
> +         centric printing workflow introduced by OpenPrinting and a daemon
> +         to browse Bonjour broadcasts of remote CUPS printers to make these
> +         printers available locally and to provide backward compatibility to
> +         the old CUPS broadcasting and browsing of CUPS 1.5.x and older.
> +         From CUPS 1.6.0 on, this package is required for using printer drivers
> +         with CUPS under Linux. With CUPS 1.5.x and earlier this package can be
> +         used optionally to switch over to PDF-based printing.
> +
> +         http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
> +
> +comment "cups-filters depends on libglib2"
> +       depends on !BR2_PACKAGE_LIBGLIB2
> +
> +comment "cups-filters depends on ijs"
> +       depends on !BR2_PACKAGE_IJS
> +
> +comment "cups-filters depends on lcms2"
> +       depends on !BR2_PACKAGE_LCMS2
> +
> +comment "cups-filters depends on poppler"
> +       depends on !BR2_PACKAGE_POPPLER
> +
> +comment "cups-filters depends on qpdf"
> +       depends on !BR2_PACKAGE_QPDF
These 5 comments are not needed.

> +
> +if BR2_PACKAGE_CUPS_FILTERS
> +
> +config BR2_PACKAGE_CUPS_FILTERS_PDFTOPS
> +       bool "pdftops support"
> +       depends on BR2_INSTALL_LIBSTDCPP
> +       help
> +         Enable pdftops support
> +
> +comment "pdftops support needs a toolchain w/ C++"
> +       depends on !BR2_INSTALL_LIBSTDCPP
> +
> +endif
> diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash
> new file mode 100644
> index 0000000..cb300d4
> --- /dev/null
> +++ b/package/cups-filters/cups-filters.hash
> @@ -0,0 +1,2 @@
> +# Locally computed:
> +sha256 c091938a7c25a600138c501075b222611ef333157e2554376bb60189032591c5  cups-filters-1.0.74.tar.gz
> diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk
> new file mode 100644
> index 0000000..5d46e60
> --- /dev/null
> +++ b/package/cups-filters/cups-filters.mk
> @@ -0,0 +1,57 @@
> +################################################################################
> +#
> +# cups-filters
> +#
> +################################################################################
> +
> +CUPS_FILTERS_VERSION = 1.0.74
> +CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters/
Remove the trailing slash please.

> +CUPS_FILTERS_LICENSE = GPLv2+
hmm, that's not so simple :-/. Have careful look at the README file.
Some are under GPLv2, some under MIT...
Also, many source files refer to a non-existing LICENSE.txt file.

> +CUPS_FILTERS_LICENSE_FILES = COPYING
> +
> +CUPS_FILTERS_DEPENDENCIES = cups libglib2 ijs lcms2 poppler qpdf
> +
> +CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
> +       --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
> +       --with-sysroot=$(STAGING_DIR)
> +
> +ifeq ($(BR2_PACKAGE_CUPS_FILTERS_PDFTOPS),y)
> +CUPS_FILTERS_CONF_OPTS += --with-pdftops=pdftops
> +endif
> +
> +ifeq ($(BR2_PACKAGE_JPEG),y)
> +CUPS_FILTERS_CONF_OPTS += --with-jpeg
> +CUPS_FILTERS_DEPENDENCIES += jpeg
> +else
> +CUPS_FILTERS_CONF_OPTS += --without-jpeg
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBPNG),y)
> +CUPS_FILTERS_CONF_OPTS += --with-png
> +CUPS_FILTERS_DEPENDENCIES += libpng
> +else
> +CUPS_FILTERS_CONF_OPTS += --without-png
> +endif
> +
> +ifeq ($(BR2_PACKAGE_TIFF),y)
> +CUPS_FILTERS_CONF_OPTS += --with-tiff
> +CUPS_FILTERS_DEPENDENCIES += tiff
> +else
> +CUPS_FILTERS_CONF_OPTS += --without-tiff
> +endif
> +
> +ifeq ($(BR2_PACKAGE_DBUS),y)
> +CUPS_FILTERS_CONF_OPTS += --enable-dbus
> +CUPS_FILTERS_DEPENDENCIES += dbus
> +else
> +CUPS_FILTERS_CONF_OPTS += --disable-dbus
> +endif
> +
> +ifeq ($(BR2_PACKAGE_AVAHI),y)
> +CUPS_FILTERS_DEPENDENCIES += avahi
> +CUPS_FILTERS_CONF_OPTS += --enable-avahi
> +else
> +CUPS_FILTERS_CONF_OPTS += --disable-avahi
> +endif
> +
> +$(eval $(autotools-package))
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-01-19 21:55 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-17 12:23 [Buildroot] [PATCH v3 0/5] Buildroot printing with Cups Olivier Schonken
2015-09-17 12:23 ` [Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0 Olivier Schonken
2015-09-17 13:30   ` Ryan Barnett
2016-01-19 21:46   ` Samuel Martin
2015-09-17 12:23 ` [Buildroot] [PATCH v3 2/5] package/hplip: Un-deprecate and bump version to 3.15.7 Olivier Schonken
2016-01-19 21:46   ` Samuel Martin
2015-09-17 12:23 ` [Buildroot] [PATCH v3 3/5] package/gutenprint: Un-deprecate and bump version to 5.2.10 Olivier Schonken
2016-01-19 21:47   ` Samuel Martin
2015-09-17 12:23 ` [Buildroot] [PATCH v3 4/5] Enable xpdf-headers in poppler to enable building of cups-filters Olivier Schonken
2016-01-19 21:55   ` Samuel Martin
2015-09-17 12:23 ` [Buildroot] [PATCH v3 5/5] package/cups-filters: Add new package cups-filters 1.0.74 Olivier Schonken
2016-01-19 21:55   ` Samuel Martin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.