Skip to contentSkip to conversation

Buildroot printing with Cups

PATCH New Olivier Schonken 2 participants 8 messages Sep 15, 2015 – Sep 16, 2015

lore
Share & tools
lore
#0 lore raw

v2 cover Buildroot printing with Cups

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)

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
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/4 package/cups: Un-deprecate, and update CUPS to 2.1.0

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

---
 ...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                               | 53 ++++++++++++++--------
 8 files changed, 103 insertions(+), 89 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
package/cups/0001-Remove-building-html-from-man-makefile.patch new file +27 -0
new file mode 100644
index 0000000..546e76b
@@ -0,0 +1,27 @@
+From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Wed, 18 Mar 2015 20:30:39 +0200
+Subject: [PATCH 1/2] Remove building html from man makefile
+
+Building and using mantohtml causes problems for cross-compiling
+
+Signed-off-by: Olivier Schonken <[email protected]>
+---
+ 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
package/cups/0001-fix-static.patch deleted +0 -28
deleted file mode 100644
index 4c9d0d4..0000000
@@ -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 <[email protected]>
---- 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@
package/cups/0002-Do-not-use-genstrings.patch new file +27 -0
new file mode 100644
index 0000000..e5b2de3
@@ -0,0 +1,27 @@
+From a863814f6dadda054c964897210789eafff6f605 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Wed, 18 Mar 2015 20:33:41 +0200
+Subject: [PATCH 2/2] Do not use genstrings
+
+Using cross compiled genstrings while cross-compiling will break compilation.
+
+Signed-off-by: Olivier Schonken <[email protected]>
+---
+ 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
package/cups/0002-fix-stack-protector-check.patch deleted +0 -25
deleted file mode 100644
index 1db35ff..0000000
@@ -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 <[email protected]>
----
- 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))
package/cups/0003-mantohtml.patch deleted +0 -11
deleted file mode 100644
index e6a10b0..0000000
@@ -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
- 
- 
- #
package/cups/Config.in +12 -7
index 8e60221..d89c86b 100644
@@ -1,7 +1,7 @@
 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
@@ -13,11 +13,16 @@ if BR2_PACKAGE_CUPS
 
 config BR2_PACKAGE_CUPS_PDFTOPS
 	bool "pdftops support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	  Enable pdftops support
+	depends on BR2_DEPRECATED_SINCE_2015_05
 
-comment "pdftops support needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+config BR2_PACKAGE_CUPS_AVAHI
+	bool "avahi support"
+	depends on !BR2_STATIC_LIBS # avahi
+	depends on !BR2_TOOLCHAIN_HAS_THREADS # avahi
+	select BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_AVAHI_DAEMON
+	help
+	  Enable Avahi support.
+	  Select this if you want cups to support Bonjour protocol.
 
 endif
package/cups/cups.hash new file +2 -0
new file mode 100644
index 0000000..7c22b55
@@ -0,0 +1,2 @@
+# From https://www.cups.org/
+md5	c4e57a66298bfdba66bb3d5bedd317a4	cups-2.1.0-source.tar.bz2
package/cups/cups.mk +35 -18

88 lines not on this page · raw message

Signature · 1 line
1.9.1
#2 lore raw

PATCH v2 1/4 package/cups: Un-deprecate, and update CUPS to 2.1.0

Olivier,

First of all, thanks a lot for getting back to this patch series, and reviving it. We definitely need to update the printing stack in Buildroot. Please see below some comments.

package/cups/0001-Remove-building-html-from-man-makefile.patch line 4

Quoted 10 lines · Olivier Schonken
package/cups/0001-Remove-building-html-from-man-makefile.patch new file +4 -0
new file mode 100644
index 0000000..546e76b
@@ -0,0 +1,27 @@
+From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Wed, 18 Mar 2015 20:30:39 +0200
+Subject: [PATCH 1/2] Remove building html from man makefile

Can you use git format-patch -N so that we don't have numbered patches (i.e [PATCH] instead of [PATCH 1/2]) ?

