packages: sane-backends/sane-backends.spec, sane-backends/sane-backends-1.0...

[arekm]

Author: arekm                        Date: Fri Jan 13 19:00:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; fix build with new v4l

---- Files affected:
packages/sane-backends:
   sane-backends.spec (1.139 -> 1.140) , sane-backends-1.0.22-v4l.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/sane-backends/sane-backends.spec
diff -u packages/sane-backends/sane-backends.spec:1.139 packages/sane-backends/sane-backends.spec:1.140
--- packages/sane-backends/sane-backends.spec:1.139	Fri Jan 13 17:35:20 2012
+++ packages/sane-backends/sane-backends.spec	Fri Jan 13 20:00:10 2012
@@ -11,7 +11,7 @@
 Summary(pt_BR.UTF-8):	SANE - acesso a scanners locais e em rede
 Name:		sane-backends
 Version:	1.0.22
-Release:	6
+Release:	7
 License:	relaxed GPL v2+ (libraries), Public Domain (docs)
 Group:		Libraries
 Source0:	ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/sane-backends-%{version}.tar.gz
@@ -23,6 +23,7 @@
 Patch2:		%{name}-spatc.patch
 Patch4:		%{name}-link.patch
 Patch5:		http://patch-tracker.debian.org/patch/series/dl/sane-backends/1.0.22-6/xerox_mfp_fix_usb_devices.patch
+Patch6:		sane-backends-1.0.22-v4l.patch
 URL:		http://www.sane-project.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
@@ -250,6 +251,7 @@
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -629,6 +631,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2012/01/13 19:00:10  arekm
+- rel 7; fix build with new v4l
+
 Revision 1.139  2012/01/13 16:35:20  arekm
 - release 6
 

================================================================
Index: packages/sane-backends/sane-backends-1.0.22-v4l.patch
diff -u /dev/null packages/sane-backends/sane-backends-1.0.22-v4l.patch:1.1
--- /dev/null	Fri Jan 13 20:00:15 2012
+++ packages/sane-backends/sane-backends-1.0.22-v4l.patch	Fri Jan 13 20:00:10 2012
@@ -0,0 +1,64 @@
+From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Mon, 14 Mar 2011 13:35:05 +0100
+Subject: [PATCH] patch: v4l
+
+Squashed commit of the following:
+
+commit 23381932c76846191b42a48e505b37cd74711265
+Author: Julien BLACHE <jb at jblache.org>
+Date:   Wed Feb 16 19:37:43 2011 +0100
+
+    Fix v4l build with libv4l 0.8.3+
+
+    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
+
+    Conflicts:
+
+    	ChangeLog
+
+    Signed-off-by: Nils Philippsen <nils at redhat.com>
+---
+ backend/v4l.c |    3 +--
+ backend/v4l.h |    3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
++++ b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #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;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586 100644
+--- a/backend/v4l.h
++++ b/backend/v4l.h
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+ 
++#ifndef __LINUX_VIDEODEV_H
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+ 
+@@ -165,7 +166,7 @@ struct video_channel
+ 
+ 
+ /* end of kernel interface */
+-
++#endif /* !__LINUX_VIDEODEV_H */
+ 
+ #include <../include/sane/sane.h>
+ 
+-- 
+1.7.4
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sane-backends/sane-backends.spec?r1=1.139&r2=1.140&f=u