summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen2010-02-16 23:31:57 +0000
committerLars-Peter Clausen2010-02-16 23:31:57 +0000
commitb13579e381c36db699d39dd1f5c064ac061559cc (patch)
treee9191a18345841e0d900eee9bb1ffbc82f660d57
parentd56b07e9e21dd81f916d21467b1fec49960320f5 (diff)
downloadarchive-b13579e381c36db699d39dd1f5c064ac061559cc.tar.gz
[packages] sane-backends: Fix build. Fixes #5689
SVN-Revision: 19679
-rw-r--r--utils/sane-backends/patches/010-dont-add-host-include-path.patch14
-rw-r--r--utils/sane-backends/patches/020-non-i386-qcam.patch20
2 files changed, 34 insertions, 0 deletions
diff --git a/utils/sane-backends/patches/010-dont-add-host-include-path.patch b/utils/sane-backends/patches/010-dont-add-host-include-path.patch
new file mode 100644
index 0000000000..327348d29f
--- /dev/null
+++ b/utils/sane-backends/patches/010-dont-add-host-include-path.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure
+index cc79209..5f22d58 100755
+--- a/configure
++++ b/configure
+@@ -5019,9 +5019,6 @@ else
+ fi
+
+
+-INCLUDES="${INCLUDES} -I/usr/local/include"
+-
+-
+ if test "${ac_cv_c_compiler_gnu}" = "yes"; then
+ NORMAL_CFLAGS="\
+ -W \
diff --git a/utils/sane-backends/patches/020-non-i386-qcam.patch b/utils/sane-backends/patches/020-non-i386-qcam.patch
new file mode 100644
index 0000000000..1e1b631bde
--- /dev/null
+++ b/utils/sane-backends/patches/020-non-i386-qcam.patch
@@ -0,0 +1,20 @@
+--- ./backend/qcam.c.orig 2009-12-01 06:11:04.000000000 +0000
++++ ./backend/qcam.c 2009-12-01 15:12:40.000000000 +0000
+@@ -105,6 +105,17 @@
+
+ #include "qcam.h"
+
++#ifndef __i386__
++static inline unsigned char inb(unsigned int port)
++{
++ return 0;
++}
++
++static inline void outb(unsigned char value, unsigned int port)
++{
++}
++#endif
++
+ /* status bits */
+ #define NeedRamTable (1 << 1)
+ #define BlackBalanceInProgress (1 << 6)