--- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-05 21:24:37.000000000 -0400

+++ OpenCV-2.1.0/CMakeLists.txt	2010-05-12 17:19:20.551785342 -0400

@@ -201,6 +201,7 @@

     include(OpenCVFindPkgConfig.cmake OPTIONAL)

     include(CheckFunctionExists)

     include(CheckIncludeFile)

+    include(CheckIncludeFiles)

 endif()

 #if(MSVC)

@@ -404,7 +405,13 @@

         if(WITH_V4L)

             CHECK_MODULE(libv4l1 HAVE_LIBV4L)

             CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)

-            CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)

+            CHECK_INCLUDE_FILES("asm/types.h;linux/videodev2.h" HAVE_LINUX_V4L2)

+            if(NOT HAVE_LINUX_V4L2)

+                CHECK_INCLUDE_FILES("sys/types.h;sys/ioccom.h;sys/videodev2.h" HAVE_OTHER_V4L2)

+            endif()

+            if(HAVE_LINUX_V4L2 OR HAVE_OTHER_V4L2)

+                set(HAVE_CAMV4L2 TRUE)

+            endif()

         else()

             set(HAVE_LIBV4L FALSE)

             set(HAVE_CAMV4L FALSE)

--- OpenCV-2.1.0.orig/src/highgui/cvcap.cpp	2010-04-05 21:24:44.000000000 -0400

+++ OpenCV-2.1.0/src/highgui/cvcap.cpp	2010-05-09 06:35:20.867721938 -0400

@@ -129,7 +129,7 @@

     for (int i = 0; domains[i] >= 0; i++)

     {

         #if defined(HAVE_VIDEOINPUT) || defined(HAVE_TYZX) || defined(HAVE_VFW) || \

-        defined(HAVE_CAMV4L) || defined (HAVE_CAMV4L2) || defined(HAVE_GSTREAMER) || \

+        defined(HAVE_CAMV4L) || defined (HAVE_CAMV4L2) || \

         defined(HAVE_DC1394_2) || defined(HAVE_DC1394) || defined(HAVE_CMU1394) || \

         defined(HAVE_GSTREAMER) || defined(HAVE_MIL) || defined(HAVE_QUICKTIME) || \

         defined(HAVE_UNICAP) || defined(HAVE_PVAPI)

--- OpenCV-2.1.0.orig/src/highgui/cvcap_v4l.cpp	2010-04-05 21:24:44.000000000 -0400

+++ OpenCV-2.1.0/src/highgui/cvcap_v4l.cpp	2010-05-12 20:38:16.605463073 -0400

@@ -202,7 +202,7 @@

 #include "_highgui.h"

-#if !defined WIN32 && defined HAVE_CAMV4L

+#if !defined WIN32 && (defined HAVE_CAMV4L || defined HAVE_CAMV4L2)

 #define CLEAR(x) memset (&(x), 0, sizeof (x))

@@ -214,17 +214,24 @@

 #include <sys/types.h>

 #include <sys/mman.h>

+#ifdef HAVE_CAMV4L

 #include <linux/videodev.h>

+#endif

 #include <string.h>

 #include <stdlib.h>

-#include <asm/types.h>          /* for videodev2.h */

 #include <assert.h>

 #include <sys/stat.h>

 #include <sys/ioctl.h>

 #ifdef HAVE_CAMV4L2

+#if defined __linux || defined __linux__

+#include <asm/types.h>

 #include <linux/videodev2.h>

+#else

+#include <sys/ioccom.h>

+#include <sys/videodev2.h>

+#endif

 #endif

 /* Defaults - If your board can do better, set it here.  Set for the most common type inputs. */

@@ -255,8 +262,6 @@

   size_t  length;

 };

-static unsigned int n_buffers = 0;

-

 /* Additional V4L2 pixelformats support for Sonix SN9C10x base webcams */

 #ifndef V4L2_PIX_FMT_SBGGR8

 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */

@@ -286,18 +291,25 @@

     int deviceHandle;

     int bufferIndex;

     int FirstCapture;

+    bool devicePollable;

+

+#ifdef HAVE_CAMV4L

+

     struct video_capability capability;

     struct video_window     captureWindow;

     struct video_picture    imageProperties;

     struct video_mbuf       memoryBuffer;

     struct video_mmap       *mmaps;

     char *memoryMap;

+#endif /* HAVE_CAMV4L */

+

     IplImage frame;

 #ifdef HAVE_CAMV4L2

    /* V4L2 variables */

    buffer buffers[MAX_V4L_BUFFERS + 1];

+   unsigned int n_buffers;

    struct v4l2_capability cap;

    struct v4l2_input inp;

    struct v4l2_format form;

@@ -391,6 +403,7 @@

 }; /* End icvInitCapture_V4L */

+#ifdef HAVE_CAMV4L

 static int

 try_palette(int fd,

             struct video_picture *cam_pic,

@@ -407,6 +420,7 @@

     return 1;

   return 0;

 }

+#endif /* HAVE_CAMV4L */

 #ifdef HAVE_CAMV4L2

@@ -431,8 +445,9 @@

 }

 #endif /* HAVE_CAMV4L2 */

+#ifdef HAVE_CAMV4L

-static int try_init_v4l(CvCaptureCAM_V4L* capture, char *deviceName)

+static int try_init_v4l(CvCaptureCAM_V4L* capture, const char *deviceName)

 {

   // if detect = -1 then unable to open device

@@ -474,9 +489,10 @@

 }

+#endif /* HAVE_CAMV4L */

 #ifdef HAVE_CAMV4L2

-static int try_init_v4l2(CvCaptureCAM_V4L* capture, char *deviceName)

+static int try_init_v4l2(CvCaptureCAM_V4L* capture, const char *deviceName)

 {

   // if detect = -1 then unable to open device

@@ -491,7 +507,6 @@

   capture->deviceHandle = open (deviceName, O_RDWR /* required */ | O_NONBLOCK, 0);

-

   if (capture->deviceHandle == 0)

   {

     detect = -1;

@@ -510,6 +525,8 @@

     }

       else

     {

+

+#ifdef HAVE_CAMV4L

       CLEAR (capture->capability);

       capture->capability.type = capture->cap.capabilities;

@@ -518,6 +535,10 @@

       {

         detect = 1;

       }

+#else

+      detect = 1;

+#endif /* HAVE_CAMV4L */

+

     }

   }

@@ -544,10 +565,6 @@

   else

 #ifdef HAVE_JPEG

-#ifdef __USE_GNU

-      /* support for MJPEG is only available with libjpeg and gcc,

-	 because it's use libjepg and fmemopen()

-      */

   if (try_palette_v4l2(capture, V4L2_PIX_FMT_MJPEG) == 0 ||

       try_palette_v4l2(capture, V4L2_PIX_FMT_JPEG) == 0)

   {

@@ -555,7 +572,6 @@

   }

   else

 #endif

-#endif

   if (try_palette_v4l2(capture, V4L2_PIX_FMT_YUYV) == 0)

   {

@@ -590,6 +606,7 @@

 }

 #endif /* HAVE_CAMV4L2 */

+#ifdef HAVE_CAMV4L

 static int autosetup_capture_mode_v4l(CvCaptureCAM_V4L* capture)

 {

@@ -624,6 +641,7 @@

 }

+#endif /* HAVE_CAMV4L */

 #ifdef HAVE_CAMV4L2

 static void v4l2_scan_controls_enumerate_menu(CvCaptureCAM_V4L* capture)

