From d8ca214d4f9777f48e0d402a9a0dd169fc43c533 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Feb 10 2011 09:20:25 +0000
Subject: - Fix building with kernels >= 2.6.38


---

diff --git a/camorama-0.19-no-more-videodev_h.patch b/camorama-0.19-no-more-videodev_h.patch
new file mode 100644
index 0000000..8769678
--- /dev/null
+++ b/camorama-0.19-no-more-videodev_h.patch
@@ -0,0 +1,13 @@
+diff -up camorama-0.19/src/v4l.h~ camorama-0.19/src/v4l.h
+--- camorama-0.19/src/v4l.h~	2007-09-16 15:36:55.000000000 +0200
++++ camorama-0.19/src/v4l.h	2011-02-09 22:48:17.317513026 +0100
+@@ -12,8 +12,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <signal.h>
+ #include <png.h>
+ #include <glade/glade.h>
diff --git a/camorama.spec b/camorama.spec
index 0544ff7..ff30297 100644
--- a/camorama.spec
+++ b/camorama.spec
@@ -1,6 +1,6 @@
 Name:           camorama
 Version:        0.19
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gnome webcam viewer
 Group:          Amusements/Graphics
 License:        GPLv2+
@@ -14,6 +14,7 @@ Patch0:         camorama-0.19-fixes.patch
 Patch1:         camorama-0.19-desktop.patch
 # Make it use libv4l1 so it will work with v4l2 devices too
 Patch2:         camorama-0.19-libv4l.patch
+Patch3:         camorama-0.19-no-more-videodev_h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel ORBit2-devel gettext-devel libv4l-devel
 BuildRequires:  intltool desktop-file-utils
@@ -30,6 +31,7 @@ A simple Gnome webcam viewer, with the ability to apply some video effects.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -103,6 +105,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Feb 09 2011 Hans de Goede <hdegoede@redhat.com> - 0.19-4
+- Fix building with kernels >= 2.6.38
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild