[gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends/files: sane-backends-1.0.23-automagic-v4l.patch sane-backends-1.0.23-automagic-cups.patch

[Christopher Brannon (teiresias)]

teiresias    13/08/27 12:03:21

  Added:                sane-backends-1.0.23-automagic-v4l.patch
                        sane-backends-1.0.23-automagic-cups.patch
  Log:
  Switch to virtual/libusb:1.  Also remove automagic dependencies.
  
  The switch from virtual/libusb:0 to virtual/libusb:1 closes
  bug #480184.  SANE segfaults with my scanner when libusb 0.x is used,
  but it is fine with libusb 1.x.  Others noticed similar issues.
  
  There was an automagic dependency on v4l.  See bug #479772 for the details.
  The patch is in upstream's bugtracker.
  There was also an automagic dependency on CUPS.
  However, several months after releasing 1.0.23, upstream changed their code
  so that it no longer uses CUPS.
  The patch for the CUPS automagic dependency should go away in 1.0.24.
  
  (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)

Revision  Changes    Path
1.1                  media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch?rev=1.1&content-type=text/plain

Index: sane-backends-1.0.23-automagic-v4l.patch
===================================================================
diff --git a/configure.in b/configure.in
index b62d4d3..76e37b2 100644
--- a/configure.in
+++ b/configure.in
@@ -129,7 +129,16 @@ SANE_CHECK_LOCKING
 SANE_CHECK_GPHOTO2
 
 
-PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no)
+AC_ARG_WITH(v4l,
+	    AC_HELP_STRING([--with-v4l],
+			   [include the v4l backend @<:@default=yes@:>@]),
+	    [# If --with-v4l=no or --without-v4l, disable backend
+             # as "$with_v4l" will be set to "no"])
+
+if test "$with_v4l" != "no" ; then
+  PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no)
+fi
+
 AC_SUBST(LIBV4L_LIBS)
 AC_SUBST(LIBV4L_CFLAGS)
 



1.1                  media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch?rev=1.1&content-type=text/plain

Index: sane-backends-1.0.23-automagic-cups.patch
===================================================================
diff -Naur sane-backends-1.0.23/configure.in sane-backends-1.0.23.new/configure.in
--- sane-backends-1.0.23/configure.in	2012-08-19 13:31:34.000000000 -0700
+++ sane-backends-1.0.23.new/configure.in	2013-08-26 14:41:22.613012270 -0700
@@ -326,16 +326,24 @@
     AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
 fi
 
-nl added by PN 3/2/12 to detect cups
-$as_echo "checking for cups"
-if test -e /usr/include/cups/cups.h ; then
-    AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
+AC_ARG_ENABLE(cups,
+	AC_HELP_STRING([--enable-cups], [enable CUPS support]),
+	[enable_cups=$enableval], [enable_cups=no])
+
+if test "$enable_cups" != no; then
+    dnl added by PN 3/2/12 to detect cups
+    $as_echo "checking for cups"
+    if test -e /usr/include/cups/cups.h ; then
+	AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
 	with_cups="yes"
 	LIBS="-lcups  $LIBS"
-else
+    else
 	$as_echo "cups.h not found, you may want to install a cups development package"
 	$as_echo "in order to autodetect network scanners in kodakaio."
 	with_cups="no"
+    fi
+else
+    with_cups=no
 fi
 
 dnl ***********