From: swalker <swalker@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 1 Mar 2012 04:01:14 +0000 (+0000)
Subject: [packages] sane-backends: fix v4l bustage
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=5ea5f1d7560aea1d5010bcde6b33aae286a913f1;p=packages.git

[packages] sane-backends: fix v4l bustage


git-svn-id: svn://svn.openwrt.org/openwrt/packages@30756 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/sane-backends/patches/000-upstream-libv4l.patch b/utils/sane-backends/patches/000-upstream-libv4l.patch
new file mode 100644
index 000000000..4bf2b4d0c
--- /dev/null
+++ b/utils/sane-backends/patches/000-upstream-libv4l.patch
@@ -0,0 +1,32 @@
+--- 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;
+--- 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>
+