From 7b8a190b623dc48ab4fc0867f0a0fd5d8cc4c2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 23 Jun 2019 01:32:08 +0200 Subject: [PATCH] Fix "videodev.h" incorrect detection as header for V4L2. This header is valid for V4L1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- kstars/configure.in.in | 11 ----------- kstars/kstars/indi/webcam/v4l1_base.h | 4 ---- kstars/kstars/indi/webcam/v4l1_pwc.h | 4 ---- 3 files changed, 19 deletions(-) diff --git a/kstars/configure.in.in b/kstars/configure.in.in index 7472b88b..6b364a76 100644 --- a/kstars/configure.in.in +++ b/kstars/configure.in.in @@ -88,17 +88,6 @@ case "$target" in [have_v4l2=false], [#include #include ]) - 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 - #include ]) - if test x$have_v4l2 = xtrue; then - AC_DEFINE(HAVE_LINUX_ALTERNATE_VIDEODEV_H, 1, [Define to 1 if you have the 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 #include -#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 #include -#ifdef HAVE_LINUX_ALTERNATE_VIDEODEV_H #include "videodev.h" -#else -#include "videodev2.h" -#endif #include "v4l1_base.h" class V4L1_PWC : public V4L1_Base