Quoted 18 lines
package/cups/0002-Do-not-use-genstrings.patch new file +12 -0
new file mode 100644
index 0000000..e5b2de3
@@ -0,0 +1,27 @@
+From a863814f6dadda054c964897210789eafff6f605 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Wed, 18 Mar 2015 20:33:41 +0200
+Subject: [PATCH 2/2] Do not use genstrings
+
+Using cross compiled genstrings while cross-compiling will break compilation.
+
+Signed-off-by: Olivier Schonken <[email protected]>
+---
+ ppdc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+

package/cups/0002-Do-not-use-genstrings.patch line 22

Quoted 10 lines
package/cups/0002-Do-not-use-genstrings.patch new file +10 -0
+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

But then, what is generating sample.c ? It indeed builds fine with your patch, and a quick inspection of the Makefile seems to indicate that this generated sample.c is in fact not used to build CUPS. Is this correct?

If so, can you expand the commit log to explain that?

But since genstrings is not even installed to the target, and not even used, why not instead simply remove it from the TARGETS variable in ppdc/Makefile ?

package/cups/Config.in line 4

Quoted 11 lines
package/cups/Config.in +2 -2
index 8e60221..d89c86b 100644
@@ -1,7 +1,7 @@
 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

So you need to add:

comment "cups needs a toolchain w/ C++"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP

package/cups/Config.in if BR2_PACKAGE_CUPS · line 16

Quoted 11 lines
package/cups/Config.in +1 -3
 	# needs fork()
 	depends on BR2_USE_MMU
 	help
@@ -13,11 +13,16 @@ if BR2_PACKAGE_CUPS
 
 config BR2_PACKAGE_CUPS_PDFTOPS
 	bool "pdftops support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	  Enable pdftops support
+	depends on BR2_DEPRECATED_SINCE_2015_05

It's not deprecated, it's actually removed: the option is no longer used. So you should instead remove this option, and add it to Config.in.legacy (in the root of the Buildroot source tree).

Is this pdftops support completely removed from CUPS, or simply made non-optional?

package/cups/Config.in if BR2_PACKAGE_CUPS · line 21

Quoted 7 lines
package/cups/Config.in +4 -2
-comment "pdftops support needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+config BR2_PACKAGE_CUPS_AVAHI
+	bool "avahi support"
+	depends on !BR2_STATIC_LIBS # avahi
+	depends on !BR2_TOOLCHAIN_HAS_THREADS # avahi

Wrong dependency, it should be: "depends on BR2_TOOLCHAIN_HAS_THREADS".

Also, you need to add a comment about this:

comment "cups avahi support needs a toolchain w/ threads, dynamic library"

	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

package/cups/Config.in if BR2_PACKAGE_CUPS · line 26

Quoted 5 lines
package/cups/Config.in +5 -0
+	select BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_AVAHI_DAEMON
+	help
+	  Enable Avahi support.
+	  Select this if you want cups to support Bonjour protocol.

However, do we really need a suboption for that? What about just enabling Avahi support in CUPS if Avahi is available?

package/cups/cups.hash line 2

Quoted 10 lines
package/cups/Config.in +0 -0
 endif
package/cups/cups.hash new file +2 -0
new file mode 100644
index 0000000..7c22b55
@@ -0,0 +1,2 @@
+# From https://www.cups.org/
+md5	c4e57a66298bfdba66bb3d5bedd317a4	cups-2.1.0-source.tar.bz2

In addition to the md5 provided by cups.org, please add another stronger hash, even if you have to calculate it locally. For example:

# Locally calculated
sha256 xxxxxxxx cups-2.1.0-source.tar.bz2

Quoted 21 lines
package/cups/cups.mk +5 -1
index c028ef4..7392372 100644
@@ -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,27 @@ 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

package/cups/cups.mk CUPS_LICENSE_FILES = LICENSE.txt · line 19

Quoted 10 lines
package/cups/cups.mk +5 -1
+	$(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 \

You could mention in the commit log that you are adding GNUTLS support.

package/cups/cups.mk CUPS_LICENSE_FILES = LICENSE.txt · line 28

Quoted 9 lines
package/cups/cups.mk +0 -5
 	--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)

