Annotation of /trunk/mjpegtools/patches/mjpegtools-2.0.0-v4l-2.6.38.patch
Parent Directory
| 
Revision Log
Revision 1912 -
(hide annotations)
(download)
Fri Oct 12 12:08:23 2012 UTC (11 years, 7 months ago) by niro
File size: 4061 byte(s)
Fri Oct 12 12:08:23 2012 UTC (11 years, 7 months ago) by niro
File size: 4061 byte(s)
-add patch to fix build against newer v4l headers
| 1 | niro | 1912 | Index: lavtools/lavvideo.c |
| 2 | =================================================================== | ||
| 3 | --- lavtools/lavvideo.c.orig | ||
| 4 | +++ lavtools/lavvideo.c | ||
| 5 | @@ -63,7 +63,7 @@ Copyright by Gernot Ziegler. | ||
| 6 | * errors here, check your linux/time.h && sys/time.h header setup. | ||
| 7 | */ | ||
| 8 | #define _LINUX_TIME_H | ||
| 9 | -#include <linux/videodev.h> | ||
| 10 | +#include <libv4l1-videodev.h> | ||
| 11 | |||
| 12 | #include <videodev_mjpeg.h> | ||
| 13 | #include <frequencies.h> | ||
| 14 | Index: lavtools/liblavplay.c | ||
| 15 | =================================================================== | ||
| 16 | --- lavtools/liblavplay.c.orig | ||
| 17 | +++ lavtools/liblavplay.c | ||
| 18 | @@ -68,7 +68,8 @@ | ||
| 19 | * errors here, check your linux/time.h && sys/time.h header setup. | ||
| 20 | */ | ||
| 21 | #define _LINUX_TIME_H | ||
| 22 | -#include <linux/videodev.h> | ||
| 23 | +#include <libv4l1-videodev.h> | ||
| 24 | +#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ | ||
| 25 | #else | ||
| 26 | #define VIDEO_MODE_PAL 0 | ||
| 27 | #define VIDEO_MODE_NTSC 1 | ||
| 28 | Index: lavtools/liblavrec.c | ||
| 29 | =================================================================== | ||
| 30 | --- lavtools/liblavrec.c.orig | ||
| 31 | +++ lavtools/liblavrec.c | ||
| 32 | @@ -63,7 +63,8 @@ | ||
| 33 | * errors here, check your linux/time.h && sys/time.h header setup. | ||
| 34 | */ | ||
| 35 | #define _LINUX_TIME_H | ||
| 36 | -#include <linux/videodev.h> | ||
| 37 | +#include <libv4l1-videodev.h> | ||
| 38 | +#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ | ||
| 39 | #ifdef HAVE_SYS_SOUNDCARD_H | ||
| 40 | #include <sys/soundcard.h> | ||
| 41 | #endif | ||
| 42 | Index: lavtools/testrec.c | ||
| 43 | =================================================================== | ||
| 44 | --- lavtools/testrec.c.orig | ||
| 45 | +++ lavtools/testrec.c | ||
| 46 | @@ -89,7 +89,7 @@ | ||
| 47 | * errors here, check your linux/time.h && sys/time.h header setup. | ||
| 48 | */ | ||
| 49 | #define _LINUX_TIME_H | ||
| 50 | -#include <linux/videodev.h> | ||
| 51 | +#include <libv4l1-videodev.h> | ||
| 52 | #include <linux/soundcard.h> | ||
| 53 | |||
| 54 | /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ | ||
| 55 | Index: configure.ac | ||
| 56 | =================================================================== | ||
| 57 | --- configure.ac.orig | ||
| 58 | +++ configure.ac | ||
| 59 | @@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit | ||
| 60 | AS_IF([test "x$with_v4l" != "xno"], [ | ||
| 61 | case $host in | ||
| 62 | *-*-linux*) | ||
| 63 | - AC_CHECK_HEADER(linux/videodev.h, | ||
| 64 | + AC_CHECK_HEADER(libv4l1-videodev.h, | ||
| 65 | [have_video4linux=true | ||
| 66 | AC_DEFINE(HAVE_V4L, 1, | ||
| 67 | [Building for Linux - using the video4linux API])], []) | ||
| 68 | @@ -173,7 +173,7 @@ esac]) | ||
| 69 | |||
| 70 | AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"], | ||
| 71 | [have_video4linux=false | ||
| 72 | - AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) | ||
| 73 | + AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) | ||
| 74 | AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) | ||
| 75 | |||
| 76 | dnl ********************************************************************* | ||
| 77 | Index: configure | ||
| 78 | =================================================================== | ||
| 79 | --- configure.orig | ||
| 80 | +++ configure | ||
| 81 | @@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then : | ||
| 82 | |||
| 83 | case $host in | ||
| 84 | *-*-linux*) | ||
| 85 | - ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" | ||
| 86 | + ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" | ||
| 87 | if test "x$ac_cv_header_linux_videodev_h" = xyes; then : | ||
| 88 | have_video4linux=true | ||
| 89 | |||
| 90 | @@ -16407,8 +16407,8 @@ fi | ||
| 91 | |||
| 92 | if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then : | ||
| 93 | have_video4linux=false | ||
| 94 | - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 | ||
| 95 | -$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} | ||
| 96 | + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 | ||
| 97 | +$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} | ||
| 98 | fi | ||
| 99 | if test x$have_video4linux = xtrue; then | ||
| 100 | HAVE_V4L_TRUE= |