diff options
| author | piernov <piernov@piernov.org> | 2012-02-22 17:20:46 +0100 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2012-02-22 17:20:46 +0100 |
| commit | e79e1122d6de9845cb6170e3182c2f61fb2abb8f (patch) | |
| tree | 5d3b988050539741c35ed9300838c835857c1551 /sane/sane-libv4l-0.8.3.patch | |
| parent | bfe4f4e4670074c930afaa3666d9ad139f1e181b (diff) | |
| download | gnome3-e79e1122d6de9845cb6170e3182c2f61fb2abb8f.tar.gz gnome3-e79e1122d6de9845cb6170e3182c2f61fb2abb8f.tar.bz2 gnome3-e79e1122d6de9845cb6170e3182c2f61fb2abb8f.tar.xz gnome3-e79e1122d6de9845cb6170e3182c2f61fb2abb8f.zip | |
sane dans extra
Diffstat (limited to 'sane/sane-libv4l-0.8.3.patch')
| -rw-r--r-- | sane/sane-libv4l-0.8.3.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/sane/sane-libv4l-0.8.3.patch b/sane/sane-libv4l-0.8.3.patch deleted file mode 100644 index 2417521..0000000 --- a/sane/sane-libv4l-0.8.3.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Mon, 14 Mar 2011 13:35:05 +0100 -Subject: [PATCH] patch: v4l - -Squashed commit of the following: - -commit 23381932c76846191b42a48e505b37cd74711265 -Author: Julien BLACHE <jb@jblache.org> -Date: Wed Feb 16 19:37:43 2011 +0100 - - Fix v4l build with libv4l 0.8.3+ - - (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) - - Conflicts: - - ChangeLog - - Signed-off-by: Nils Philippsen <nils@redhat.com> ---- - backend/v4l.c | 3 +-- - backend/v4l.h | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backend/v4l.c b/backend/v4l.c -index 6510ef0..38595ed 100644 ---- a/backend/v4l.c -+++ b/backend/v4l.c -@@ -84,9 +84,8 @@ - #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; -diff --git a/backend/v4l.h b/backend/v4l.h -index 588b96e..6aee586 100644 ---- a/backend/v4l.h -+++ b/backend/v4l.h -@@ -29,6 +29,7 @@ - #ifndef v4l_h - #define v4l_h - -+#ifndef __LINUX_VIDEODEV_H - /* Kernel interface */ - /* Only the stuff we need. For more features, more defines are needed */ - -@@ -165,7 +166,7 @@ struct video_channel - - - /* end of kernel interface */ -- -+#endif /* !__LINUX_VIDEODEV_H */ - - #include <../include/sane/sane.h> - --- -1.7.4 - - |