Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] sane-backends: make libusb optional, add optional jpeg, tiff, avahi and snmp deps
@ 2012-01-16  9:30 Peter Korsgaard
  2012-01-17  7:18 ` [Buildroot] [PATCH] sane-backends: mention in help message which libraries may be selected Arnout Vandecappelle
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2012-01-16  9:30 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=8c7c0ab34469ac7bfe1f5ccb9fc3c74c9ef0b4c7
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sane-backends/Config.in        |    1 -
 package/sane-backends/sane-backends.mk |   23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
index fb73435..03865d1 100644
--- a/package/sane-backends/Config.in
+++ b/package/sane-backends/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SANE_BACKENDS
 	bool "sane-backends"
-	select BR2_PACKAGE_LIBUSB
 	help
 	  SANE - Scanner Access Now Easy
 
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 1188d18..d9f3690 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -7,7 +7,30 @@ SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
 SANE_BACKENDS_SITE = ftp://ftp2.sane-project.org/pub/sane/sane-backends-$(SANE_BACKENDS_VERSION)
 
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
 SANE_BACKENDS_CONF_OPT += --enable-libusb_1_0
+else
+SANE_BACKENDS_CONF_OPT += --disable-libusb
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+SANE_BACKENDS_DEPENDENCIES += jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+SANE_BACKENDS_DEPENDENCIES += tiff
+endif
+
+ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy)
+SANE_BACKENDS_DEPENDENCIES += avahi
+SANE_BACKENDS_CONF_OPT += --enable-avahi
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+SANE_BACKENDS_DEPENDENCIES += netsnmp
+else
+SANE_BACKENDS_CONF_OPT += --without-snmp
+endif
 
 $(eval $(call AUTOTARGETS))

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] sane-backends: mention in help message which libraries may be selected
  2012-01-16  9:30 [Buildroot] [git commit] sane-backends: make libusb optional, add optional jpeg, tiff, avahi and snmp deps Peter Korsgaard
@ 2012-01-17  7:18 ` Arnout Vandecappelle
  2012-01-17 14:14   ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: Arnout Vandecappelle @ 2012-01-17  7:18 UTC (permalink / raw)
  To: buildroot

From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/sane-backends/Config.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
index fb73435..35f3cf6 100644
--- a/package/sane-backends/Config.in
+++ b/package/sane-backends/Config.in
@@ -5,3 +5,7 @@ config BR2_PACKAGE_SANE_BACKENDS
 	  SANE - Scanner Access Now Easy
 
 	  http://www.sane-project.org
+
+	  Backends are included automatically based on the libraries that have
+	  been selected: libusb, jpeg, tiff, avahi (with dbus and libglib2),
+	  and netsnmp.
-- 
1.7.8.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] sane-backends: mention in help message which libraries may be selected
  2012-01-17  7:18 ` [Buildroot] [PATCH] sane-backends: mention in help message which libraries may be selected Arnout Vandecappelle
@ 2012-01-17 14:14   ` Peter Korsgaard
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2012-01-17 14:14 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:

 Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-01-17 14:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-16  9:30 [Buildroot] [git commit] sane-backends: make libusb optional, add optional jpeg, tiff, avahi and snmp deps Peter Korsgaard
2012-01-17  7:18 ` [Buildroot] [PATCH] sane-backends: mention in help message which libraries may be selected Arnout Vandecappelle
2012-01-17 14:14   ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox