File v4l.diff of Package xdtv

--- xdtv-2.4.1cvs15.old/configure	2009-03-22 16:02:06.000000000 +0100
+++ xdtv-2.4.1cvs15/configure	2011-11-16 17:21:22.000000000 +0200
@@ -24756,7 +24756,6 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-                    #include <linux/videodev.h>
                     #include <linux/videodev2.h>
 int
 main ()

--- xdtv-2.4.1cvs15.old/src/grab-v4l2.c 2011-11-16 17:22:18.000000000 +0100
+++ xdtv-2.4.1cvs15/src/grab-v4l2.c    2011-11-16 17:22:42.000000000 +0100
@@ -43,7 +43,6 @@
 #include "grab.h"
 #include "channel.h"
 #ifdef HAVE_V4L_2
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
 #include "colorspace.h"
 #include "memcpy.h"

--- xdtv-2.4.1cvs15.old/src/xdtv_v4l-conf.c 2008-12-07 12:43:24.000000000 +0100
+++ xdtv-2.4.1cvs15/src/xdtv_v4l-conf.c     2012-10-01 08:42:18.000000000 +0200
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef HAVE_V4L_1
+#if defined HAVE_V4L_1 || defined HAVE_V4L_2
 #include <unistd.h>
 #include <strings.h>
 #include <string.h>
@@ -42,7 +42,9 @@
 #include <linux/fb.h>
 #include <sys/time.h>
 
+#ifdef HAVE_V4L_1
 #include <linux/videodev.h>
+#endif
 #ifdef HAVE_V4L_2
 #include <linux/videodev2.h>
 #endif
@@ -325,6 +327,7 @@
 int
 displayinfo_v4l(int fd, struct DISPLAYINFO *d)
 {
+#ifdef HAVE_V4L_1
     struct video_capability  capability;
     struct video_buffer      fbuf;
 
@@ -367,6 +370,7 @@
 		    "          root priviliges for the VIDIOCSFBUF ioctl.\n");
 	exit(1);
     }
+#endif
     return 0;
 }