diff options
Diffstat (limited to 'utils/hal/linux-2.6.38-v4l.patch')
| -rw-r--r-- | utils/hal/linux-2.6.38-v4l.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/utils/hal/linux-2.6.38-v4l.patch b/utils/hal/linux-2.6.38-v4l.patch new file mode 100644 index 0000000000..077f73adec --- /dev/null +++ b/utils/hal/linux-2.6.38-v4l.patch @@ -0,0 +1,45 @@ +# From http://cgit.freedesktop.org/hal/commit/?id=ae13d96fa2a0612b6000f4b8f6ed9d3564035703 +# to better fix https://bugs.launchpad.net/ubuntu/+source/hal/+bug/721399 +diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c +index 7bc13e8..b055720 100644 +--- a/hald/linux/probing/probe-video4linux.c ++++ b/hald/linux/probing/probe-video4linux.c +@@ -30,7 +30,9 @@ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/ioctl.h> ++#ifdef HAVE_LINUX_VIDEODEV_H + #include <linux/videodev.h> ++#endif + #include <linux/videodev2.h> + #include <errno.h> + #include <fcntl.h> +@@ -50,7 +52,9 @@ main (int argc, char *argv[]) + int ret = -1; + char *udi; + char *device_file; ++#ifdef HAVE_LINUX_VIDEODEV_H + struct video_capability v1cap; ++#endif + struct v4l2_capability v2cap; + LibHalContext *ctx = NULL; + LibHalChangeSet *cset; +@@ -107,7 +111,9 @@ main (int argc, char *argv[]) + LIBHAL_FREE_DBUS_ERROR (&error); + libhal_device_add_capability (ctx, udi, "video4linux.radio", &error); + } +- } else { ++ } ++#ifdef HAVE_LINUX_VIDEODEV_H ++ else { + HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed")); + + if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { +@@ -134,6 +140,7 @@ main (int argc, char *argv[]) + HAL_DEBUG (("ioctl VIDIOCGCAP failed")); + } + } ++#endif + + LIBHAL_FREE_DBUS_ERROR (&error); + libhal_device_commit_changeset (ctx, cset, &error); |