wok annotate sane-backends/stuff/libv4l-0.8.3.patch @ rev 15855
New kernel config and huge receipt clean up
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed Jan 29 09:56:07 2014 +0100 (2014-01-29) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@12330 | 1 From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 |
| slaxemulator@12330 | 2 From: Nils Philippsen <nils@redhat.com> |
| slaxemulator@12330 | 3 Date: Mon, 14 Mar 2011 13:35:05 +0100 |
| slaxemulator@12330 | 4 Subject: [PATCH] patch: v4l |
| slaxemulator@12330 | 5 |
| slaxemulator@12330 | 6 Squashed commit of the following: |
| slaxemulator@12330 | 7 |
| slaxemulator@12330 | 8 commit 23381932c76846191b42a48e505b37cd74711265 |
| slaxemulator@12330 | 9 Author: Julien BLACHE <jb@jblache.org> |
| slaxemulator@12330 | 10 Date: Wed Feb 16 19:37:43 2011 +0100 |
| slaxemulator@12330 | 11 |
| slaxemulator@12330 | 12 Fix v4l build with libv4l 0.8.3+ |
| slaxemulator@12330 | 13 |
| slaxemulator@12330 | 14 (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) |
| slaxemulator@12330 | 15 |
| slaxemulator@12330 | 16 Conflicts: |
| slaxemulator@12330 | 17 |
| slaxemulator@12330 | 18 ChangeLog |
| slaxemulator@12330 | 19 |
| slaxemulator@12330 | 20 Signed-off-by: Nils Philippsen <nils@redhat.com> |
| slaxemulator@12330 | 21 --- |
| slaxemulator@12330 | 22 backend/v4l.c | 3 +-- |
| slaxemulator@12330 | 23 backend/v4l.h | 3 ++- |
| slaxemulator@12330 | 24 2 files changed, 3 insertions(+), 3 deletions(-) |
| slaxemulator@12330 | 25 |
| slaxemulator@12330 | 26 diff --git a/backend/v4l.c b/backend/v4l.c |
| slaxemulator@12330 | 27 index 6510ef0..38595ed 100644 |
| slaxemulator@12330 | 28 --- a/backend/v4l.c |
| slaxemulator@12330 | 29 +++ b/backend/v4l.c |
| slaxemulator@12330 | 30 @@ -84,9 +84,8 @@ |
| slaxemulator@12330 | 31 #include "../include/sane/sanei_config.h" |
| slaxemulator@12330 | 32 #define V4L_CONFIG_FILE "v4l.conf" |
| slaxemulator@12330 | 33 |
| slaxemulator@12330 | 34 -#include "v4l.h" |
| slaxemulator@12330 | 35 - |
| slaxemulator@12330 | 36 #include <libv4l1.h> |
| slaxemulator@12330 | 37 +#include "v4l.h" |
| slaxemulator@12330 | 38 |
| slaxemulator@12330 | 39 static const SANE_Device **devlist = NULL; |
| slaxemulator@12330 | 40 static int num_devices; |
| slaxemulator@12330 | 41 diff --git a/backend/v4l.h b/backend/v4l.h |
| slaxemulator@12330 | 42 index 588b96e..6aee586 100644 |
| slaxemulator@12330 | 43 --- a/backend/v4l.h |
| slaxemulator@12330 | 44 +++ b/backend/v4l.h |
| slaxemulator@12330 | 45 @@ -29,6 +29,7 @@ |
| slaxemulator@12330 | 46 #ifndef v4l_h |
| slaxemulator@12330 | 47 #define v4l_h |
| slaxemulator@12330 | 48 |
| slaxemulator@12330 | 49 +#ifndef __LINUX_VIDEODEV_H |
| slaxemulator@12330 | 50 /* Kernel interface */ |
| slaxemulator@12330 | 51 /* Only the stuff we need. For more features, more defines are needed */ |
| slaxemulator@12330 | 52 |
| slaxemulator@12330 | 53 @@ -165,7 +166,7 @@ struct video_channel |
| slaxemulator@12330 | 54 |
| slaxemulator@12330 | 55 |
| slaxemulator@12330 | 56 /* end of kernel interface */ |
| slaxemulator@12330 | 57 - |
| slaxemulator@12330 | 58 +#endif /* !__LINUX_VIDEODEV_H */ |
| slaxemulator@12330 | 59 |
| slaxemulator@12330 | 60 #include <../include/sane/sane.h> |
| slaxemulator@12330 | 61 |
| slaxemulator@12330 | 62 -- |
| slaxemulator@12330 | 63 1.7.4 |
| slaxemulator@12330 | 64 |