0005-configure.ac-revisit-v4l2-ctl-compliance-using-libv4.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From e2f317f5b9a1ba888325ac938de26b402664c271 Mon Sep 17 00:00:00 2001
  2. From: Hugues Fruchet <hugues.fruchet@st.com>
  3. Date: Wed, 17 May 2017 10:03:09 +0200
  4. Subject: [PATCH] configure.ac: revisit v4l2-ctl/compliance using libv4l
  5. variable naming
  6. USE_V4L2_CTL and USE_V4L2_COMPLIANCE are used to trig the fact that
  7. v4l2-ctl and v4l2-compliance are using libv4l2, change namings to not
  8. confuse with overall v4l2-ctl/compliance utilities building.
  9. Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
  10. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
  11. ---
  12. configure.ac | 8 ++++----
  13. 1 file changed, 4 insertions(+), 4 deletions(-)
  14. diff --git a/configure.ac b/configure.ac
  15. index 3c70969..5f20fc8 100644
  16. --- a/configure.ac
  17. +++ b/configure.ac
  18. @@ -461,8 +461,8 @@ AM_COND_IF([WITH_QV4L2], [USE_QV4L2="yes"], [USE_QV4L2="no"])
  19. AM_COND_IF([WITH_V4L_PLUGINS], [USE_V4L_PLUGINS="yes"], [USE_V4L_PLUGINS="no"])
  20. AM_COND_IF([WITH_V4L_WRAPPERS], [USE_V4L_WRAPPERS="yes"], [USE_V4L_WRAPPERS="no"])
  21. AM_COND_IF([WITH_GCONV], [USE_GCONV="yes"], [USE_GCONV="no"])
  22. -AM_COND_IF([WITH_V4L2_CTL_LIBV4L], [USE_V4L2_CTL="yes"], [USE_V4L2_CTL="no"])
  23. -AM_COND_IF([WITH_V4L2_COMPLIANCE_LIBV4L], [USE_V4L2_COMPLIANCE="yes"], [USE_V4L2_COMPLIANCE="no"])
  24. +AM_COND_IF([WITH_V4L2_CTL_LIBV4L], [USE_V4L2_CTL_LIBV4L="yes"], [USE_V4L2_CTL_LIBV4L="no"])
  25. +AM_COND_IF([WITH_V4L2_COMPLIANCE_LIBV4L], [USE_V4L2_COMPLIANCE_LIBV4L="yes"], [USE_V4L2_COMPLIANCE_LIBV4L="no"])
  26. AS_IF([test "x$alsa_pkgconfig" = "xtrue"], [USE_ALSA="yes"], [USE_ALSA="no"])
  27. AC_OUTPUT
  28. @@ -497,6 +497,6 @@ compile time options summary
  29. dvbv5-daemon : $USE_DVBV5_REMOTE
  30. v4lutils : $USE_V4LUTILS
  31. qv4l2 : $USE_QV4L2
  32. - v4l2-ctl uses libv4l : $USE_V4L2_CTL
  33. - v4l2-compliance uses libv4l: $USE_V4L2_COMPLIANCE
  34. + v4l2-ctl uses libv4l : $USE_V4L2_CTL_LIBV4L
  35. + v4l2-compliance uses libv4l: $USE_V4L2_COMPLIANCE_LIBV4L
  36. EOF
  37. --
  38. 1.9.1