sane-backends: Fix build. Fixes #5689
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 16 Feb 2010 23:31:57 +0000 (23:31 +0000)
committerLars-Peter Clausen <lars@metafoo.de>
Tue, 16 Feb 2010 23:31:57 +0000 (23:31 +0000)
SVN-Revision: 19679

utils/sane-backends/patches/010-dont-add-host-include-path.patch [new file with mode: 0644]
utils/sane-backends/patches/020-non-i386-qcam.patch [new file with mode: 0644]

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 (file)
index 0000000..327348d
--- /dev/null
@@ -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 (file)
index 0000000..1e1b631
--- /dev/null
@@ -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)