utils/sane-backends/patches/000-upstream-libv4l.patch

   1 --- a/backend/v4l.c
   2 +++ b/backend/v4l.c
   3 @@ -84,9 +84,8 @@
   4  #include "../include/sane/sanei_config.h"
   5  #define V4L_CONFIG_FILE "v4l.conf"
   6
   7 -#include "v4l.h"
   8 -
   9  #include <libv4l1.h>
  10 +#include "v4l.h"
  11
  12  static const SANE_Device **devlist = NULL;
  13  static int num_devices;
  14 --- a/backend/v4l.h
  15 +++ b/backend/v4l.h
  16 @@ -29,6 +29,7 @@
  17  #ifndef v4l_h
  18  #define v4l_h
  19
  20 +#ifndef __LINUX_VIDEODEV_H
  21  /* Kernel interface */
  22  /* Only the stuff we need. For more features, more defines are needed */
  23
  24 @@ -165,7 +166,7 @@ struct video_channel
  25
  26
  27  /* end of kernel interface */
  28 -
  29 +#endif /* !__LINUX_VIDEODEV_H */
  30
  31  #include <../include/sane/sane.h>
  32