diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-05-01 10:40:47 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-05-01 16:22:39 +0200 |
| commit | ee74dcd9eec27891300dbed6f3652f2b18e4d5fd (patch) | |
| tree | af4e908b7bcf9b79de01af8c1deea3a6cd4a4c89 /package/sane-backends/0002-v4l.patch | |
| parent | 5c612d9b178e49eb3edad53e6f3615f1e8747223 (diff) | |
| download | buildroot-ee74dcd9eec27891300dbed6f3652f2b18e4d5fd.tar.gz buildroot-ee74dcd9eec27891300dbed6f3652f2b18e4d5fd.zip | |
sane-backends: bump to version 1.0.24
Bump sane-backends to a "modern" 1.0.24 version.
Tweak the patches to avoid autoreconf (it doesn't seem to be happy for
me in gentoo).
Disable cups support (checks are wrong and it's no longer required).
Disable systemd support (checks are wrong and we never accounted for
this).
Should fix wine failure (i was unable to build sane-backends before):
http://autobuild.buildroot.net/results/d01/d01a3c7786df8cfd962a27f39283851db45c6165/
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/sane-backends/0002-v4l.patch')
| -rw-r--r-- | package/sane-backends/0002-v4l.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/package/sane-backends/0002-v4l.patch b/package/sane-backends/0002-v4l.patch deleted file mode 100644 index e9bdd20236..0000000000 --- a/package/sane-backends/0002-v4l.patch +++ /dev/null @@ -1,66 +0,0 @@ -From Fedora git: http://pkgs.fedoraproject.org/gitweb/?p=sane-backends.git;a=blob;f=sane-backends-1.0.22-v4l.patch;hb=4c4b8135b896ef9f00b926ce5f435ae5c9b156d5 - -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 - |
