robert pushed to libunicap (el5). "improve libunicap-0.9.12-warnings.patch (#647943)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun May 31 20:10:52 UTC 2015
From 8a09841550bbb4ac611fba2b78159e8cbce4b488 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka at redhat.com>
Date: Tue, 2 Nov 2010 14:19:21 +0100
Subject: improve libunicap-0.9.12-warnings.patch (#647943)
diff --git a/libunicap-0.9.12-warnings.patch b/libunicap-0.9.12-warnings.patch
index e8daf81..31972a9 100644
--- a/libunicap-0.9.12-warnings.patch
+++ b/libunicap-0.9.12-warnings.patch
@@ -153,18 +153,18 @@ index 065501e..7b98daa 100644
FILE *g_logfp = NULL;
int g_log_modules_mask = 0xffff;
diff --git a/cpi/v4l2cpi/buffermanager.c b/cpi/v4l2cpi/buffermanager.c
-index 7c0cbae..9a07ffc 100644
+index 7c0cbae..64cb57f 100644
--- a/cpi/v4l2cpi/buffermanager.c
+++ b/cpi/v4l2cpi/buffermanager.c
-@@ -11,6 +11,8 @@
- #include <errno.h>
- #include <sys/mman.h>
+@@ -21,6 +21,8 @@
+ #define MAX_BUFFERS 16
-+#include <libv4l2.h>
+ #if USE_LIBV4L
++# include <libv4l2.h>
+
- #if V4L2_DEBUG
- #define DEBUG
- #endif
+ #define OPEN v4l2_open
+ #define CLOSE v4l2_close
+ #define IOCTL v4l2_ioctl
@@ -60,8 +62,6 @@ struct buffer_mgr
#define BUFFER_MGR_UNLOCK(mgr) { sem_post( &mgr->lock); }
@@ -197,31 +197,31 @@ index 7c0cbae..9a07ffc 100644
{
int i;
diff --git a/cpi/v4l2cpi/tiseuvccam.c b/cpi/v4l2cpi/tiseuvccam.c
-index 93729a5..b7d1e1b 100644
+index 93729a5..72a3515 100644
--- a/cpi/v4l2cpi/tiseuvccam.c
+++ b/cpi/v4l2cpi/tiseuvccam.c
-@@ -22,6 +22,8 @@
- #include <fcntl.h>
- #include <linux/videodev2.h>
+@@ -37,6 +37,8 @@
+ #define FOURCC(a,b,c,d) (unsigned int)((((unsigned int)d)<<24)+(((unsigned int)c)<<16)+(((unsigned int)b)<<8)+a)
-+#include <libv4l2.h>
+ #if USE_LIBV4L
++# include <libv4l2.h>
+
- #include "uvc_compat.h"
-
- #if V4L2_DEBUG
+ #define OPEN v4l2_open
+ #define CLOSE v4l2_close
+ #define IOCTL v4l2_ioctl
diff --git a/cpi/v4l2cpi/tisuvccam.c b/cpi/v4l2cpi/tisuvccam.c
-index 62ee147..207ff4c 100644
+index 62ee147..029b48d 100644
--- a/cpi/v4l2cpi/tisuvccam.c
+++ b/cpi/v4l2cpi/tisuvccam.c
-@@ -15,6 +15,8 @@
- #include <fcntl.h>
- #include <string.h>
+@@ -39,6 +39,8 @@
-+#include <libv4l2.h>
-+
- #include "uvcvideo.h"
- #if V4L2_DEBUG
+ #if USE_LIBV4L
++# include <libv4l2.h>
++
+ #define OPEN v4l2_open
+ #define CLOSE v4l2_close
+ #define IOCTL v4l2_ioctl
@@ -358,18 +360,6 @@ static struct ppty_info TISUVCPropertyOverrides[] =
}
};
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libunicap.git/commit/?h=el5&id=8a09841550bbb4ac611fba2b78159e8cbce4b488
More information about the scm-commits
mailing list