From: Romain Naour Date: Sat, 10 Jan 2015 15:11:00 +0000 (+0100) Subject: package/sane-backends: rename patches to the new naming convention X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8c9a66cba3758b588af631856d665049254b721f;p=buildroot.git package/sane-backends: rename patches to the new naming convention Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- diff --git a/package/sane-backends/0001-qcam-x86.patch b/package/sane-backends/0001-qcam-x86.patch new file mode 100644 index 0000000000..f14dd0e980 --- /dev/null +++ b/package/sane-backends/0001-qcam-x86.patch @@ -0,0 +1,61 @@ +[PATCH] backend/qcam.c: fix build on !x86 + +inb/outb/ioperm are x86 specific interfaces, so replace with noops on +!x86. + +Inspired by similar patch in openwrt: +https://dev.openwrt.org/ticket/5689 + +Signed-off-by: Peter Korsgaard +--- + backend/qcam.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +Index: sane-backends-1.0.22/backend/qcam.c +=================================================================== +--- sane-backends-1.0.22.orig/backend/qcam.c ++++ sane-backends-1.0.22/backend/qcam.c +@@ -205,12 +205,20 @@ + + #endif /* || || */ + ++/* inb / outb only exist on x86 */ ++#if defined(__i386__) || defined(__x86_64__) + #define read_lpdata(d) inb ((d)->port) + #define read_lpstatus(d) inb ((d)->port + 1) + #define read_lpcontrol(d) inb ((d)->port + 2) + #define write_lpdata(d,v) outb ((v), (d)->port) + #define write_lpcontrol(d,v) outb ((v), (d)->port + 2) +- ++#else ++#define read_lpdata(d) 0 ++#define read_lpstatus(d) 0 ++#define read_lpcontrol(d) 0 ++#define write_lpdata(d,v) ++#define write_lpcontrol(d,v) ++#endif + + static SANE_Status + enable_ports (QC_Device * q) +@@ -219,8 +227,10 @@ + if (q->port < 0x278 || q->port > 0x3bc) + return SANE_STATUS_INVAL; + ++#if defined(__i386__) || defined(__x86_64__) + if (ioperm (q->port, 3, 1) < 0) + return SANE_STATUS_INVAL; ++#endif + + return SANE_STATUS_GOOD; + } +@@ -228,8 +238,10 @@ + static SANE_Status + disable_ports (QC_Device * q) + { ++#if defined(__i386__) || defined(__x86_64__) + if (ioperm (q->port, 3, 0) < 0) + return SANE_STATUS_INVAL; ++#endif + + return SANE_STATUS_GOOD; + } diff --git a/package/sane-backends/0002-v4l.patch b/package/sane-backends/0002-v4l.patch new file mode 100644 index 0000000000..e9bdd20236 --- /dev/null +++ b/package/sane-backends/0002-v4l.patch @@ -0,0 +1,66 @@ +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 +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE +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 +--- + 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 ++#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 + diff --git a/package/sane-backends/sane-backends-1.0.22-qcam-x86.patch b/package/sane-backends/sane-backends-1.0.22-qcam-x86.patch deleted file mode 100644 index f14dd0e980..0000000000 --- a/package/sane-backends/sane-backends-1.0.22-qcam-x86.patch +++ /dev/null @@ -1,61 +0,0 @@ -[PATCH] backend/qcam.c: fix build on !x86 - -inb/outb/ioperm are x86 specific interfaces, so replace with noops on -!x86. - -Inspired by similar patch in openwrt: -https://dev.openwrt.org/ticket/5689 - -Signed-off-by: Peter Korsgaard ---- - backend/qcam.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -Index: sane-backends-1.0.22/backend/qcam.c -=================================================================== ---- sane-backends-1.0.22.orig/backend/qcam.c -+++ sane-backends-1.0.22/backend/qcam.c -@@ -205,12 +205,20 @@ - - #endif /* || || */ - -+/* inb / outb only exist on x86 */ -+#if defined(__i386__) || defined(__x86_64__) - #define read_lpdata(d) inb ((d)->port) - #define read_lpstatus(d) inb ((d)->port + 1) - #define read_lpcontrol(d) inb ((d)->port + 2) - #define write_lpdata(d,v) outb ((v), (d)->port) - #define write_lpcontrol(d,v) outb ((v), (d)->port + 2) -- -+#else -+#define read_lpdata(d) 0 -+#define read_lpstatus(d) 0 -+#define read_lpcontrol(d) 0 -+#define write_lpdata(d,v) -+#define write_lpcontrol(d,v) -+#endif - - static SANE_Status - enable_ports (QC_Device * q) -@@ -219,8 +227,10 @@ - if (q->port < 0x278 || q->port > 0x3bc) - return SANE_STATUS_INVAL; - -+#if defined(__i386__) || defined(__x86_64__) - if (ioperm (q->port, 3, 1) < 0) - return SANE_STATUS_INVAL; -+#endif - - return SANE_STATUS_GOOD; - } -@@ -228,8 +238,10 @@ - static SANE_Status - disable_ports (QC_Device * q) - { -+#if defined(__i386__) || defined(__x86_64__) - if (ioperm (q->port, 3, 0) < 0) - return SANE_STATUS_INVAL; -+#endif - - return SANE_STATUS_GOOD; - } diff --git a/package/sane-backends/sane-backends-1.0.22-v4l.patch b/package/sane-backends/sane-backends-1.0.22-v4l.patch deleted file mode 100644 index e9bdd20236..0000000000 --- a/package/sane-backends/sane-backends-1.0.22-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 -Date: Mon, 14 Mar 2011 13:35:05 +0100 -Subject: [PATCH] patch: v4l - -Squashed commit of the following: - -commit 23381932c76846191b42a48e505b37cd74711265 -Author: Julien BLACHE -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 ---- - 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 -+#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 -