package/sane-backends: remove unneeded first patch

This patch is not needed since version 1.0.25 and
https://gitlab.com/sane-project/backends/commit/8434ea91623f313eeb68ac301f7c7abf65976fc8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/sane-backends/0001-qcam-x86.patch b/package/sane-backends/0001-qcam-x86.patch
deleted file mode 100644 (file)
index f14dd0e..0000000
--- a/package/sane-backends/0001-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 <jacmet@sunsite.dk>
----
- 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 /* <sys/io.h> || <asm/io.h> || <sys/hw.h> */
- 
-+/* 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/0001-sane_backend-add-missing-config.h.patch b/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
new file mode 100644 (file)
index 0000000..8e56b02
--- /dev/null
+++ b/package/sane-backends/0001-sane_backend-add-missing-config.h.patch
@@ -0,0 +1,49 @@
+From 13aadf79659dd238b618c8be7c1de44960bd5d50 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 11 Nov 2016 22:20:03 +0100
+Subject: [PATCH] sane_backend: add missing config.h
+
+We should include config.h from sanei_backend.h in order to use the
+correct if/else HAVE_FOO.
+
+For some reason with Glibc or uClibc there is no problem but with musl
+we have the following weird issue:
+
+In file included from epsonds.h:41:0,
+                 from epsonds-jpeg.c:18:
+../include/sane/sanei_backend.h:99:33: error: expected ';', identifier or '(' before 'int'
+ # define sigset_t               int
+                                 ^
+../include/sane/sanei_backend.h:99:33: warning: useless type name in empty declaration
+
+That's because HAVE_SIGPROCMASK is not defined although it's correctly
+detected by the configure script.
+
+$ grep config.log
+config.log:#define HAVE_SIGPROCMASK 1
+
+So, include config.h to avoid to redefine sigset_t.
+
+Fixes:
+http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ include/sane/sanei_backend.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h
+index 1b5afe2..2a96532 100644
+--- a/include/sane/sanei_backend.h
++++ b/include/sane/sanei_backend.h
+@@ -8,6 +8,7 @@
+  * @sa sanei.h sanei_thread.h
+  */
+ 
++#include "../include/sane/config.h"
+ 
+ /*
+  * Compiler related options
+-- 
+2.5.5
+

diff --git a/package/sane-backends/0002-sane_backend-add-missing-config.h.patch b/package/sane-backends/0002-sane_backend-add-missing-config.h.patch
deleted file mode 100644 (file)
index 8e56b02..0000000
--- a/package/sane-backends/0002-sane_backend-add-missing-config.h.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 13aadf79659dd238b618c8be7c1de44960bd5d50 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 11 Nov 2016 22:20:03 +0100
-Subject: [PATCH] sane_backend: add missing config.h
-
-We should include config.h from sanei_backend.h in order to use the
-correct if/else HAVE_FOO.
-
-For some reason with Glibc or uClibc there is no problem but with musl
-we have the following weird issue:
-
-In file included from epsonds.h:41:0,
-                 from epsonds-jpeg.c:18:
-../include/sane/sanei_backend.h:99:33: error: expected ';', identifier or '(' before 'int'
- # define sigset_t               int
-                                 ^
-../include/sane/sanei_backend.h:99:33: warning: useless type name in empty declaration
-
-That's because HAVE_SIGPROCMASK is not defined although it's correctly
-detected by the configure script.
-
-$ grep config.log
-config.log:#define HAVE_SIGPROCMASK 1
-
-So, include config.h to avoid to redefine sigset_t.
-
-Fixes:
-http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- include/sane/sanei_backend.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h
-index 1b5afe2..2a96532 100644
---- a/include/sane/sanei_backend.h
-+++ b/include/sane/sanei_backend.h
-@@ -8,6 +8,7 @@
-  * @sa sanei.h sanei_thread.h
-  */
- 
-+#include "../include/sane/config.h"
- 
- /*
-  * Compiler related options
--- 
-2.5.5
-