File avifile-libv4l1-videodev.patch of Package avifile

Overview Repositories Revisions Requests Users Attributes Meta

File avifile-libv4l1-videodev.patch of Package avifile

Index: avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c
===================================================================
--- avifile-0.7-0.7.45.orig/ffmpeg/libavformat/grab.c
+++ avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c
@@ -23,7 +23,7 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 #define _LINUX_TIME_H 1
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
 #include <time.h>
 
 typedef struct {
Index: avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c
===================================================================
--- avifile-0.7-0.7.45.orig/ffmpeg/libavformat/v4l2.c
+++ avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c
@@ -31,7 +31,8 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 #define _LINUX_TIME_H 1
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#include <linux/videodev2.h>
 #include <time.h>
 
 static const int desired_video_buffers = 256;
Index: avifile-0.7-0.7.45/m4/v4l.m4
===================================================================
--- avifile-0.7-0.7.45.orig/m4/v4l.m4
+++ avifile-0.7-0.7.45/m4/v4l.m4
@@ -10,7 +10,7 @@ AC_DEFUN([AC_CHECK_V4L],
     AC_ARG_ENABLE(v4l, [  --enable-v4l            support v4l video interface. (autodetect)],
 		  [], enable_v4l=yes)
     if test x$enable_v4l = xyes; then
-	AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ])
+	AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ])
     fi
 
     if test x$enable_v4l = xyes; then
Index: avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp
===================================================================
--- avifile-0.7-0.7.45.orig/samples/qtvidcap/kv4lsetup.cpp
+++ avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp
@@ -39,7 +39,7 @@
 
 /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */
 #define _LINUX_TIME_H
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
 
 #ifndef X_DISPLAY_MISSING
 #include <X11/Xlib.h>
Index: avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h
===================================================================
--- avifile-0.7-0.7.45.orig/samples/qtvidcap/v4lxif.h
+++ avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h
@@ -32,7 +32,8 @@
 
 /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */
 #define _LINUX_TIME_H
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#define BASE_VIDIOCPRIVATE    192    /* 192-255 are private */
 
 #define V4L_DEVICE "/dev/video"
 #define V4L_VBI_DEVICE "/dev/vbi"

Places

File avifile-libv4l1-videodev.patch of Package avifile

Places