| 1 |
naota 11/11/17 07:59:03 |
| 2 |
|
| 3 |
Added: sane-backends-1.0.22-freebsd.patch |
| 4 |
Log: |
| 5 |
Add a patch to make it build on FreeBSD. Bug #390089 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.22-freebsd.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: sane-backends-1.0.22-freebsd.patch |
| 16 |
=================================================================== |
| 17 |
--- sanei/sanei_usb.c.orig 2009-07-26 21:29:33.000000000 +0200 |
| 18 |
+++ sanei/sanei_usb.c 2009-07-26 21:31:42.000000000 +0200 |
| 19 |
@@ -96,7 +96,8 @@ |
| 20 |
} |
| 21 |
#endif /* HAVE_USBCALLS */ |
| 22 |
|
| 23 |
-#if defined (__FreeBSD__) |
| 24 |
+#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064)) |
| 25 |
+#include <sys/param.h> |
| 26 |
#include <dev/usb/usb.h> |
| 27 |
#endif /* __FreeBSD__ */ |
| 28 |
#if defined (__DragonFly__) |
| 29 |
@@ -273,7 +274,7 @@ |
| 30 |
*vendorID = vendor; |
| 31 |
*productID = product; |
| 32 |
} |
| 33 |
-#elif defined (__FreeBSD__) || defined (__DragonFly__) |
| 34 |
+#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__) |
| 35 |
{ |
| 36 |
int controller; |
| 37 |
int ctrl_fd; |
| 38 |
--- backend/epson2.c.orig 2010-04-05 22:18:04.000000000 +0900 |
| 39 |
+++ backend/epson2.c 2010-05-10 22:18:47.000000000 +0900 |
| 40 |
@@ -57,6 +57,10 @@ |
| 41 |
#include <unistd.h> |
| 42 |
#include <errno.h> |
| 43 |
#include <sys/time.h> |
| 44 |
+#ifdef __FreeBSD__ |
| 45 |
+#include <sys/types.h> |
| 46 |
+#include <sys/socket.h> |
| 47 |
+#endif |
| 48 |
|
| 49 |
#include "sane/saneopts.h" |
| 50 |
#include "sane/sanei_scsi.h" |
| 51 |
--- include/sane/sanei_tcp.h.orig 2006-11-30 14:23:19.000000000 -0900 |
| 52 |
+++ include/sane/sanei_tcp.h 2009-01-16 05:02:42.000000000 -0900 |
| 53 |
@@ -20,6 +20,9 @@ |
| 54 |
|
| 55 |
#include <sane/sane.h> |
| 56 |
|
| 57 |
+#ifdef __FreeBSD__ |
| 58 |
+#include <sys/types.h> |
| 59 |
+#endif |
| 60 |
#include <netinet/in.h> |
| 61 |
#include <netdb.h> |
| 62 |
|
| 63 |
--- backend/epson2-commands.c.orig 2010-04-05 22:18:04.000000000 +0900 |
| 64 |
+++ backend/epson2-commands.c 2010-05-10 22:24:33.000000000 +0900 |
| 65 |
@@ -21,6 +21,9 @@ |
| 66 |
|
| 67 |
#include <byteorder.h> |
| 68 |
#include <math.h> |
| 69 |
+#ifdef __FreeBSD__ |
| 70 |
+#include <sys/types.h> |
| 71 |
+#endif |
| 72 |
|
| 73 |
#include "epson2.h" |
| 74 |
#include "epson2-io.h" |
| 75 |
--- backend/magicolor.c.orig 2011-01-31 03:49:46.000000000 +0900 |
| 76 |
+++ backend/magicolor.c 2011-08-02 02:38:15.000000000 +0900 |
| 77 |
@@ -50,6 +50,10 @@ |
| 78 |
#include <unistd.h> |
| 79 |
#include <errno.h> |
| 80 |
#include <sys/time.h> |
| 81 |
+#ifdef __FreeBSD__ |
| 82 |
+#include <sys/types.h> |
| 83 |
+#include <sys/socket.h> |
| 84 |
+#endif |
| 85 |
#include <math.h> |
| 86 |
#include <poll.h> |
| 87 |
|
| 88 |
--- backend/xerox_mfp-tcp.c.orig 2010-12-02 08:49:58.000000000 +0900 |
| 89 |
+++ backend/xerox_mfp-tcp.c 2011-08-02 02:37:27.000000000 +0900 |
| 90 |
@@ -27,6 +27,10 @@ |
| 91 |
#include <unistd.h> |
| 92 |
#include <errno.h> |
| 93 |
#include <sys/time.h> |
| 94 |
+#ifdef __FreeBSD__ |
| 95 |
+#include <sys/types.h> |
| 96 |
+#include <sys/socket.h> |
| 97 |
+#endif |
| 98 |
|
| 99 |
#include "sane/saneopts.h" |
| 100 |
#include "sane/sanei_scsi.h" |
Archives