diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-06-23 01:32:08 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-23 01:32:20 +0200 |
| commit | 869dcee5ce16cd20042a919a56bea7e54a5bf1d8 (patch) | |
| tree | 9e77f358a99668c175156df0df8923550f9ffd96 | |
| parent | 5c1789e2fd8066e4cd998d2e63e76acd105c4743 (diff) | |
| download | tdeedu-869dcee5ce16cd20042a919a56bea7e54a5bf1d8.tar.gz tdeedu-869dcee5ce16cd20042a919a56bea7e54a5bf1d8.zip | |
Fix "videodev.h" incorrect detection as header for V4L2.
This header is valid for V4L1.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7b8a190b623dc48ab4fc0867f0a0fd5d8cc4c2b1)
| -rw-r--r-- | kstars/configure.in.in | 11 | ||||
| -rw-r--r-- | kstars/kstars/indi/webcam/v4l1_base.h | 4 | ||||
| -rw-r--r-- | kstars/kstars/indi/webcam/v4l1_pwc.h | 4 |
3 files changed, 0 insertions, 19 deletions
diff --git a/kstars/configure.in.in b/kstars/configure.in.in index f5fad3c4..47982f44 100644 --- a/kstars/configure.in.in +++ b/kstars/configure.in.in @@ -88,17 +88,6 @@ case "$target" in [have_v4l2=false], [#include <sys/time.h> #include <linux/videodev2.h>]) - if test x$have_v4l2 = xfalse; then - unset ac_cv_type_struct_v4l2_buffer - AC_CHECK_TYPE([struct v4l2_buffer], - [have_v4l2=true], - [have_v4l2=false], - [#include <sys/time.h> - #include <linux/videodev.h>]) - if test x$have_v4l2 = xtrue; then - AC_DEFINE(HAVE_LINUX_ALTERNATE_VIDEODEV_H, 1, [Define to 1 if you have the <linux/videodev.h> header file.]) - fi - fi if test x$have_v4l2 = xfalse; then KERNEL_VERSION=`uname -r` AC_CHECK_FILE(/lib/modules/$KERNEL_VERSION/build/include/linux/videodev2.h, diff --git a/kstars/kstars/indi/webcam/v4l1_base.h b/kstars/kstars/indi/webcam/v4l1_base.h index 60586104..7a7c93f9 100644 --- a/kstars/kstars/indi/webcam/v4l1_base.h +++ b/kstars/kstars/indi/webcam/v4l1_base.h @@ -24,11 +24,7 @@ #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_LINUX_ALTERNATE_VIDEODEV_H #include "videodev.h" -#else -#include "videodev2.h" -#endif #include "../eventloop.h" class V4L1_Base diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.h b/kstars/kstars/indi/webcam/v4l1_pwc.h index 84fccf6a..3790daa2 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.h +++ b/kstars/kstars/indi/webcam/v4l1_pwc.h @@ -23,11 +23,7 @@ #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_LINUX_ALTERNATE_VIDEODEV_H #include "videodev.h" -#else -#include "videodev2.h" -#endif #include "v4l1_base.h" class V4L1_PWC : public V4L1_Base |