[Buildroot] [PATCH v2] gutenprint: fix host build

[Buildroot] [PATCH v2] gutenprint: fix host build

[Waldemar Brodkorb]

Allow to disable USB support, otherwise host build breaks.
Fixes following autobuild error:
http://autobuild.buildroot.net/results/081b3be918ac1eaa8cfbc5919e00bc1ea267c1df/

Patch suggested upstream:
https://sourceforge.net/p/gimp-print/patches/19/

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
v1 -> v2:
  * extended comment why we need autoreconf suggested by Baruch
  * patch suggested upstream as requested by Baruch
---
 .../0004-build-usb-backends-conditional.patch      | 23 ++++++++++++++++++++++
 package/gutenprint/gutenprint.mk                   |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 package/gutenprint/0004-build-usb-backends-conditional.patch

diff --git a/package/gutenprint/0004-build-usb-backends-conditional.patch b/package/gutenprint/0004-build-usb-backends-conditional.patch
new file mode 100644
index 0000000..db44a12
--- /dev/null
+++ b/package/gutenprint/0004-build-usb-backends-conditional.patch
@@ -0,0 +1,23 @@
+Allow to disable USB backend
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+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-02 20:07:54.649589473 +0200
+@@ -442,12 +442,15 @@
+ dnl   [EXTRA_LIBREADLINE_DEPS]=""
+ dnl fi
+ 
++AC_ARG_WITH([libusb], AS_HELP_STRING([--with-libusb], [Build with USB backend support]))
+ # libusb-1.0 (For CUPS backends)
++AS_IF([test "x$with_libusb" = "xyes"], [
+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
+                   [HAVE_LIBUSB=yes
+                    BUILD_LIBUSB_BACKENDS=yes],
+                   [HAVE_LIBUSB=no
+ 	           BUILD_LIBUSB_BACKENDS=no])
++])
+ 
+ AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool])
+ if test -z "${GIMPTOOL2_CHECK}" ; then
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 7e3024d..8cf4caf 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -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
-- 
2.1.4

[Buildroot] [PATCH v2] gutenprint: fix host build

[Thomas Petazzoni]

Hello,

On Fri, 15 Apr 2016 20:02:12 +0200, Waldemar Brodkorb wrote:

> ++AC_ARG_WITH([libusb], AS_HELP_STRING([--with-libusb], [Build with USB backend support]))

I think you should add the last AC_ARG_WITH() argument that makes sure
that the default value remains "yes". Something like:

AC_ARG_WITH([libusb],
	AS_HELP_STRING([--with-libusb], [Build with USB backend support]),
	[],
	[with_libusb=yes])

(or something like that)

Otherwise, if --with-libusb is not passed explicitly, USB support will
not be enabled, which is a change in behavior compared to the current
situation.

Thanks!

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