forked from pool/luvcview
Accepting request 75641 from graphics
- Add luvcview-v4l-2.6.38.patch: use new v4l interface OBS-URL: https://build.opensuse.org/request/show/75641 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/luvcview?expand=0&rev=10
This commit is contained in:
commit
f48b1a7958
38
luvcview-v4l-2.6.38.patch
Normal file
38
luvcview-v4l-2.6.38.patch
Normal file
@ -0,0 +1,38 @@
|
||||
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"
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 7 10:30:12 UTC 2011 - idonmez@novell.com
|
||||
|
||||
- Add luvcview-v4l-2.6.38.patch: use new v4l interface
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 18 11:20:04 CEST 2010 - ro@suse.de
|
||||
|
||||
|
@ -18,10 +18,9 @@
|
||||
|
||||
|
||||
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
|
||||
@ -34,6 +33,7 @@ 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 @@ Authors:
|
||||
%prep
|
||||
%setup -n luvcview-%version
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
%patch2
|
||||
%if 0%{?suse_version} >= 1210
|
||||
%patch3 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
make
|
||||
|
Loading…
x
Reference in New Issue
Block a user