updated for newer libv4l

Conflicts:

	sane-backends.spec

sane-backends-1.0.21-v4l.patch

@@ -0,0 +1,35 @@
+diff -up sane-backends-1.0.21/backend/v4l.c.orig sane-backends-1.0.21/backend/v4l.c
+--- sane-backends-1.0.21/backend/v4l.c.orig	2011-03-09 14:20:57.000000000 +0100
++++ sane-backends-1.0.21/backend/v4l.c	2011-03-09 14:21:05.000000000 +0100
+@@ -84,10 +84,10 @@
+ #include "../include/sane/sanei_config.h"
+ #define V4L_CONFIG_FILE "v4l.conf"
+ 
+-#include "v4l.h"
+-
+ #include <libv4l1.h>
+ 
++#include "v4l.h"
++
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+ static V4L_Device *first_dev;
+diff -up sane-backends-1.0.21/backend/v4l.h.orig sane-backends-1.0.21/backend/v4l.h
+--- sane-backends-1.0.21/backend/v4l.h.orig	2011-03-09 14:11:26.000000000 +0100
++++ sane-backends-1.0.21/backend/v4l.h	2011-03-09 14:11:39.000000000 +0100
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+ 
++#if 0
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+ 
+@@ -165,6 +166,7 @@ struct video_channel
+ 
+ 
+ /* end of kernel interface */
++#endif
+ 
+ 
+ #include <../include/sane/sane.h>

sane-backends.spec

@@ -1,7 +1,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.21
-Release: 7%{?dist}
+Release: 8%{?dist}
 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
 # Tools are GPLv2+, docs are public domain
 # see LICENSE for details
@@ -21,6 +21,8 @@ Patch7: sane-backends-1.0.21-docs-utf8.patch
 Patch8: sane-backends-1.0.21-xerox-mfp-color-mode.patch
 Patch9: sane-backends-1.0.21-SCX4500W.patch
 Patch10: sane-backends-1.0.21-epson2-fixes.patch
+# update for new libv4l
+Patch11: sane-backends-1.0.21-v4l.patch
 # may need rebuilding if one of the above changes:
 Patch100: sane-backends-1.0.21-automake.patch
 URL: http://www.sane-project.org
@@ -94,6 +96,7 @@ want to access digital cameras.
 %patch8 -p1 -b .xerox-mfp-color-mode
 %patch9 -p1 -b .SCX4500W
 %patch10 -p1 -b .epson2-fixes
+%patch11 -p1 -b .v4l
 
 %patch100 -p1 -b .automake
 
@@ -171,6 +174,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Mar 09 2011 Dan Horák <dan[at]danny.cz> - 1.0.21-8
+- updated for newer libv4l
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.21-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild