Skip to content

Commit

Permalink
Enable building 0.24-fixes without system V4L1 support.
Browse files Browse the repository at this point in the history
This patch retrieves videodev_myth.h from revision 6ff252d
(the revision before it was removed in bf7225c ), and
modifies the MythTV code to use it, instead of the system
linux/videodev.h header, so that MythTV will compile and work properly,
even on systems based on the Linux 2.6.38+ kernel headers.
  • Loading branch information
sphery committed May 30, 2011
1 parent 8e4a3c3 commit a163dc8
Show file tree
Hide file tree
Showing 7 changed files with 364 additions and 7 deletions.
3 changes: 1 addition & 2 deletions mythtv/configure
Expand Up @@ -1714,7 +1714,7 @@ mythtranscode_deps="backend frontend"
opengl_deps_any="agl_h GL_gl_h darwin windows x11"
opengl_video_deps="opengl"
opengl_vsync_deps="opengl"
v4l_deps="backend linux_videodev_h linux_videodev2_h"
v4l_deps="backend linux_videodev2_h"
vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
xrandr_deps="x11"
xv_deps="x11"
Expand Down Expand Up @@ -3773,7 +3773,6 @@ if enabled network; then
fi
fi

check_header linux/videodev.h
check_header linux/videodev2.h
check_header sys/videoio.h

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
Expand Up @@ -43,7 +43,7 @@ extern "C" {
}

#ifdef USING_V4L
#include <linux/videodev.h>
#include "videodev_myth.h"
#include <linux/videodev2.h>

#include "go7007_myth.h"
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/analogsignalmonitor.cpp
Expand Up @@ -6,7 +6,7 @@
#include <sys/ioctl.h>
#include <poll.h>

#include <linux/videodev.h>
#include "videodev_myth.h"

#include "mythverbose.h"
#include "analogsignalmonitor.h"
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/cardutil.cpp
Expand Up @@ -27,7 +27,7 @@
#endif

#ifdef USING_V4L
#include <linux/videodev.h>
#include "videodev_myth.h"
#include <linux/videodev2.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/v4lchannel.cpp
Expand Up @@ -16,7 +16,7 @@
#include <iostream>
using namespace std;

#include <linux/videodev.h>
#include "videodev_myth.h"
#include <linux/videodev2.h>

// MythTV headers
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/vbitext/vbi.c
Expand Up @@ -14,7 +14,7 @@
// compiling with -std=c99. We could remove this in the .pro file,
// but that would disable it for all .c files.
#undef __STRICT_ANSI__
#include <linux/videodev.h>
#include "videodev_myth.h"
#include <linux/videodev2.h>

// vbitext headers
Expand Down

0 comments on commit a163dc8

Please sign in to comment.