Origin: upstream, other, *
Description: Applied patches. See Vcs-* headers in debian/control.

--- xine-lib-1.1.20.orig/src/input/Makefile.am
+++ xine-lib-1.1.20/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
--- xine-lib-1.1.20.orig/src/input/input_pvr.c
+++ xine-lib-1.1.20/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
 
--- xine-lib-1.1.20.orig/src/input/Makefile.in
+++ xine-lib-1.1.20/src/input/Makefile.in
@@ -187,7 +187,7 @@ xineplug_inp_pvr_la_LINK = $(LIBTOOL) --
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(xineplug_inp_pvr_la_CFLAGS) $(CFLAGS) \
 	$(xineplug_inp_pvr_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_V4L_TRUE@am_xineplug_inp_pvr_la_rpath = -rpath $(xineplugdir)
+@HAVE_V4L2_TRUE@am_xineplug_inp_pvr_la_rpath = -rpath $(xineplugdir)
 xineplug_inp_rtp_la_DEPENDENCIES = $(XINE_LIB) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_xineplug_inp_rtp_la_OBJECTS = xineplug_inp_rtp_la-input_rtp.lo \
@@ -671,8 +671,8 @@ EXTRA_DIST = input_dvd.c input_vcd.c inp
 #
 @HAVE_CDROM_IOCTLS_TRUE@in_vcd = xineplug_inp_vcdo.la
 @HAVE_V4L_TRUE@in_v4l = xineplug_inp_v4l.la
-@HAVE_V4L_TRUE@in_pvr = xineplug_inp_pvr.la
 @HAVE_V4L2_TRUE@in_v4l2 = xineplug_inp_v4l2.la
+@HAVE_V4L2_TRUE@in_pvr = xineplug_inp_pvr.la
 @HAVE_GNOME_VFS_TRUE@in_gnome_vfs = xineplug_inp_gnome_vfs.la
 @HAVE_LIBSMBCLIENT_TRUE@in_smb = xineplug_inp_smb.la
 