@@ -648,7 +666,7 @@

 static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)

 {

-  __u32 ctrl_id;

+  unsigned int ctrl_id;

   for (ctrl_id = V4L2_CID_BASE;

        ctrl_id < V4L2_CID_LASTP1;

@@ -794,7 +812,111 @@

 }

-static int _capture_V4L2 (CvCaptureCAM_V4L *capture, char *deviceName)

+static int init_read_v4l2 (CvCaptureCAM_V4L *capture)

+{

+   unsigned int size = capture->form.fmt.pix.sizeimage;

+

+   capture->buffers[0].start = malloc( size );

+   if (!capture->buffers[0].start) {

+       perror ("malloc");

+       return -1;

+   }

+   capture->buffers[0].length = size;

+

+   capture->buffers[MAX_V4L_BUFFERS].start = malloc( size );

+   if (!capture->buffers[MAX_V4L_BUFFERS].start) {

+       perror ("malloc");

+       return -1;

+   }

+   capture->buffers[MAX_V4L_BUFFERS].length = size;

+

+   capture->n_buffers = 0;

+

+   return 0;

+}

+

+static int init_mmap_v4l2 (CvCaptureCAM_V4L *capture, const char *deviceName)

+{

+   unsigned int buffer_number = DEFAULT_V4L_BUFFERS;

+

+   CLEAR (capture->req);

+

+   try_again:

+

+   capture->req.count = buffer_number;

+   capture->req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

+   capture->req.memory = V4L2_MEMORY_MMAP;

+

+   if (-1 == xioctl (capture->deviceHandle, VIDIOC_REQBUFS, &capture->req))

+   {

+       if (EINVAL == errno)

+       {

+         fprintf (stderr, "%s does not support memory mapping\n", deviceName);

+       } else {

+         perror ("VIDIOC_REQBUFS");

+       }

+       return -1;

+   }

+

+   if (capture->req.count < buffer_number)

+   {

+       if (buffer_number == 1)

+       {

+           fprintf (stderr, "Insufficient buffer memory on %s\n", deviceName);

+

+           return -1;

+       } else {

+         buffer_number--;

+	 fprintf (stderr, "Insufficient buffer memory on %s -- decreaseing buffers\n", deviceName);

+

+	 goto try_again;

+       }

+   }

+

+   for (unsigned int n_buffers = 0; n_buffers < capture->req.count; ++n_buffers)

+   {

+       struct v4l2_buffer buf;

+

+       CLEAR (buf);

+

+       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

+       buf.memory = V4L2_MEMORY_MMAP;

+       buf.index = n_buffers;

+

+       if (-1 == xioctl (capture->deviceHandle, VIDIOC_QUERYBUF, &buf)) {

+           perror ("VIDIOC_QUERYBUF");

+           return -1;

+       }

+

+       capture->buffers[n_buffers].length = buf.length;

+       capture->buffers[n_buffers].start =

+         mmap (NULL /* start anywhere */,

+               buf.length,

+               PROT_READ | PROT_WRITE /* required */,

+               MAP_SHARED /* recommended */,

+               capture->deviceHandle, buf.m.offset);

+

+       if (MAP_FAILED == capture->buffers[n_buffers].start) {

+           perror ("mmap");

+           return -1;

+       }

+   }

+

+   unsigned int size = capture->form.fmt.pix.sizeimage;

+

+   capture->buffers[MAX_V4L_BUFFERS].start = malloc( size );

+   if (!capture->buffers[MAX_V4L_BUFFERS].start) {

+       perror ("malloc");

+       return -1;

+   }

+   capture->buffers[MAX_V4L_BUFFERS].length = size;

+

+   capture->n_buffers = capture->req.count;

+

+   return 0;

+}

+

+static int _capture_V4L2 (CvCaptureCAM_V4L *capture, const char *deviceName)

 {

    int detect_v4l2 = 0;

@@ -870,10 +992,6 @@

        return -1;

    }

-   if (V4L2_SUPPORT == 0)

-   {

-   }

-

    if (autosetup_capture_mode_v4l2(capture) == -1)

        return -1;

@@ -892,90 +1010,28 @@

    if (capture->form.fmt.pix.sizeimage < min)

        capture->form.fmt.pix.sizeimage = min;

-   CLEAR (capture->req);

-

-   unsigned int buffer_number = DEFAULT_V4L_BUFFERS;

-

-   try_again:

-

-   capture->req.count = buffer_number;

-   capture->req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

-   capture->req.memory = V4L2_MEMORY_MMAP;

-

-   if (-1 == xioctl (capture->deviceHandle, VIDIOC_REQBUFS, &capture->req))

-   {

-       if (EINVAL == errno)

-       {

-         fprintf (stderr, "%s does not support memory mapping\n", deviceName);

-       } else {

-         perror ("VIDIOC_REQBUFS");

-       }

-       /* free capture, and returns an error code */

-       icvCloseCAM_V4L (capture);

-       return -1;

-   }

-

-   if (capture->req.count < buffer_number)

-   {

-       if (buffer_number == 1)

-       {

-           fprintf (stderr, "Insufficient buffer memory on %s\n", deviceName);

-

-           /* free capture, and returns an error code */

-           icvCloseCAM_V4L (capture);

-           return -1;

-       } else {

-         buffer_number--;

-	 fprintf (stderr, "Insufficient buffer memory on %s -- decreaseing buffers\n", deviceName);

-

-	 goto try_again;

-       }

-   }

-

-   for (n_buffers = 0; n_buffers < capture->req.count; ++n_buffers)

-   {

-       struct v4l2_buffer buf;

-

-       CLEAR (buf);

-

-       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

-       buf.memory = V4L2_MEMORY_MMAP;

-       buf.index = n_buffers;

-

-       if (-1 == xioctl (capture->deviceHandle, VIDIOC_QUERYBUF, &buf)) {

-           perror ("VIDIOC_QUERYBUF");

-

-           /* free capture, and returns an error code */

-           icvCloseCAM_V4L (capture);

+   if (capture->cap.capabilities & V4L2_CAP_STREAMING) {

+       if (-1 == init_mmap_v4l2(capture, deviceName)) {

+           icvCloseCAM_V4L(capture);

            return -1;

        }

-

-       capture->buffers[n_buffers].length = buf.length;

-       capture->buffers[n_buffers].start =

-         mmap (NULL /* start anywhere */,

-               buf.length,

-               PROT_READ | PROT_WRITE /* required */,

-               MAP_SHARED /* recommended */,

-               capture->deviceHandle, buf.m.offset);

-

-       if (MAP_FAILED == capture->buffers[n_buffers].start) {

-           perror ("mmap");

-

-           /* free capture, and returns an error code */

-           icvCloseCAM_V4L (capture);

+   } else {

+       if (capture->cap.capabilities & V4L2_CAP_READWRITE) {

+           if (-1 == init_read_v4l2(capture)) {

+               icvCloseCAM_V4L(capture);

+               return -1;

+           }

+       } else {

+           fprintf( stderr, "HIGHGUI ERROR: V4L2: device %s does not support either memory mapped or read/write I/O.\n",deviceName);

+           icvCloseCAM_V4L(capture);

            return -1;

        }

-

-       if (n_buffers == 0) {

-	 capture->buffers[MAX_V4L_BUFFERS].start = malloc( buf.length );

-	 capture->buffers[MAX_V4L_BUFFERS].length = buf.length;

-       }

    }

    /* Set up Image data */

    cvInitImageHeader( &capture->frame,

-                      cvSize( capture->captureWindow.width,

-                              capture->captureWindow.height ),

+                      cvSize( capture->form.fmt.pix.width,

+                              capture->form.fmt.pix.height ),

                       IPL_DEPTH_8U, 3, IPL_ORIGIN_TL, 4 );

    /* Allocate space for RGBA data */

    capture->frame.imageData = (char *)cvAlloc(capture->frame.imageSize);

@@ -984,8 +1040,9 @@

 }; /* End _capture_V4L2 */

 #endif /* HAVE_CAMV4L2 */

+#ifdef HAVE_CAMV4L

-static int _capture_V4L (CvCaptureCAM_V4L *capture, char *deviceName)

+static int _capture_V4L (CvCaptureCAM_V4L *capture, const char *deviceName)

 {

    int detect_v4l = 0;

@@ -1103,6 +1160,8 @@

    return 1;

 }; /* End _capture_V4L */

+#endif /* HAVE_CAMV4L */

+

 static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L (int index)

 {

    static int autoindex;

@@ -1152,10 +1211,12 @@

        icvCloseCAM_V4L(capture);

        V4L2_SUPPORT = 0;

 #endif  /* HAVE_CAMV4L2 */

+#ifdef HAVE_CAMV4L

        if (_capture_V4L (capture, deviceName) == -1) {

            icvCloseCAM_V4L(capture);

            return NULL;

        }

+#endif  /* HAVE_CAMV4L */

 #ifdef HAVE_CAMV4L2

    } else {

        V4L2_SUPPORT = 1;

@@ -1168,6 +1229,26 @@

 #ifdef HAVE_CAMV4L2

 static int read_frame_v4l2(CvCaptureCAM_V4L* capture) {

+    if (-1 == read(capture->deviceHandle,

+                   capture->buffers[0].start,