[packages] sane-backends: fix v4l bustage
authorStephen Walker <stephendwalker@gmail.com>
Thu, 1 Mar 2012 04:01:14 +0000 (04:01 +0000)
committerStephen Walker <stephendwalker@gmail.com>
Thu, 1 Mar 2012 04:01:14 +0000 (04:01 +0000)
SVN-Revision: 30756

utils/sane-backends/patches/000-upstream-libv4l.patch [new file with mode: 0644]

diff --git a/utils/sane-backends/patches/000-upstream-libv4l.patch b/utils/sane-backends/patches/000-upstream-libv4l.patch
new file mode 100644 (file)
index 0000000..4bf2b4d
--- /dev/null
@@ -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>