Fixed a build of motion for some kernel version with not good videodev.h

sackmotion · Jun 4, 2012 · 8619d7c · 8619d7c
1 parent 2f5dbf2
commit 8619d7c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -80,6 +80,7 @@ Bugfixes
    * Free file descriptor buffers on exit.
    * Avoid segfault when text_left or text_right uses non supported chars.
    * Fixed leak in vloopback.
+   * Fixed a build of motion for some kernel version with not good videodev.h 
 
 3.2.12 Summary of Changes
 

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for motion Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa.
+# Generated by GNU Autoconf 2.67 for motion Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='motion'
 PACKAGE_TARNAME='motion'
-PACKAGE_VERSION='Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa'
-PACKAGE_STRING='motion Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa'
+PACKAGE_VERSION='Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8'
+PACKAGE_STRING='motion Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1217,7 +1217,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 Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa to adapt to many kinds of systems.
+\`configure' configures motion Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1278,7 +1278,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of motion Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa:";;
+     short | recursive ) echo "Configuration of motion Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8:";;
    esac
   cat <<\_ACEOF
 
@@ -1424,7 +1424,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-motion configure Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa
+motion configure Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2021,7 +2021,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 Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa, which was
+It was created by motion $as_me Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -6531,7 +6531,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa, which was
+This file was extended by motion $as_me Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6593,7 +6593,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-motion config.status Git-97ade56ea87f9c9a5857bbfba284bae2a14911aa
+motion config.status Git-2f5dbf273ba89c6c881467d45f9d4fd6746284b8
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

diff --git a/motion.h b/motion.h
@@ -102,8 +102,6 @@
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))
 
-#if (!defined(HAVE_LINUX_VIDEODEV_H)) || defined(WITHOUT_V4L) || defined(BSD)
-
 #define VIDEO_PALETTE_GREY      1       /* Linear greyscale */
 #define VIDEO_PALETTE_HI240     2       /* High 240 cube (BT848) */
 #define VIDEO_PALETTE_RGB565    3       /* 565 16 bit RGB */
@@ -122,7 +120,6 @@
 #define VIDEO_PALETTE_YUV410P   16      /* YUV 4:1:0 Planar */
 #define VIDEO_PALETTE_PLANAR    13      /* start of planar entries */
 #define VIDEO_PALETTE_COMPONENT 7       /* start of component entries */
-#endif
 
 #define DEF_PALETTE             17