packages: gqcam/gqcam.spec, gqcam/no-more-videodev_h.patch (NEW) - v4l1 pat...

[glen]

Author: glen                         Date: Thu Dec 29 21:34:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- v4l1 patching

---- Files affected:
packages/gqcam:
   gqcam.spec (1.14 -> 1.15) , no-more-videodev_h.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gqcam/gqcam.spec
diff -u packages/gqcam/gqcam.spec:1.14 packages/gqcam/gqcam.spec:1.15
--- packages/gqcam/gqcam.spec:1.14	Thu Dec 29 22:29:25 2011
+++ packages/gqcam/gqcam.spec	Thu Dec 29 22:34:43 2011
@@ -12,6 +12,7 @@
 # Source0-md5:	d1f2eecec0dbd4dd88543986b47e2015
 Patch0:		ftp://ftp.debian.org/debian/pool/main/g/gqcam/%{name}_%{version}-4.diff.gz
 # Patch0-md5:	7ab126a358fe2147a9f5a217b8b99c6c
+Patch1:		no-more-videodev_h.patch
 URL:		http://cse.unl.edu/~cluening/gqcam/
 BuildRequires:	gtk+-devel
 BuildRequires:	libjpeg-devel
@@ -65,6 +66,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -90,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/12/29 21:34:43  glen
+- v4l1 patching
+
 Revision 1.14  2011/12/29 21:29:25  glen
 - apply debian patch; still does not compile
 

================================================================
Index: packages/gqcam/no-more-videodev_h.patch
diff -u /dev/null packages/gqcam/no-more-videodev_h.patch:1.1
--- /dev/null	Thu Dec 29 22:34:48 2011
+++ packages/gqcam/no-more-videodev_h.patch	Thu Dec 29 22:34:43 2011
@@ -0,0 +1,103 @@
+--- gqcam-0.9.1/./gqcam.c~	2011-12-29 23:30:14.000000000 +0200
++++ gqcam-0.9.1/./gqcam.c	2011-12-29 23:30:55.283869869 +0200
+@@ -29,8 +29,7 @@
+ #include <pthread.h>
+ #include <semaphore.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h> 
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <signal.h>
+ #include <png.h>
+ 
+--- gqcam-0.9.1/./frontend.c~	2011-12-29 23:30:14.000000000 +0200
++++ gqcam-0.9.1/./frontend.c	2011-12-29 23:31:11.887968672 +0200
+@@ -30,7 +30,7 @@
+ #include <linux/types.h> 
+ #include <gtk/gtk.h>
+ #include <glib.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <png.h>
+ 
+ #include "config.h"
+--- gqcam-0.9.1/./preferences.c~	2005-04-04 04:25:09.000000000 +0300
++++ gqcam-0.9.1/./preferences.c	2011-12-29 23:31:22.855140937 +0200
+@@ -30,7 +30,7 @@
+ #include <linux/types.h> 
+ #include <gtk/gtk.h>
+ #include <glib.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <png.h>
+ 
+ #include "gqcam.h"
+--- gqcam-0.9.1/./color.c~	2005-04-04 04:25:09.000000000 +0300
++++ gqcam-0.9.1/./color.c	2011-12-29 23:31:33.058944678 +0200
+@@ -10,7 +10,7 @@
+ #include <pthread.h>
+ #include <linux/types.h> 
+ #include <gtk/gtk.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <png.h>
+ 
+ #include "gqcam.h"
+--- gqcam-0.9.1/./greyscale.c~	2005-04-04 04:25:09.000000000 +0300
++++ gqcam-0.9.1/./greyscale.c	2011-12-29 23:31:41.766012749 +0200
+@@ -28,7 +28,7 @@
+ #include <pthread.h>
+ #include <linux/types.h> 
+ #include <gtk/gtk.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <png.h>
+ 
+ #include "gqcam.h"
+--- gqcam-0.9.1/./save.c~	2005-04-04 04:25:09.000000000 +0300
++++ gqcam-0.9.1/./save.c	2011-12-29 23:31:52.516508362 +0200
+@@ -27,8 +27,7 @@
+ #include <fcntl.h>
+ #include <pthread.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h> 
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <stdio.h>
+ #include <jpeglib.h>
+ #include <png.h>
+--- gqcam-0.9.1/./timer.c~	2005-04-04 04:25:09.000000000 +0300
++++ gqcam-0.9.1/./timer.c	2011-12-29 23:32:00.806890556 +0200
+@@ -27,8 +27,7 @@
+ #include <fcntl.h>
+ #include <pthread.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h> 
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <stdio.h>
+ #include <jpeglib.h>
+ #include <png.h>
+--- gqcam-0.9.1/./filters.c~	2005-04-04 04:25:09.000000000 +0300
++++ gqcam-0.9.1/./filters.c	2011-12-29 23:32:08.380573047 +0200
+@@ -29,8 +29,7 @@
+ #include <pthread.h>
+ #include <semaphore.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h> 
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <signal.h>
+ #include <png.h>
+ 
+--- gqcam-0.9.1/./yuv_to_rgb.c~	2011-12-29 23:30:14.000000000 +0200
++++ gqcam-0.9.1/./yuv_to_rgb.c	2011-12-29 23:32:16.967635588 +0200
+@@ -21,7 +21,7 @@
+ #define OV511_ALLOW_CONVERSION
+ 
+ #include <sys/time.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ 
+ #include "yuv_to_rgb.h"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gqcam/gqcam.spec?r1=1.14&r2=1.15&f=u