[libunicap] Added a patch to use the libv4l1compat header (#676470, #716118)

[Robert Scheck]

commit 788dd02133d5e7d73a19fd431dd1dce3f6a1632b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 9 03:03:10 2011 +0200

    Added a patch to use the libv4l1compat header (#676470, #716118)

 libunicap-0.9.12-videodev.patch |   25 +++++++++++++++++++++++++
 libunicap.spec                  |   10 +++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/libunicap-0.9.12-videodev.patch b/libunicap-0.9.12-videodev.patch
new file mode 100644
index 0000000..51ea700
--- /dev/null
+++ b/libunicap-0.9.12-videodev.patch
@@ -0,0 +1,25 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for libunicap >= 0.9.12, which switches
+after the removal of v4l1 from the Linux kernel to the libv4l1compat header of libv4l.
+
+--- libunicap-0.9.12/cpi/v4l/v4l.c			2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/cpi/v4l/v4l.c.videodev		2011-10-09 02:50:26.000000000 +0200
+@@ -49,7 +49,7 @@
+ #endif
+ #include <debug.h>
+ 
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/videodev2.h> // for v4l2 checks
+ 
+ #include "v4l.h"
+--- libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h		2010-01-17 08:49:29.000000000 +0100
++++ libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h.videodev	2011-10-09 02:50:09.000000000 +0200
+@@ -2,7 +2,7 @@
+ #define _USB_VIDEO_H_
+ 
+ #include <linux/kernel.h>
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include "uvc_compat.h"
+ 
diff --git a/libunicap.spec b/libunicap.spec
index 5cc740f..f3d54b7 100644
--- a/libunicap.spec
+++ b/libunicap.spec
@@ -19,12 +19,14 @@ Patch2:		libunicap-0.9.12-arraycmp.patch
 Patch3:		libunicap-0.9.12-warnings.patch
 Patch4:		libunicap-bz641623.patch
 Patch5:		libunicap-bz642118.patch
+Patch6:		libunicap-0.9.12-videodev.patch
 BuildRequires:	intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4
+BuildRequires:	glib2-devel >= 2.10.0
 %ifnarch s390 s390x
 BuildRequires:	libraw1394-devel >= 1.1.0
 %endif
 %if 0%{?rhel}%{?fedora} >= 6
-BuildRequires:	libv4l-devel, libtool, automake, autoconf
+BuildRequires:	libv4l-devel >= 0.8.3-1, libtool, automake, autoconf
 %endif
 Obsoletes:	unicap <= 0.9.7-1
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +58,9 @@ API documentation of the library, too.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%if 0%{?rhel}%{?fedora} >= 7
+%patch6 -p1
+%endif
 
 # Needed to get rid of rpath
 %if 0%{?rhel}%{?fedora} >= 6
@@ -110,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Sun Oct 09 22011 Robert Scheck <robert at fedoraproject.org> 0.9.12-8
+- Added a patch to use the libv4l1compat header (#676470, #716118)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild