gutenprint: fix host build

PATCH New Waldemar Brodkorb 3 participants 3 messages Apr 17, 2016

Share & tools

Waldemar Brodkorb

author

2016-04-17 09:52 UTC #0 lore raw

PATCH v3 1/1 gutenprint: fix host build

Disable USB support when CUPS disabled, otherwise host build breaks. Fixes following autobuild error:
http://autobuild.buildroot.net/results/081b3be918ac1eaa8cfbc5919e00bc1ea267c1df/

Signed-off-by Waldemar Brodkorb <[email protected]>

---
v2 -> v3:
* add patch from upstream
v1 -> v2:
* extended comment why we need autoreconf suggested by Baruch
* patch suggested upstream as requested by Baruch

---
 .../0004-build-usb-backends-conditional.patch      | 29 ++++++++++++++++++++++
 package/gutenprint/gutenprint.mk                   |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 package/gutenprint/0004-build-usb-backends-conditional.patch

package/gutenprint/0004-build-usb-backends-conditional.patch new file +29 -0

new file mode 100644
index 0000000..7c744be
@@ -0,0 +1,29 @@
+Backport from Upstream:
+https://sourceforge.net/p/gimp-print/source/ci/fc1713589fed645f2c8002c3f66dfb69af314716/
+
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+
+diff -Nur gutenprint-5.2.11.orig/configure.ac gutenprint-5.2.11/configure.ac
+--- gutenprint-5.2.11.orig/configure.ac	2016-01-14 04:02:49.000000000 +0100
++++ gutenprint-5.2.11/configure.ac	2016-04-16 17:16:17.017485358 +0200
+@@ -442,12 +442,14 @@
+ dnl   [EXTRA_LIBREADLINE_DEPS]=""
+ dnl fi
+ 
+-# libusb-1.0 (For CUPS backends)
+-PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
+-                  [HAVE_LIBUSB=yes
+-                   BUILD_LIBUSB_BACKENDS=yes],
+-                  [HAVE_LIBUSB=no
+-	           BUILD_LIBUSB_BACKENDS=no])
++# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled)
++if test "x$BUILD_CUPS" = "xyes" ; then
++ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
++                   [HAVE_LIBUSB=yes
++                    BUILD_LIBUSB_BACKENDS=yes],
++                   [HAVE_LIBUSB=no
++	            BUILD_LIBUSB_BACKENDS=no])
++fi
+ 
+ AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool])
+ if test -z "${GIMPTOOL2_CHECK}" ; then

package/gutenprint/gutenprint.mk +2 -1

index 7e3024d..8cf4caf 100644
@@ -11,7 +11,7 @@ GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
 GUTENPRINT_LICENSE = GPLv2+
 GUTENPRINT_LICENSE_FILES = COPYING
 
-# Needed, as we touch Makefile.am
+# Needed, as we touch Makefile.am and configure.ac
 GUTENPRINT_AUTORECONF = YES
 
 GUTENPRINT_DEPENDENCIES = \

@@ -67,6 +67,7 @@ HOST_GUTENPRINT_CONF_OPTS = \
 	--disable-escputil \
 	--disable-test \
 	--disable-testpattern \
+	--without-libusb \
 	--without-cups
 
 # Needed by autoreconf

Signature · 1 line

2.1.4

Arnout Vandecappelle

2016-04-17 14:09 UTC #1 lore raw

PATCH v3 1/1 gutenprint: fix host build

Hi Waldemar,

Quoted 23 lines · Waldemar Brodkorb

Disable USB support when CUPS disabled, otherwise host build breaks. Fixes following autobuild error:
http://autobuild.buildroot.net/results/081b3be918ac1eaa8cfbc5919e00bc1ea267c1df/
Signed-off-by Waldemar Brodkorb <[email protected]>
---
v2 -> v3:
* add patch from upstream
v1 -> v2:
* extended comment why we need autoreconf suggested by Baruch
* patch suggested upstream as requested by Baruch
---
  .../0004-build-usb-backends-conditional.patch      | 29 ++++++++++++++++++++++
  package/gutenprint/gutenprint.mk                   |  3 ++-
  2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 package/gutenprint/0004-build-usb-backends-conditional.patch
package/gutenprint/0004-build-usb-backends-conditional.patch new file +0 -0
new file mode 100644
index 0000000..7c744be

package/gutenprint/0004-build-usb-backends-conditional.patch line 2

Quoted 2 lines

package/gutenprint/0004-build-usb-backends-conditional.patch new file +2 -0
@@ -0,0 +1,29 @@
+Backport from Upstream:
+https://sourceforge.net/p/gimp-print/source/ci/fc1713589fed645f2c8002c3f66dfb69af314716/

If a patch is backported from upstream, it still needs a proper commit message
with description. You can reuse the upstream commit message:

build: Don't allow USB backends to be built if CUPS is not enabled.

Actually, it would be even better if you could just cherry-pick it in a git
checkout of 5.2.11, add the upstream reference and your Sob, and use git format-patch to generate the patch. Particularly because patches 2 and 3 are already git formatted.

Regards,
Arnout

Quoted 49 lines

package/gutenprint/0004-build-usb-backends-conditional.patch new file +27 -0

+
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+
+diff -Nur gutenprint-5.2.11.orig/configure.ac gutenprint-5.2.11/configure.ac
+--- gutenprint-5.2.11.orig/configure.ac	2016-01-14 04:02:49.000000000 +0100
++++ gutenprint-5.2.11/configure.ac	2016-04-16 17:16:17.017485358 +0200
+@@ -442,12 +442,14 @@
+ dnl   [EXTRA_LIBREADLINE_DEPS]=""
+ dnl fi
+
+-# libusb-1.0 (For CUPS backends)
+-PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
+-                  [HAVE_LIBUSB=yes
+-                   BUILD_LIBUSB_BACKENDS=yes],
+-                  [HAVE_LIBUSB=no
+-	           BUILD_LIBUSB_BACKENDS=no])
++# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled)
++if test "x$BUILD_CUPS" = "xyes" ; then
++ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
++                   [HAVE_LIBUSB=yes
++                    BUILD_LIBUSB_BACKENDS=yes],
++                   [HAVE_LIBUSB=no
++	            BUILD_LIBUSB_BACKENDS=no])
++fi
+
+ AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool])
+ if test -z "${GIMPTOOL2_CHECK}" ; then

package/gutenprint/gutenprint.mk +2 -1

index 7e3024d..8cf4caf 100644
@@ -11,7 +11,7 @@ GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
  GUTENPRINT_LICENSE = GPLv2+
  GUTENPRINT_LICENSE_FILES = COPYING
 
-# Needed, as we touch Makefile.am
+# Needed, as we touch Makefile.am and configure.ac
  GUTENPRINT_AUTORECONF = YES
 
  GUTENPRINT_DEPENDENCIES = \

@@ -67,6 +67,7 @@ HOST_GUTENPRINT_CONF_OPTS = \
  	--disable-escputil \
  	--disable-test \
  	--disable-testpattern \
+	--without-libusb \
  	--without-cups
 
  # Needed by autoreconf

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Thomas Petazzoni

2016-04-17 14:44 UTC #2 lore raw

PATCH v3 1/1 gutenprint: fix host build

In reply to Waldemar Brodkorb

Hello,

package/gutenprint/0004-build-usb-backends-conditional.patch line 4

Quoted 10 lines · Waldemar Brodkorb

package/gutenprint/0004-build-usb-backends-conditional.patch new file +4 -0

new file mode 100644
index 0000000..7c744be
@@ -0,0 +1,29 @@
+Backport from Upstream:
+https://sourceforge.net/p/gimp-print/source/ci/fc1713589fed645f2c8002c3f66dfb69af314716/
+
+Signed-off-by: Waldemar Brodkorb <[email protected]>

As suggested by Arnout, I've changed this to use a Git formatted patch cherry-picked from the upstream Git repository.

package/gutenprint/0004-build-usb-backends-conditional.patch HOST_GUTENPRINT_CONF_OPTS = \ · line 70

Quoted 6 lines

package/gutenprint/0004-build-usb-backends-conditional.patch new file +1 -0

 GUTENPRINT_DEPENDENCIES = \

@@ -67,6 +67,7 @@ HOST_GUTENPRINT_CONF_OPTS = \
 	--disable-escputil \
 	--disable-test \
 	--disable-testpattern \
+	--without-libusb \

This was not needed, so I removed it. It was needed in previous iterations of your patch, but not with the latest version of the backported patch.

Thanks!

Thomas

Signature · 3 lines

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