From 04e7bcbc08b29e2a1ec71c5fe088f6ce5e5f6004 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 23 Nov 2011 18:15:26 +0000
Subject: Have the PVR input plugin built if V4L2, not V4L1, is present.

--HG--
branch : point-release
extra : rebase_source : 182453d8d03dbac55d0264944566e8430ac7d601
---
 src/input/Makefile.am | 2 +-
 src/input/input_pvr.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 2b75f7338..b817cd4c4 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -21,11 +21,11 @@ endif
 
 if HAVE_V4L
 in_v4l = xineplug_inp_v4l.la
-in_pvr = xineplug_inp_pvr.la
 endif
 
 if HAVE_V4L2
 in_v4l2 = xineplug_inp_v4l2.la
+in_pvr = xineplug_inp_pvr.la
 endif
 
 if HAVE_GNOME_VFS
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 4aa55f440..9686feb45 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -98,7 +98,13 @@
 #include <time.h>
 #include <pthread.h>
 #include <sys/ioctl.h>
-#include "videodev2.h"
+#ifdef HAVE_SYS_VIDEOIO_H
+# include <sys/videoio.h>
+#elif defined(HAVE_SYS_VIDEODEV2_H)
+# include <sys/videodev2.h>
+#else
+# include <linux/videodev2.h>
+#endif
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES
 
-- 
cgit v1.2.3