From 10dfdaf9098330b1480b3b231ec92c2b49432269 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 13 Nov 2015 11:26:01 +0000
Subject: Fix build


diff --git a/backend/epsonds-jpeg.c b/backend/epsonds-jpeg.c
index 62e8bb5..a8bc98f 100644
--- a/backend/epsonds-jpeg.c
+++ b/backend/epsonds-jpeg.c
@@ -15,6 +15,10 @@
 
 #include "sane/config.h"
 
+#ifdef __HAIKU__
+#define _STDLIB_H_
+#endif
+
 #include <math.h>
 
 #include "epsonds.h"
@@ -49,8 +53,8 @@ jpeg_term_source(j_decompress_ptr __sane_unused__ cinfo)
 METHODDEF(boolean)
 jpeg_fill_input_buffer(j_decompress_ptr cinfo)
 {
-	epsonds_src_mgr *src = (epsonds_src_mgr *)cinfo->src;
 	int avail, size;
+	epsonds_src_mgr *src = (epsonds_src_mgr *)cinfo->src;
 
 	/* read from the scanner or the ring buffer */
 
diff --git a/backend/pixma_bjnp.c b/backend/pixma_bjnp.c
index fc4c501..76e058e 100644
--- a/backend/pixma_bjnp.c
+++ b/backend/pixma_bjnp.c
@@ -106,6 +106,10 @@
 # define SSIZE_MAX      LONG_MAX
 #endif 
 
+#ifdef __HAIKU__
+#undef HAVE_IFADDRS_H
+#endif
+
 /* static data */
 static bjnp_device_t device[BJNP_NO_DEVICES];
 static int bjnp_no_devices = 0;
diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c
index fcf52c1..5a1d63e 100644
--- a/sanei/sanei_thread.c
+++ b/sanei/sanei_thread.c
@@ -484,6 +484,7 @@ SANE_Pid
 sanei_thread_waitpid( SANE_Pid pid, int *status )
 {
 #ifdef USE_PTHREAD
+	int rc;
 	int *ls;
 #else
 	int ls;
@@ -496,7 +497,6 @@ sanei_thread_waitpid( SANE_Pid pid, int *status )
 	DBG(2, "sanei_thread_waitpid() - %ld\n",
 	    sanei_thread_pid_to_long(pid));
 #ifdef USE_PTHREAD
-	int rc;
 	rc = pthread_join( (pthread_t)pid, (void*)&ls );
 
 	if( 0 == rc ) {
diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
index e4b23dc..e066904 100644
--- a/sanei/sanei_usb.c
+++ b/sanei/sanei_usb.c
@@ -2203,6 +2203,7 @@ sanei_usb_clear_halt (SANE_Int dn)
       return SANE_STATUS_INVAL;
     }
 
+#ifndef __HAIKU__
 #ifdef HAVE_LIBUSB_LEGACY
   int ret;
 
@@ -2253,6 +2254,7 @@ sanei_usb_clear_halt (SANE_Int dn)
 #else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   DBG (1, "sanei_usb_clear_halt: libusb support missing\n");
 #endif /* HAVE_LIBUSB_LEGACY || HAVE_LIBUSB */
+#endif
 
   return SANE_STATUS_GOOD;
 }
-- 
2.12.2


From 2c883078ed6859a1ea0abb596a82ba298500ae6b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 13 Nov 2015 11:38:32 +0000
Subject: Disable IPV6 for pixma_bjnp


diff --git a/backend/pixma_bjnp.c b/backend/pixma_bjnp.c
index 76e058e..898b6dd 100644
--- a/backend/pixma_bjnp.c
+++ b/backend/pixma_bjnp.c
@@ -108,6 +108,7 @@
 
 #ifdef __HAIKU__
 #undef HAVE_IFADDRS_H
+#undef ENABLE_IPV6
 #endif
 
 /* static data */
-- 
2.12.2


From fe16c0067c163a300cb46260c958b9a7a3a6cac4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 16 Nov 2015 11:13:48 +0000
Subject: Disable libusb context for Haiku


diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
index e066904..75330bd 100644
--- a/sanei/sanei_usb.c
+++ b/sanei/sanei_usb.c
@@ -489,7 +489,12 @@ sanei_usb_init (void)
   if (!sanei_usb_ctx)
     {
       DBG (4, "%s: initializing libusb-1.0\n", __func__);
+#ifdef __HAIKU__
+      ret = libusb_init (NULL);
+      sanei_usb_ctx = -1;
+#else
       ret = libusb_init (&sanei_usb_ctx);
+#endif      
       if (ret < 0)
 	{
 	  DBG (1,
@@ -547,7 +552,11 @@ int i;
 #ifdef HAVE_LIBUSB
       if (sanei_usb_ctx)
         {
+#ifdef __HAIKU__
+          libusb_exit (NULL);
+#else
           libusb_exit (sanei_usb_ctx);
+#endif          
 	  /* reset libusb-1.0 context */
 	  sanei_usb_ctx=NULL;
         }
@@ -871,7 +880,11 @@ static void libusb_scan_devices(void)
 
   DBG (4, "%s: Looking for libusb-1.0 devices\n", __func__);
 
+#ifdef __HAIKU__
+  ndev = libusb_get_device_list (NULL, &devlist);
+#else
   ndev = libusb_get_device_list (sanei_usb_ctx, &devlist);
+#endif  
   if (ndev < 0)
     {
       DBG (1,
-- 
2.12.2


From fe9bfb40c23549ca27dbe9532f4f348179d0d7c6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 4 Jun 2017 12:22:31 +0200
Subject: missing includes


diff --git a/backend/epsonds.c b/backend/epsonds.c
index 218e08c..d402f58 100644
--- a/backend/epsonds.c
+++ b/backend/epsonds.c
@@ -41,6 +41,12 @@
 #include "sane/config.h"
 
 #include <ctype.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
 #include <unistd.h>
 
 #include "sane/saneopts.h"
-- 
2.12.2