[libwebcam] Remove V4Lv1 header (removed in kernel 2.6.38+)

mooninite mooninite at fedoraproject.org
Wed Feb 9 01:48:36 UTC 2011


commit cdad1daebb01cc33295f6234e05cd226e112921f
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Tue Feb 8 19:47:16 2011 -0600

    Remove V4Lv1 header (removed in kernel 2.6.38+)
    
    Signed-off-by: Michael Cronenworth <mike at cchtml.com>

 libwebcam-v4l1.patch |   10 ++++++++++
 libwebcam.spec       |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/libwebcam-v4l1.patch b/libwebcam-v4l1.patch
new file mode 100644
index 0000000..ed658c6
--- /dev/null
+++ b/libwebcam-v4l1.patch
@@ -0,0 +1,10 @@
+--- a/libwebcam/compat.h	2010-07-12 19:14:52.000000000 -0500
++++ b/libwebcam/compat.h	2011-02-08 19:34:21.360502670 -0600
+@@ -27,7 +27,6 @@
+ #ifndef C_COMPAT_H
+ #define C_COMPAT_H
+
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+
+ #ifdef USE_UVCVIDEO
diff --git a/libwebcam.spec b/libwebcam.spec
index b2048c4..3cfda6d 100644
--- a/libwebcam.spec
+++ b/libwebcam.spec
@@ -1,6 +1,6 @@
 Name:           libwebcam
 Version:        0.2.0
-Release:        2.20100322svn%{?dist}
+Release:        3.20100322svn%{?dist}
 Summary:        A library for user-space configuration of the uvcvideo driver
 Group:          System Environment/Libraries
 License:        LGPLv3+
@@ -15,6 +15,7 @@ Patch0:         libwebcam-uvc-make.patch
 Patch1:         libwebcam-0.2.0-button-menu.patch
 Patch2:         libwebcam-uvcvideo-h.patch
 Patch3:         libwebcam-0.2.0-udev-log.patch
+Patch4:         libwebcam-v4l1.patch
 
 BuildRequires: cmake
 BuildRequires: gengetopt
@@ -66,6 +67,7 @@ XML control file for the uvcdynctrl package.
 cp -p %{SOURCE1} common/include
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 08 2011 Michael Cronenworth <mike at cchtml.com> - 0.2.0-3.20100322svn
+- Remove V4Lv1 header (removed in kernel 2.6.38+)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-2.20100322svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list