From d758e9b3b0b93ebecf99f95f2497ed2cb8d2bf97 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 16 Feb 2010 23:31:57 +0000 Subject: [PATCH] sane-backends: Fix build. Fixes #5689 SVN-Revision: 19679 --- .../010-dont-add-host-include-path.patch | 14 +++++++++++++ .../patches/020-non-i386-qcam.patch | 20 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 utils/sane-backends/patches/010-dont-add-host-include-path.patch create mode 100644 utils/sane-backends/patches/020-non-i386-qcam.patch 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 000000000..327348d29 --- /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 000000000..1e1b631bd --- /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) -- 2.30.2