Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 10 years ago
parent
commit
d94b438a78

+ 1 - 1
package/sane-backends/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		sane-backends
 PKG_VERSION:=		1.0.22
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		fadf56a60f4776bfb24491f66b617cf5
 PKG_DESCR:=		Scanner access now easy
 PKG_SECTION:=		misc

+ 12 - 0
package/sane-backends/patches/patch-backend_canon630u-common_c

@@ -0,0 +1,12 @@
+--- sane-backends-1.0.22.orig/backend/canon630u-common.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/canon630u-common.c	2014-03-18 08:33:31.000000000 +0100
+@@ -58,9 +58,7 @@
+ #include <unistd.h>		/* usleep */
+ #include <time.h>
+ #include <math.h>               /* exp() */
+-#ifdef HAVE_OS2_H
+ #include <sys/types.h> 		/* mode_t */
+-#endif
+ #include <sys/stat.h>
+ #include "lm9830.h"
+ 

+ 10 - 0
package/sane-backends/patches/patch-backend_epson2-commands_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/epson2-commands.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/epson2-commands.c	2014-03-18 08:34:27.000000000 +0100
+@@ -19,6 +19,7 @@
+ 
+ #include "sane/config.h"
+ 
++#include <sys/types.h>
+ #include <byteorder.h>
+ #include <math.h>
+ 

+ 10 - 0
package/sane-backends/patches/patch-backend_genesys_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/genesys.c	2011-02-14 00:10:18.000000000 +0100
++++ sane-backends-1.0.22/backend/genesys.c	2014-03-18 08:36:00.000000000 +0100
+@@ -65,6 +65,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <math.h>
+ 

+ 10 - 0
package/sane-backends/patches/patch-backend_genesys_h

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/genesys.h	2011-01-16 02:01:28.000000000 +0100
++++ sane-backends-1.0.22/backend/genesys.h	2014-03-18 08:36:42.000000000 +0100
+@@ -52,6 +52,7 @@
+ */
+ #undef UNIT_TESTING
+ 
++#include <sys/types.h>
+ #include "genesys_low.h"
+ 
+ #define FREE_IFNOT_NULL(x)		if(x!=NULL) { free(x); x=NULL;}

+ 10 - 0
package/sane-backends/patches/patch-backend_genesys_low_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/genesys_low.c	2011-02-14 00:10:18.000000000 +0100
++++ sane-backends-1.0.22/backend/genesys_low.c	2014-03-18 08:37:27.000000000 +0100
+@@ -46,6 +46,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <math.h>
+ 

+ 10 - 0
package/sane-backends/patches/patch-backend_hp3900_rts8822_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/hp3900_rts8822.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/hp3900_rts8822.c	2014-03-18 08:38:21.000000000 +0100
+@@ -64,6 +64,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>		/* bzero()   */
++#include <sys/types.h>
+ #include <time.h>		/* clock()   */
+ #include <math.h>		/* truncf()  */
+ #include <ctype.h>		/* tolower() */

+ 10 - 0
package/sane-backends/patches/patch-backend_hp5400_sanei_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/hp5400_sanei.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/hp5400_sanei.c	2014-03-18 08:39:35.000000000 +0100
+@@ -56,6 +56,7 @@
+ #include "hp5400_xfer.h"
+ #include "hp5400_debug.h"
+ #include <stdio.h>
++#include <sys/types.h>
+ #include "../include/sane/sanei_usb.h"
+ 
+ #define CMD_INITBULK1   0x0087	/* send 0x14 */

+ 10 - 0
package/sane-backends/patches/patch-backend_hp5590_low_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/hp5590_low.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/hp5590_low.c	2014-03-18 08:38:55.000000000 +0100
+@@ -46,6 +46,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ #include <errno.h>
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>

+ 10 - 0
package/sane-backends/patches/patch-backend_kvs20xx_opt_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/kvs20xx_opt.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/kvs20xx_opt.c	2014-03-18 08:41:24.000000000 +0100
+@@ -8,6 +8,7 @@
+ 
+ #include "../include/sane/config.h"
+ 
++#include <sys/types.h>
+ #include <string.h>
+ 
+ #define DEBUG_DECLARE_ONLY

+ 10 - 0
package/sane-backends/patches/patch-backend_rts88xx_lib_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/rts88xx_lib.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/rts88xx_lib.c	2014-03-18 08:42:41.000000000 +0100
+@@ -54,6 +54,7 @@
+ 
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #include "../include/_stdint.h"
+ 

+ 10 - 0
package/sane-backends/patches/patch-backend_xerox_mfp_c

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/backend/xerox_mfp.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/xerox_mfp.c	2014-03-18 08:44:56.000000000 +0100
+@@ -22,6 +22,7 @@
+ #include <math.h>
+ #include <unistd.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include "../include/sane/sane.h"
+ #include "../include/sane/sanei.h"
+ #include "../include/sane/saneopts.h"

+ 10 - 0
package/sane-backends/patches/patch-include_sane_sanei_tcp_h

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/include/sane/sanei_tcp.h	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/include/sane/sanei_tcp.h	2014-03-18 08:31:07.000000000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <sane/sane.h>
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 

+ 10 - 0
package/sane-backends/patches/patch-include_sane_sanei_udp_h

@@ -0,0 +1,10 @@
+--- sane-backends-1.0.22.orig/include/sane/sanei_udp.h	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/include/sane/sanei_udp.h	2014-03-18 08:31:40.000000000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <sane/sane.h>
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+