Why? At least for zlib, I still see:

AC_CHECK_HEADER(zlib.h,

in config-scripts/cups-common.m4.

In general, the more you document such changes in the commit log, the less questions you will have during the review process.

Also, when building cups, I get quite a lot of non-fatal but not very pretty error messages. Lots of:

chgrp: changing group of '/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/etc/cups': Operation not permitted

And lots of:

strip: Unable to recognise the format of the input file `/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/#inst.20641#'
warning: Unable to strip /home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libcupscgi.so.1!

The latter can probably be fixed by changing the INSTALL_STRIP value (or overriding it at build/install time).

However, since those are non-fatal, I'm not sure how much we care about these problems.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v2 2/4 package/hplip: Un-deprecate and bump version to 3.15.7

In reply to Olivier Schonken
---
 package/hplip/Config.in  | 1 -
 package/hplip/hplip.hash | 2 +-
 package/hplip/hplip.mk   | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)
package/hplip/Config.in +0 -1
index a8a5f69..780c69e 100644
@@ -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
package/hplip/hplip.hash +1 -1
index fb7d4e7..98f4262 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d  hplip-3.13.10.tar.gz
+sha256  d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d	hplip-3.15.7.tar.gz
package/hplip/hplip.mk +3 -1
index 2cdddca..65f57e2 100644
@@ -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
@@ -29,6 +29,8 @@ HPLIP_CONF_OPTS = \
 	--with-sysroot=$(STAGING_DIR) \
 	--includedir=$(STAGING_DIR)/usr/include
 
+HPLIP_MAKE_OPTS += LDFLAGS+=-lpthread
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 HPLIP_CONF_OPTS += --enable-dbus-build
 HPLIP_DEPENDENCIES += dbus
Signature · 1 line
1.9.1
#4 lore raw

PATCH v2 2/4 package/hplip: Un-deprecate and bump version to 3.15.7

Dear Olivier Schonken,

Quoted 22 lines · Olivier Schonken
package/hplip/hplip.hash +1 -1
index fb7d4e7..98f4262 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d  hplip-3.13.10.tar.gz
+sha256  d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d	hplip-3.15.7.tar.gz
package/hplip/hplip.mk +1 -1
index 2cdddca..65f57e2 100644
@@ -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

package/hplip/hplip.mk HPLIP_CONF_OPTS = \ · line 30

Quoted 2 lines
package/hplip/hplip.mk +0 -0
@@ -29,6 +29,8 @@ HPLIP_CONF_OPTS = \
 	--with-sysroot=$(STAGING_DIR) \
 	--includedir=$(STAGING_DIR)/usr/include

I never saw this and 0001-fix-make.patch, but it's actually not the proper solution. --includedir should normally remain /usr/include. But oh well, it works this way, and it is not changed by your patch, so let's keep it as is for now.

package/hplip/hplip.mk HPLIP_CONF_OPTS = \ · line 32

Quoted 1 line
package/hplip/hplip.mk +1 -0
+HPLIP_MAKE_OPTS += LDFLAGS+=-lpthread

Why are you adding this? I did a build after removing this line, and it built fine for me (uClibc toolchain). Could you add a comment above the line to explain which cases it is fixing?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH v2 3/4 package/gutenprint: Un-deprecate and bump version to 5.2.10

In reply to Olivier Schonken
---
 package/gutenprint/Config.in       | 1 -
 package/gutenprint/gutenprint.hash | 2 +-
 package/gutenprint/gutenprint.mk   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
package/gutenprint/Config.in +0 -1
index 686dbce..2826594 100644
@@ -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
package/gutenprint/gutenprint.hash +1 -1
index 3cfe0e1..36c12cc 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0  gutenprint-5.2.9.tar.bz2
+sha256  431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59  gutenprint-5.2.10.tar.bz2
package/gutenprint/gutenprint.mk +1 -1
index 3ff05b6..0bdc3bc 100644
@@ -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+
Signature · 1 line
1.9.1
#6 lore raw

PATCH v2 4/4 package/cups-filters: Add new package cups-filters 1.0.74

In reply to Olivier Schonken

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

---
 package/Config.in                      |  1 +
 package/cups-filters/Config.in         | 47 ++++++++++++++++++++++++
 package/cups-filters/cups-filters.hash |  2 ++
 package/cups-filters/cups-filters.mk   | 65 ++++++++++++++++++++++++++++++++++
 package/poppler/poppler.mk             |  4 ++-
 5 files changed, 118 insertions(+), 1 deletion(-)
 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
package/Config.in +1 -0
index fc35f12..1697b64 100644
@@ -1217,6 +1217,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
package/cups-filters/Config.in new file +47 -0

47 lines not on this page · raw message

package/cups-filters/cups-filters.hash new file +2 -0
new file mode 100644
index 0000000..cb300d4
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256	c091938a7c25a600138c501075b222611ef333157e2554376bb60189032591c5  cups-filters-1.0.74.tar.gz
package/cups-filters/cups-filters.mk new file +65 -0

65 lines not on this page · raw message

package/poppler/poppler.mk +3 -1
index 6142cba..b457048 100644
@@ -11,7 +11,9 @@ 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
Signature · 1 line
1.9.1
#7 lore raw

PATCH v2 4/4 package/cups-filters: Add new package cups-filters 1.0.74

Olivier,

Quoted 2 lines · Olivier Schonken

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

The poppler.mk modification should be a separate patch, coming before cups-filters in the patch series.

Quoted 6 lines
package/cups-filters/Config.in new file +0 -0
new file mode 100644
index 0000000..cb70192

package/cups-filters/Config.in line 8

Quoted 8 lines
package/cups-filters/Config.in new file +8 -0
@@ -0,0 +1,47 @@
+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

You need to replicate here the dependencies of all those packages you are selected, and add the corresponding comment.

Quoted 14 lines
package/cups-filters/Config.in new file +14 -0
+	# needs fork()
+	depends on BR2_USE_MMU
+	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.

package/cups-filters/Config.in line 32

Quoted 10 lines
package/cups-filters/Config.in new file +10 -0
+
+	  http://hplipopensource.com/
+
+if BR2_PACKAGE_CUPS_FILTERS
+
+config BR2_PACKAGE_CUPS_FILTERS_PDFTOPS
+	bool "pdftops support"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Enable pdftops support

Ah, ok, I know understand that the pdftops support has been moved here. So indeed please remove the option entirely from cups/Config.in, move it to Config.in.legacy, and make that old option select this new one.

package/cups-filters/Config.in line 40

Quoted 8 lines
package/cups-filters/Config.in new file +8 -0
+
+comment "pdftops support needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_CUPS_FILTERS_AVAHI
+	bool "avahi support"
+	depends on !BR2_STATIC_LIBS # avahi
+	depends on !BR2_TOOLCHAIN_HAS_THREADS # avahi

Wrong, it should be:

depends on BR2_TOOLCHAIN_HAS_THREADS

however, it will not be necessary to have it here, since the main cups-filters option should depend on thread, since it selects glib2, which needs thread support.

Quoted 21 lines
package/cups-filters/Config.in new file +7 -0
+	select BR2_PACKAGE_AVAHI
+	select BR2_PACKAGE_AVAHI_DAEMON
+	help
+	  Enable Avahi support.
+	  Select this if you want cups to support Bonjour protocol.
+
+endif
package/cups-filters/cups-filters.hash new file +2 -0
new file mode 100644
index 0000000..cb300d4
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256	c091938a7c25a600138c501075b222611ef333157e2554376bb60189032591c5  cups-filters-1.0.74.tar.gz
package/cups-filters/cups-filters.mk new file +0 -0
new file mode 100644
index 0000000..aba3861

package/cups-filters/cups-filters.mk line 5

Quoted 5 lines
package/cups-filters/cups-filters.mk new file +5 -0
@@ -0,0 +1,65 @@
+#############################################################
+#
+# cups-filters
+#
+#############################################################

80 # signs needed, and one empty newline between this (silly) header and the first variable.

package/cups-filters/cups-filters.mk line 17

Quoted 12 lines
package/cups-filters/cups-filters.mk new file +12 -0
+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-avahi \
+                        --disable-imagefilters \
+                        --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
+                        --without-png \
+                        --with-sysroot=$(STAGING_DIR)

One tab only for the indentation (for all options)

package/cups-filters/cups-filters.mk line 20

Quoted 3 lines
package/cups-filters/cups-filters.mk new file +3 -0
+
+ifeq ($(BR2_PACKAGE_CUPS_FILTERS_PDFTOPS),y)
+	CUPS_FILTERS_CONF_OPTS += --with-pdftops=pdftops

Please don't indent such lines (valid for the entire file). Does this option BR2_PACKAGE_CUPS_FILTERS_PDFTOPS=y adds a lot of overhead? If not, we could simply enable it unconditionally.

package/cups-filters/cups-filters.mk line 28

Quoted 8 lines
package/cups-filters/cups-filters.mk new file +8 -0
+endif
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+	CUPS_FILTERS_CONF_OPTS += --disable-shared \
+				  --enable-static
+else
+	CUPS_FILTERS_CONF_OPTS += --enable-shared
+endif

Don't do this, it's done automatically by the package infrastructure, see http://git.buildroot.net/buildroot/tree/package/Makefile.in#n377
and
http://git.buildroot.net/buildroot/tree/package/pkg-autotools.mk#n179.

Quoted 4 lines
package/cups-filters/cups-filters.mk new file +4 -0
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+	CUPS_FILTERS_CONF_OPTS += --with-jpeg
+	CUPS_FILTERS_DEPENDENCIES += jpeg

package/cups-filters/cups-filters.mk line 42

Quoted 10 lines
package/cups-filters/cups-filters.mk new file +10 -0
+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

So the --without-png in the main CUPS_FILTERS_CONF_OPTS is unnecessary.

Quoted 11 lines
package/cups-filters/cups-filters.mk new file +11 -0
+
+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

package/cups-filters/cups-filters.mk line 63

Quoted 10 lines
package/cups-filters/cups-filters.mk new file +10 -0
+else
+	CUPS_FILTERS_CONF_OPTS += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_CUPS_FILTERS_AVAHI),y)
+	CUPS_FILTERS_DEPENDENCIES += avahi
+	CUPS_FILTERS_CONF_OPTS += --enable-avahi
+else
+	CUPS_FILTERS_CONF_OPTS += --disable-avahi
+endif

Just like the comment I made on the cups package: why not enable the Avahi support automatically when BR2_PACKAGE_AVAHI=y ? You're doing this for jpeg, png, tiff, dbus... but not for Avahi. Is there a motivation behind this difference?

package/poppler/poppler.mk POPPLER_DEPENDENCIES = fontconfig host-pkgconf · line 15

Quoted 13 lines
package/cups-filters/cups-filters.mk new file +2 -0
+
+$(eval $(autotools-package))
package/poppler/poppler.mk +2 -1
index 6142cba..b457048 100644
@@ -11,7 +11,9 @@ 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

As said above: please move this to a separate patch.

package/poppler/poppler.mk POPPLER_DEPENDENCIES = fontconfig host-pkgconf · line 16

Quoted 1 line
package/poppler/poppler.mk +1 -0
+

And don't add a useless empty line here.

package/poppler/poppler.mk POPPLER_DEPENDENCIES = fontconfig host-pkgconf · line 19

Quoted 3 lines
package/poppler/poppler.mk +0 -0
 ifeq ($(BR2_PACKAGE_LCMS2),y)
 POPPLER_CONF_OPTS += --enable-cms=lcms2

Can you respin a new iteration that takes into account those comments? The vast majority of the comments are really trivial things, so it should be possible to address them quickly in order to finally get those patches merged.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com