Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > 26b06d493204c5db8ddb1535b09cebef > files > 3

directfb-1.4.11-3.fc14.src.rpm

diff -up DirectFB-1.4.11/configure.in.header DirectFB-1.4.11/configure.in
--- DirectFB-1.4.11/configure.in.header	2010-11-27 19:14:49.245722205 +0100
+++ DirectFB-1.4.11/configure.in	2010-11-27 19:15:15.018485097 +0100
@@ -142,7 +142,7 @@ fi
 AM_CONDITIONAL(X11_CORE, test "$enable_x11" = "yes")
 
 
-AC_CHECK_HEADERS(linux/compiler.h linux/unistd.h asm/page.h signal.h)
+AC_CHECK_HEADERS(linux/compiler.h linux/unistd.h asm/page.h signal.h linux/videodev.h linux/videodev2.h)
 
 
 dnl Clear default CFLAGS
diff -up DirectFB-1.4.11/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c.header DirectFB-1.4.11/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c
--- DirectFB-1.4.11/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c.header	2010-10-31 09:49:49.000000000 +0100
+++ DirectFB-1.4.11/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c	2010-11-27 19:14:13.060439016 +0100
@@ -49,7 +49,11 @@
 #ifdef HAVE_LINUX_COMPILER_H
 #include <linux/compiler.h>
 #endif
+#ifdef HAVE_LINUX_VIDEODEV_H
+#include <linux/videodev.h>
+#else
 #include "videodev.h"
+#endif
 
 #include <directfb.h>
 
@@ -77,7 +81,9 @@
 #include <direct/thread.h>
 #include <direct/util.h>
 
-#ifdef DFB_HAVE_V4L2
+#ifdef HAVE_LINUX_VIDEODEV2_H
+#include <linux/videodev2.h>
+#else
 #include "videodev2.h"
 #endif