panda3d/v4l.patch

   1 --- /home/bas/webcamVideoV4L.cxx        2011-05-22 16:13:34.785441458 +0200
   2 +++ src/panda3d-1.7.2/panda/src/vision/webcamVideoV4L.cxx       2011-05-24 16:10:09.883188149 +0200
   3 @@ -21,7 +21,6 @@
   4
   5  #include <fcntl.h>
   6  #include <sys/ioctl.h>
   7 -#include <linux/videodev.h>
   8  #include <linux/videodev2.h>
   9
  10  TypeHandle WebcamVideoV4L::_type_handle;
  11 @@ -33,7 +32,6 @@
  12  //               the global list _all_webcams.
  13  ////////////////////////////////////////////////////////////////////
  14  void find_all_webcams_v4l() {
  15 -  struct video_capability cap;
  16    struct v4l2_capability cap2;
  17
  18    vector_string devs;
  19 @@ -113,14 +111,6 @@
  20            continue;
  21          }
  22        }
  23 -
  24 -      // Check for Video4Linux capabilities
  25 -      if (ioctl(fd, VIDIOCGCAP, &cap) != -1) {
  26 -        if (cap.type & VID_TYPE_CAPTURE) {
  27 -          //TODO: Video4Linux support
  28 -          continue;
  29 -        }
  30 -      }
  31      }
  32      close(fd);
  33    }
  34
  35 --- /home/bas/webcamVideoCursorV4L.cxx  2011-05-22 16:13:39.522115838 +0200
  36 +++ webcamVideoCursorV4L.cxx    2011-05-22 16:14:13.848838406 +0200
  37 @@ -19,7 +19,6 @@
  38  #include <fcntl.h>
  39  #include <sys/mman.h>
  40  #include <sys/ioctl.h>
  41 -#include <linux/videodev.h>
  42  #include <linux/videodev2.h>
  43
  44  #ifdef HAVE_JPEG