From dbde9c0bc044cd24db832c78938da23ecf3a1cb2 Mon Sep 17 00:00:00 2001 From: AngelCarpintero Date: Wed, 9 Sep 2009 09:53:04 +0000 Subject: [PATCH] Fix v4l2_palette to allow write file work properly, cosmetic changes in configure.in --- conf.c | 34 ++++++++++++++++++++-------------- configure | 52 ++++++++++++++++++++++++++-------------------------- configure.in | 34 +++++++++++++++++----------------- 3 files changed, 63 insertions(+), 57 deletions(-) diff --git a/conf.c b/conf.c index 65d977ab..0f01c129 100644 --- a/conf.c +++ b/conf.c @@ -230,25 +230,31 @@ config_param config_params[] = { { "v4l2_palette", "# v4l2_palette allows to choose preferable palette to be use by motion\n" - "# to capture from those supported by your videodevice. (default: 8)\n" + "# to capture from those supported by your videodevice. (default: 16)\n" "# E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and\n" "# V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG.\n" - "# Setting v4l2_palette to 4 forces motion to use V4L2_PIX_FMT_SBGGR8\n" + "# Setting v4l2_palette to 2 forces motion to use V4L2_PIX_FMT_SBGGR8\n" "# instead.\n" "#\n" "# Values :\n" - "# V4L2_PIX_FMT_SN9C10X : 0 'S910'\n" - "# V4L2_PIX_FMT_SBGGR16 : 1 'BYR2'\n" - "# V4L2_PIX_FMT_SPCA561 : 2 'S651'\n" - "# V4L2_PIX_FMT_SGBRG8 : 3 'GBRG'\n" - "# V4L2_PIX_FMT_SBGGR8 : 4 'BA81'\n" - "# V4L2_PIX_FMT_MJPEG : 5 'MJPEG'\n" - "# V4L2_PIX_FMT_JPEG : 6 'JPEG'\n" - "# V4L2_PIX_FMT_RGB24 : 7 'RGB3'\n" - "# V4L2_PIX_FMT_UYVY : 8 'UYVY'\n" - "# V4L2_PIX_FMT_YUYV : 9 'YUYV'\n" - "# V4L2_PIX_FMT_YUV422P : 10 '422P'\n" - "# V4L2_PIX_FMT_YUV420 : 11 'YU12'\n", + "# V4L2_PIX_FMT_SN9C10X : 0 'S910'\n" + "# V4L2_PIX_FMT_SBGGR16 : 1 'BYR2'\n" + "# V4L2_PIX_FMT_SBGGR8 : 2 'BA81'\n" + "# V4L2_PIX_FMT_SPCA561 : 3 'S561'\n" + "# V4L2_PIX_FMT_SGBRG8 : 4 'GBRG'\n" + "# V4L2_PIX_FMT_PAC207 : 5 'P207'\n" + "# V4L2_PIX_FMT_PJPG : 6 'PJPG'\n" + "# V4L2_PIX_FMT_MJPEG : 7 'MJPEG'\n" + "# V4L2_PIX_FMT_JPEG : 8 'JPEG'\n" + "# V4L2_PIX_FMT_RGB24 : 9 'RGB3'\n" + "# V4L2_PIX_FMT_SPCA501 : 10 'S501'\n" + "# V4L2_PIX_FMT_SPCA505 : 11 'S505'\n" + "# V4L2_PIX_FMT_SPCA508 : 12 'S508'\n" + "# V4L2_PIX_FMT_UYVY : 13 'UYVY'\n" + "# V4L2_PIX_FMT_YUYV : 14 'YUYV'\n" + "# V4L2_PIX_FMT_YUV422P : 15 '422P'\n" + "# V4L2_PIX_FMT_YUV420 : 16 'YU12'\n" + "#", 0, CONF_OFFSET(v4l2_palette), copy_int, diff --git a/configure b/configure index 97d11c88..d2685021 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for motion trunk-r467. +# Generated by GNU Autoconf 2.63 for motion trunk-r468. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='motion' PACKAGE_TARNAME='motion' -PACKAGE_VERSION='trunk-r467' -PACKAGE_STRING='motion trunk-r467' +PACKAGE_VERSION='trunk-r468' +PACKAGE_STRING='motion trunk-r468' PACKAGE_BUGREPORT='' ac_unique_file="motion.c" @@ -1267,7 +1267,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures motion trunk-r467 to adapt to many kinds of systems. +\`configure' configures motion trunk-r468 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1328,7 +1328,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of motion trunk-r467:";; + short | recursive ) echo "Configuration of motion trunk-r468:";; esac cat <<\_ACEOF @@ -1468,7 +1468,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -motion configure trunk-r467 +motion configure trunk-r468 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1482,7 +1482,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by motion $as_me trunk-r467, which was +It was created by motion $as_me trunk-r468, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -8173,7 +8173,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by motion $as_me trunk-r467, which was +This file was extended by motion $as_me trunk-r468, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8232,7 +8232,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -motion config.status trunk-r467 +motion config.status trunk-r468 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -9019,20 +9019,20 @@ else fi if test "${PTHREAD_SUPPORT}" = "yes"; then - echo "pthread Support: Yes" + echo "pthread support: Yes" else - echo "pthread Support: No" + echo "pthread support: No" echo "**********************************************" echo "** Fatal Error YOU MUST HAVE pthread Support *" echo "**********************************************" fi if test "${JPEG_SUPPORT_MMX}" = "yes"; then - echo "jpeg-mmx Support: Yes" + echo "jpeg-mmx support: Yes" elif test "${JPEG_SUPPORT}" = "yes"; then - echo "jpeg Support: Yes" + echo "jpeg support: Yes" else - echo "jpeg Support: No" + echo "jpeg support: No" echo "**********************************************" echo "** Fatal Error YOU MUST HAVE jpeg Support ***" echo "**********************************************" @@ -9053,40 +9053,40 @@ if test "${FreeBSD}" != ""; then else if test "${V4L}" = "yes"; then - echo "V4L included: Yes" + echo "V4L support: Yes" else - echo "V4L included: No" + echo "V4L support: No" fi if test x$SUPPORTED_V4L2 = xtrue; then - echo "V4L2 supported: Yes" + echo "V4L2 support: Yes" else - echo "V4L2 supported: No" + echo "V4L2 support: No" fi fi if test "${FFMPEG_OK}" = "found"; then - echo "FFmpeg Support: Yes" + echo "FFmpeg support: Yes" else - echo "FFmpeg Support: No" + echo "FFmpeg support: No" fi if test "${SQLITE3_SUPPORT}" = "yes"; then - echo "SQLite3 Support: Yes" + echo "SQLite3 support: Yes" else - echo "SQLite3 Support: No" + echo "SQLite3 support: No" fi if test "${MYSQL_SUPPORT}" = "yes"; then - echo "MYSQL Support: Yes" + echo "MYSQL support: Yes" else - echo "MYSQL Support: No" + echo "MYSQL support: No" fi if test "${PGSQL_SUPPORT}" = "yes"; then - echo "PostgreSQL Support: Yes" + echo "PostgreSQL support: Yes" else - echo "PostgreSQL Support: No" + echo "PostgreSQL support: No" fi echo diff --git a/configure.in b/configure.in index 718ad8bc..c43848a7 100644 --- a/configure.in +++ b/configure.in @@ -1146,20 +1146,20 @@ else fi if test "${PTHREAD_SUPPORT}" = "yes"; then - echo "pthread Support: Yes" + echo "pthread support: Yes" else - echo "pthread Support: No" + echo "pthread support: No" echo "**********************************************" echo "** Fatal Error YOU MUST HAVE pthread Support *" echo "**********************************************" fi if test "${JPEG_SUPPORT_MMX}" = "yes"; then - echo "jpeg-mmx Support: Yes" + echo "jpeg-mmx support: Yes" elif test "${JPEG_SUPPORT}" = "yes"; then - echo "jpeg Support: Yes" + echo "jpeg support: Yes" else - echo "jpeg Support: No" + echo "jpeg support: No" echo "**********************************************" echo "** Fatal Error YOU MUST HAVE jpeg Support ***" echo "**********************************************" @@ -1180,40 +1180,40 @@ if test "${FreeBSD}" != ""; then else if test "${V4L}" = "yes"; then - echo "V4L included: Yes" + echo "V4L support: Yes" else - echo "V4L included: No" + echo "V4L support: No" fi if test x$SUPPORTED_V4L2 = xtrue; then - echo "V4L2 supported: Yes" + echo "V4L2 support: Yes" else - echo "V4L2 supported: No" + echo "V4L2 support: No" fi fi if test "${FFMPEG_OK}" = "found"; then - echo "FFmpeg Support: Yes" + echo "FFmpeg support: Yes" else - echo "FFmpeg Support: No" + echo "FFmpeg support: No" fi if test "${SQLITE3_SUPPORT}" = "yes"; then - echo "SQLite3 Support: Yes" + echo "SQLite3 support: Yes" else - echo "SQLite3 Support: No" + echo "SQLite3 support: No" fi if test "${MYSQL_SUPPORT}" = "yes"; then - echo "MYSQL Support: Yes" + echo "MYSQL support: Yes" else - echo "MYSQL Support: No" + echo "MYSQL support: No" fi if test "${PGSQL_SUPPORT}" = "yes"; then - echo "PostgreSQL Support: Yes" + echo "PostgreSQL support: Yes" else - echo "PostgreSQL Support: No" + echo "PostgreSQL support: No" fi echo