summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-06-23 22:01:39 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-06-23 22:01:39 -0500
commitab9a2a8b5e5b805595b3cf50be392c119e9af8b8 (patch)
treee7a25b018cf5cecc7034e1e7301212e1cc25e53d
parentc2c964bb417a82b94a7a19da76343e95795cb6f1 (diff)
downloadtdeedu-ab9a2a8b5e5b805595b3cf50be392c119e9af8b8.tar.gz
tdeedu-ab9a2a8b5e5b805595b3cf50be392c119e9af8b8.zip
Fix kstars not detecting videodev2.h
This resolves Bug 1372
-rw-r--r--kstars/configure.in.in13
-rw-r--r--kstars/kstars/indi/v4lphilips.h2
-rw-r--r--kstars/kstars/indi/webcam/v4l1_base.h4
-rw-r--r--kstars/kstars/indi/webcam/v4l1_pwc.h4
4 files changed, 22 insertions, 1 deletions
diff --git a/kstars/configure.in.in b/kstars/configure.in.in
index 19f17c3b..f5fad3c4 100644
--- a/kstars/configure.in.in
+++ b/kstars/configure.in.in
@@ -87,7 +87,18 @@ case "$target" in
[have_v4l2=true],
[have_v4l2=false],
[#include <sys/time.h>
-#include <linux/videodev.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/v4lphilips.h b/kstars/kstars/indi/v4lphilips.h
index 59c33f0a..19aa3b3d 100644
--- a/kstars/kstars/indi/v4lphilips.h
+++ b/kstars/kstars/indi/v4lphilips.h
@@ -20,6 +20,8 @@
*/
+#include <config.h>
+
#ifndef HAVE_LINUX_VIDEODEV2_H
#include "webcam/v4l1_pwc.h"
#endif
diff --git a/kstars/kstars/indi/webcam/v4l1_base.h b/kstars/kstars/indi/webcam/v4l1_base.h
index 7a7c93f9..60586104 100644
--- a/kstars/kstars/indi/webcam/v4l1_base.h
+++ b/kstars/kstars/indi/webcam/v4l1_base.h
@@ -24,7 +24,11 @@
#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 3790daa2..84fccf6a 100644
--- a/kstars/kstars/indi/webcam/v4l1_pwc.h
+++ b/kstars/kstars/indi/webcam/v4l1_pwc.h
@@ -23,7 +23,11 @@
#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