Hello community,

here is the log from the commit of package luvcview for openSUSE:Factory
checked in at Thu Jul 7 14:38:09 CEST 2011.



--------
--- luvcview/luvcview.changes   2010-05-18 11:20:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/luvcview/luvcview.changes      2011-07-07 
12:40:54.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul  7 10:30:12 UTC 2011 - [email protected]
+
+- Add luvcview-v4l-2.6.38.patch: use new v4l interface 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  luvcview-v4l-2.6.38.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ luvcview.spec ++++++
--- /var/tmp/diff_new_pack.iLaMUa/_old  2011-07-07 14:35:13.000000000 +0200
+++ /var/tmp/diff_new_pack.iLaMUa/_new  2011-07-07 14:35:13.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package luvcview (Version 20070512)
+# spec file for package luvcview
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,22 +18,22 @@
 
 
 Name:           luvcview
-%if %suse_version >= 1020
 BuildRequires:  SDL-devel SDL_image-devel
-%else
-BuildRequires:  SDL-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires:  libv4l-devel >= 0.8.4
 %endif
 AutoReqProv:    on
 Group:          Productivity/Multimedia/Video/Players
 Summary:        Simple V4L2 application using sdl
 Version:        20070512
-Release:        5
+Release:        15
 Source:         %name-%version.src.tar.gz
 Url:            http://mxhaard.free.fr/spca50x/Investigation/uvc/  
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch1:         luvcview-add-COPYING.patch
 Patch2:         luvcview-memory-leaks.patch
+Patch3:         luvcview-v4l-2.6.38.patch
 
 %description
 luvcview is a simple V4L2 application using sdl
@@ -48,7 +48,10 @@
 %prep
 %setup -n luvcview-%version
 %patch1 -p1
-%patch2 -p0
+%patch2
+%if 0%{?suse_version} >= 1210
+%patch3 -p1
+%endif
 
 %build
 make

++++++ luvcview-v4l-2.6.38.patch ++++++
diff -ur luvcview-20070512.orig/luvcview.c luvcview-20070512/luvcview.c
--- luvcview-20070512.orig/luvcview.c   2011-07-07 12:27:31.814089063 +0200
+++ luvcview-20070512/luvcview.c        2011-07-07 12:37:58.042088992 +0200
@@ -33,7 +33,8 @@
 #include <SDL/SDL_thread.h>
 #include <SDL/SDL_audio.h>
 #include <SDL/SDL_timer.h>
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#include <linux/videodev2.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <errno.h>
diff -ur luvcview-20070512.orig/uvcvideo.h luvcview-20070512/uvcvideo.h
--- luvcview-20070512.orig/uvcvideo.h   2011-07-07 12:27:31.814089063 +0200
+++ luvcview-20070512/uvcvideo.h        2011-07-07 12:27:59.861089061 +0200
@@ -2,7 +2,7 @@
 #define _USB_VIDEO_H_
 
 #include <linux/kernel.h>
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
 
 /* Compatibility */
 #include "uvc_compat.h"
diff -ur luvcview-20070512.orig/v4l2uvc.h luvcview-20070512/v4l2uvc.h
--- luvcview-20070512.orig/v4l2uvc.h    2011-07-07 12:27:31.814089063 +0200
+++ luvcview-20070512/v4l2uvc.h 2011-07-07 12:31:34.604089036 +0200
@@ -29,7 +29,8 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/select.h>
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
+#include <linux/videodev2.h>
 #include "avilib.h"
 
 #include "uvcvideo.h"

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to