libdc1394-videodev.h.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
  2. From: David Moore <david.moore@gmail.com>
  3. Date: Sun, 27 Mar 2011 22:48:15 -0700
  4. Subject: [PATCH 1/1] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
  5. ---
  6. libdc1394/ChangeLog | 3 +++
  7. libdc1394/configure.in | 3 +++
  8. libdc1394/examples/Makefile.am | 2 ++
  9. 3 files changed, 8 insertions(+), 0 deletions(-)
  10. diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
  11. index e1355de..536ccae 100644
  12. --- a/libdc1394/ChangeLog
  13. +++ b/libdc1394/ChangeLog
  14. @@ -1,3 +1,6 @@
  15. +2011-03-27 David Moore <david.moore@gmail.com>
  16. + * Conditionally compile dc1394_vloopback only when linux/video.h exists
  17. +
  18. 2011-01-02 David Moore <david.moore@gmail.com>
  19. * dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
  20. * Update NEWS, README, AUTHORS and version for release 2.1.3.
  21. diff --git a/libdc1394/configure.in b/libdc1394/configure.in
  22. index 69babab..bdddc9b 100644
  23. --- a/libdc1394/configure.in
  24. +++ b/libdc1394/configure.in
  25. @@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
  26. AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
  27. AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
  28. +AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
  29. +AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
  30. +
  31. AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
  32. AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
  33. diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
  34. index fcebf18..035612e 100644
  35. --- a/libdc1394/examples/Makefile.am
  36. +++ b/libdc1394/examples/Makefile.am
  37. @@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
  38. B = dc1394_reset_bus
  39. if HAVE_LINUX
  40. +if HAVE_VIDEODEV
  41. B += dc1394_vloopback
  42. +endif
  43. if HAVE_XV
  44. A += dc1394_multiview
  45. endif
  46. --
  47. 1.7.0.1