0001-sys-v4l2-Some-blind-compilation-fixes.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001
  2. From: Colin Walters <walters@verbum.org>
  3. Date: Thu, 2 May 2013 16:16:46 -0400
  4. Subject: [PATCH] sys/v4l2: Some blind compilation fixes
  5. ---
  6. sys/v4l2/gstv4l2bufferpool.c | 1 -
  7. sys/v4l2/v4l2_calls.c | 12 ++++--------
  8. 2 files changed, 4 insertions(+), 9 deletions(-)
  9. diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
  10. index a0b4c84..3916815 100644
  11. --- a/sys/v4l2/gstv4l2bufferpool.c
  12. +++ b/sys/v4l2/gstv4l2bufferpool.c
  13. @@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
  14. GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
  15. ret->vbuffer.m.offset);
  16. GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
  17. - GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
  18. ret->mmap_length = ret->vbuffer.length;
  19. data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
  20. diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
  21. index 309bfb6..ee3ff9f 100644
  22. --- a/sys/v4l2/v4l2_calls.c
  23. +++ b/sys/v4l2/v4l2_calls.c
  24. @@ -53,14 +53,6 @@
  25. #include "gst/gst-i18n-plugin.h"
  26. -/* Those are ioctl calls */
  27. -#ifndef V4L2_CID_HCENTER
  28. -#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
  29. -#endif
  30. -#ifndef V4L2_CID_VCENTER
  31. -#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
  32. -#endif
  33. -
  34. GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
  35. #define GST_CAT_DEFAULT v4l2_debug
  36. @@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
  37. break;
  38. case V4L2_CID_HFLIP:
  39. case V4L2_CID_VFLIP:
  40. +#ifdef V4L2_CID_HCENTER
  41. case V4L2_CID_HCENTER:
  42. +#endif
  43. +#ifdef V4L2_CID_VCENTER
  44. case V4L2_CID_VCENTER:
  45. +#endif
  46. #ifdef V4L2_CID_PAN_RESET
  47. case V4L2_CID_PAN_RESET:
  48. #endif
  49. --
  50. 1.7.1