This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-ctl/compliance: add configure option to disable libv4l use Author: Hans Verkuil <[email protected]> Date: Thu Sep 3 17:23:15 2015 +0200 Sometimes you want to compile these two utilities without the libv4l2 wrapper. This patch adds new configure options to do this: --disable-v4l2-compliance-libv4l --disable-v4l2-ctl-libv4l This is useful when building for an embedded system where you do not want to use the libv4l2 wrapper library. The capability to do this was already available, but not hooked up to the configure system. Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> configure.ac | 18 ++++++++++++++++++ utils/v4l2-compliance/Makefile.am | 8 +++++++- utils/v4l2-ctl/Makefile.am | 8 +++++++- 3 files changed, 32 insertions(+), 2 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=2ee1023cca3153465cd273c7ff5beafc4d88a5d6 diff --git a/configure.ac b/configure.ac index 53cbc8d..13df263 100644 --- a/configure.ac +++ b/configure.ac @@ -359,6 +359,22 @@ AC_ARG_ENABLE(v4l-utils, esac] ) +AC_ARG_ENABLE(v4l2-compliance-libv4l, + AS_HELP_STRING([--disable-v4l2-compliance-libv4l], [disable use of libv4l in v4l2-compliance]), + [case "${enableval}" in + yes | no ) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l2-compliance-libv4l) ;; + esac] +) + +AC_ARG_ENABLE(v4l2-ctl-libv4l, + AS_HELP_STRING([--disable-v4l2-ctl-libv4l], [disable use of libv4l in v4l2-ctl]), + [case "${enableval}" in + yes | no ) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l2-ctl-libv4l) ;; + esac] +) + AC_ARG_ENABLE(qv4l2, AS_HELP_STRING([--disable-qv4l2], [disable qv4l2 compilation]), [case "${enableval}" in @@ -383,6 +399,8 @@ AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_libv4l != xno -a x$enable_sha AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_libv4l != xno -a x$enable_shared != xno]) AM_CONDITIONAL([WITH_QTGL], [test ${qt_pkgconfig_gl} = true]) AM_CONDITIONAL([WITH_GCONV], [test x${enable_gconv} = xyes]) +AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno]) +AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x${enable_v4l2_compliance_libv4l} != xno]) # append -static to libtool compile and link command to enforce static libs AS_IF([test x$enable_libdvbv5 = xno], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])]) diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am index 3ffc5bd..e7bfc8a 100644 --- a/utils/v4l2-compliance/Makefile.am +++ b/utils/v4l2-compliance/Makefile.am @@ -1,10 +1,16 @@ bin_PROGRAMS = v4l2-compliance man_MANS = v4l2-compliance.1 +DEFS := v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \ v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp v4l2-test-buffers.cpp \ v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h cv4l-helpers.h v4l-helpers.h -v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la v4l2_compliance_LDFLAGS = -lrt +if WITH_V4L2_COMPLIANCE_LIBV4L +v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la +else +DEFS += -DNO_LIBV4L2 +endif + EXTRA_DIST = Android.mk fixme.txt v4l2-compliance.1 diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am index af7111e..932499c 100644 --- a/utils/v4l2-ctl/Makefile.am +++ b/utils/v4l2-ctl/Makefile.am @@ -1,12 +1,18 @@ bin_PROGRAMS = v4l2-ctl man_MANS = v4l2-ctl.1 +DEFS := v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cpp \ v4l2-ctl-io.cpp v4l2-ctl-stds.cpp v4l2-ctl-vidcap.cpp v4l2-ctl-vidout.cpp \ v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \ v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \ vivid-tpg-colors.c vivid-tpg.c -v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la v4l2_ctl_LDFLAGS = -lrt +if WITH_V4L2_CTL_LIBV4L +v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la +else +DEFS += -DNO_LIBV4L2 +endif + EXTRA_DIST = Android.mk vivid-tpg.h.patch v4l2-ctl.1 _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
