sane-backends/sane-backends-1.0.21-v4l.patch
Dan Horák f6788efbc8 updated for newer libv4l
Conflicts:

	sane-backends.spec
2011-03-09 14:44:08 +01:00

36 lines
1023 B
Diff

diff -up sane-backends-1.0.21/backend/v4l.c.orig sane-backends-1.0.21/backend/v4l.c
--- sane-backends-1.0.21/backend/v4l.c.orig 2011-03-09 14:20:57.000000000 +0100
+++ sane-backends-1.0.21/backend/v4l.c 2011-03-09 14:21:05.000000000 +0100
@@ -84,10 +84,10 @@
#include "../include/sane/sanei_config.h"
#define V4L_CONFIG_FILE "v4l.conf"
-#include "v4l.h"
-
#include <libv4l1.h>
+#include "v4l.h"
+
static const SANE_Device **devlist = NULL;
static int num_devices;
static V4L_Device *first_dev;
diff -up sane-backends-1.0.21/backend/v4l.h.orig sane-backends-1.0.21/backend/v4l.h
--- sane-backends-1.0.21/backend/v4l.h.orig 2011-03-09 14:11:26.000000000 +0100
+++ sane-backends-1.0.21/backend/v4l.h 2011-03-09 14:11:39.000000000 +0100
@@ -29,6 +29,7 @@
#ifndef v4l_h
#define v4l_h
+#if 0
/* Kernel interface */
/* Only the stuff we need. For more features, more defines are needed */
@@ -165,6 +166,7 @@ struct video_channel
/* end of kernel interface */
+#endif
#include <../include/sane/sane.h>