This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: contrib/test: Add to build system Author: Gregor Jasny <[email protected]> Date: Mon Jun 11 20:29:44 2012 +0200 During the conversion to autotools the contrib/test Makefile got lost. Re-add the test tools. Thanks to Franck Bourdonnec for pointing this out. Signed-off-by: Gregor Jasny <[email protected]> Makefile.am | 3 ++- configure.ac | 9 +++++++++ contrib/test/Makefile.am | 38 ++++++++++++++++++++++++++++++++++++++ contrib/test/pixfmt-test.c | 6 +++--- contrib/test/v4l2grab.c | 1 + 5 files changed, 53 insertions(+), 4 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=346a08d6341298495ee5a7e4cd55d8bb46a0cf90 diff --git a/Makefile.am b/Makefile.am index 06571d2..2b4ea46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,8 @@ if LINUX_OS SUBDIRS += \ utils/dvb \ utils/rds \ - utils/xc3028-firmware + utils/xc3028-firmware \ + contrib/test endif if WITH_QV4L2 diff --git a/configure.ac b/configure.ac index 1f36eb4..083d4ee 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,8 @@ AC_CONFIG_FILES([Makefile utils/xc3028-firmware/Makefile utils/qv4l2/Makefile + contrib/test/Makefile + v4l-utils.spec lib/libv4lconvert/libv4lconvert.pc lib/libv4l1/libv4l1.pc @@ -45,6 +47,7 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_INSTALL AC_PROG_LIBTOOL +PKG_PROG_PKG_CONFIG # sync-with-kernel and keytable install could make use of them #AC_PROG_GREP @@ -66,6 +69,12 @@ AM_CONDITIONAL([LINUX_OS], [test x$linux_os = xyes]) # Checks for dependencies +PKG_CHECK_MODULES(X11, [x11], [x11_pkgconfig=yes], [x11_pkgconfig=no]) +AC_SUBST([X11_CFLAGS]) +AC_SUBST([X11_LIBS]) +AM_CONDITIONAL([HAVE_X11], [test x$x11_pkgconfig = xyes]) + + AC_ARG_WITH([jpeg], AS_HELP_STRING([--without-jpeg], [Do not use jpeg library]), [], diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am new file mode 100644 index 0000000..ce1ba22 --- /dev/null +++ b/contrib/test/Makefile.am @@ -0,0 +1,38 @@ +bin_PROGRAMS = \ + ioctl-test \ + sliced-vbi-test \ + sliced-vbi-detect \ + vbi-test \ + v4lgrab \ + v4l2grab \ + driver-test \ + stress-buffer \ + capture-example + +if HAVE_X11 +bin_PROGRAMS += pixfmt-test +endif + +driver_test_SOURCES = driver-test.c +driver_test_LDADD = ../../utils/libv4l2util/libv4l2util.la + +pixfmt_test_SOURCES = pixfmt-test.c +pixfmt_test_CFLAGS = $(X11_CFLAGS) +pixfmt_test_LDFLAGS = $(X11_LIBS) + +v4l2grab_SOURCES = v4l2grab.c +v4l2grab_LDADD = ../../lib/libv4l2/libv4l2.la + +ioctl_test_SOURCES = ioctl-test.c + +sliced_vbi_test_SOURCES = sliced-vbi-test.c + +sliced_vbi_detect_SOURCES = sliced-vbi-detect.c + +vbi_test_SOURCES = vbi-test.c + +v4lgrab_SOURCES = v4lgrab.c + +stress_buffer_SOURCES = stress-buffer.c + +capture_example_SOURCES = capture-example.c diff --git a/contrib/test/pixfmt-test.c b/contrib/test/pixfmt-test.c index a3881b4..eb50fdb 100644 --- a/contrib/test/pixfmt-test.c +++ b/contrib/test/pixfmt-test.c @@ -20,6 +20,8 @@ #define _GNU_SOURCE 1 +#include <config.h> + #include <stdio.h> #include <stdlib.h> #include <stdbool.h> @@ -372,8 +374,6 @@ typedef struct { size_t length; } io_buffer; -#define VERSION "1.0" - static const char * my_name; static const char * dev_name = "/dev/video"; @@ -1868,7 +1868,7 @@ usage (FILE * fp, char ** argv) { fprintf (fp, "\ -V4L2 pixfmt test " VERSION "\n\ +V4L2 pixfmt test " V4L_UTILS_VERSION "\n\ Copyright (C) 2007 Michael H. Schimek\n\ This program is licensed under GPL 2 or later. NO WARRANTIES.\n\n\ Usage: %s [options]\n\n\ diff --git a/contrib/test/v4l2grab.c b/contrib/test/v4l2grab.c index 383a26e..a93ad43 100644 --- a/contrib/test/v4l2grab.c +++ b/contrib/test/v4l2grab.c @@ -11,6 +11,7 @@ GNU General Public License for more details. */ +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
