1. --- hal-0.5.14.orig/hald/linux/probing/probe-video4linux.c
  2. +++ hal-0.5.14/hald/linux/probing/probe-video4linux.c
  3. @@ -30,7 +30,6 @@
  4. #include <sys/types.h>
  5. #include <sys/time.h>
  6. #include <sys/ioctl.h>
  7. -#include <linux/videodev.h>
  8. #include <linux/videodev2.h>
  9. #include <errno.h>
  10. #include <fcntl.h>
  11. @@ -50,7 +49,6 @@ main (int argc, char *argv[])
  12. int ret = -1;
  13. char *udi;
  14. char *device_file;
  15. - struct video_capability v1cap;
  16. struct v4l2_capability v2cap;
  17. LibHalContext *ctx = NULL;
  18. LibHalChangeSet *cset;
  19. @@ -109,31 +107,6 @@ main (int argc, char *argv[])
  20. } else {
  21. HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed"));
  22.  
  23. - if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
  24. - libhal_changeset_set_property_string (cset,
  25. - "video4linux.version", "1");
  26. -
  27. - libhal_changeset_set_property_string (cset,
  28. - "info.product", v1cap.name);
  29. -
  30. - if ((v1cap.type & VID_TYPE_CAPTURE) > 0) {
  31. - LIBHAL_FREE_DBUS_ERROR (&error);
  32. - libhal_device_add_capability (ctx, udi, "video4linux.video_capture", &error);
  33. - } if ((v1cap.type & VID_TYPE_OVERLAY) > 0) {
  34. - LIBHAL_FREE_DBUS_ERROR (&error);
  35. - libhal_device_add_capability (ctx, udi, "video4linux.video_overlay", &error);
  36. - } if (v1cap.audios > 0) {
  37. - LIBHAL_FREE_DBUS_ERROR (&error);
  38. - libhal_device_add_capability (ctx, udi, "video4linux.audio", &error);
  39. - } if ((v1cap.type & VID_TYPE_TUNER) > 0) {
  40. - LIBHAL_FREE_DBUS_ERROR (&error);
  41. - libhal_device_add_capability (ctx, udi, "video4linux.tuner", &error);
  42. - }
  43. - } else {
  44. - HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
  45. - }
  46. - }
  47. -
  48. LIBHAL_FREE_DBUS_ERROR (&error);
  49. libhal_device_commit_changeset (ctx, cset, &error);
  50. libhal_device_free_changeset (cset);
  51. @@ -154,5 +127,6 @@ out:
  52. }
  53.  
  54. return ret;
  55. + }
  56. }
  57.  
  58.