Annotation of /trunk/sane-backends/patches/sane-backends-1.0.22-libv4l084.patch
Parent Directory | Revision Log
Revision 1420 -
(hide annotations)
(download)
Fri Jul 15 11:51:22 2011 UTC (13 years, 2 months ago) by niro
File size: 1440 byte(s)
Fri Jul 15 11:51:22 2011 UTC (13 years, 2 months ago) by niro
File size: 1440 byte(s)
added patches for 1.0.22
1 | niro | 1420 | From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 |
2 | From: Nils Philippsen <nils@redhat.com> | ||
3 | Date: Mon, 14 Mar 2011 13:35:05 +0100 | ||
4 | Subject: [PATCH] patch: v4l | ||
5 | |||
6 | Squashed commit of the following: | ||
7 | |||
8 | commit 23381932c76846191b42a48e505b37cd74711265 | ||
9 | Author: Julien BLACHE <jb@jblache.org> | ||
10 | Date: Wed Feb 16 19:37:43 2011 +0100 | ||
11 | |||
12 | Fix v4l build with libv4l 0.8.3+ | ||
13 | |||
14 | (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) | ||
15 | |||
16 | Conflicts: | ||
17 | |||
18 | ChangeLog | ||
19 | |||
20 | Signed-off-by: Nils Philippsen <nils@redhat.com> | ||
21 | --- | ||
22 | backend/v4l.c | 3 +-- | ||
23 | backend/v4l.h | 3 ++- | ||
24 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
25 | |||
26 | diff --git a/backend/v4l.c b/backend/v4l.c | ||
27 | index 6510ef0..38595ed 100644 | ||
28 | --- a/backend/v4l.c | ||
29 | +++ b/backend/v4l.c | ||
30 | @@ -84,9 +84,8 @@ | ||
31 | #include "../include/sane/sanei_config.h" | ||
32 | #define V4L_CONFIG_FILE "v4l.conf" | ||
33 | |||
34 | -#include "v4l.h" | ||
35 | - | ||
36 | #include <libv4l1.h> | ||
37 | +#include "v4l.h" | ||
38 | |||
39 | static const SANE_Device **devlist = NULL; | ||
40 | static int num_devices; | ||
41 | diff --git a/backend/v4l.h b/backend/v4l.h | ||
42 | index 588b96e..6aee586 100644 | ||
43 | --- a/backend/v4l.h | ||
44 | +++ b/backend/v4l.h | ||
45 | @@ -29,6 +29,7 @@ | ||
46 | #ifndef v4l_h | ||
47 | #define v4l_h | ||
48 | |||
49 | +#ifndef __LINUX_VIDEODEV_H | ||
50 | /* Kernel interface */ | ||
51 | /* Only the stuff we need. For more features, more defines are needed */ | ||
52 | |||
53 | @@ -165,7 +166,7 @@ struct video_channel | ||
54 | |||
55 | |||
56 | /* end of kernel interface */ | ||
57 | - | ||
58 | +#endif /* !__LINUX_VIDEODEV_H */ | ||
59 | |||
60 | #include <../include/sane/sane.h> | ||
61 | |||
62 | -- | ||
63 | 1.7.4 | ||
64 |