diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
commit | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (patch) | |
tree | 0c877a3d1a37f10e37ad7168cfc52054aa0948a7 /media-gfx/sane-backends/files | |
parent | 75fc75ae1f0481ffdb78450e801a9b443ba641bd (diff) |
gentoo resync : 02.04.2018
Diffstat (limited to 'media-gfx/sane-backends/files')
-rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch | 17 | ||||
-rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch | 42 |
2 files changed, 59 insertions, 0 deletions
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch new file mode 100644 index 000000000000..504f9e666e62 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-canon-lide-100.patch @@ -0,0 +1,17 @@ +diff -up sane-backends-1.0.27/backend/genesys.c.canon-lide-100 sane-backends-1.0.27/backend/genesys.c +--- sane-backends-1.0.27/backend/genesys.c.canon-lide-100 2018-02-01 10:37:26.160044539 +0100 ++++ sane-backends-1.0.27/backend/genesys.c 2018-02-01 10:45:44.616653277 +0100 +@@ -2070,11 +2070,9 @@ genesys_white_shading_calibration (Genes + dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE); + dev->model->cmd_set->set_motor_power (dev->calib_reg, motor); + +- /* if needed, go back before doin next scan, by using rewind, registers and +- * slopes table are kept intact from previous scan */ +- if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind) ++ if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK) + { +- status = dev->model->cmd_set->rewind (dev); ++ status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE); + } + + status = diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch b/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch new file mode 100644 index 000000000000..2605ea83578d --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.27-network.patch @@ -0,0 +1,42 @@ +diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c +index a57d7c7..d0a1e92 100644 +--- a/sanei/sanei_tcp.c ++++ b/sanei/sanei_tcp.c +@@ -45,6 +45,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <string.h> ++#include <time.h> + + #ifdef HAVE_WINSOCK2_H + #include <winsock2.h> +@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count) + ssize_t + sanei_tcp_read(int fd, u_char * buf, int count) + { +- ssize_t bytes_recv = 0, rc = 1; ++ ssize_t bytes_recv = 0, rc = 1; ++ int retry = 5; + + while (bytes_recv < count && rc > 0) + { + rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0); ++ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc); + if (rc > 0) + bytes_recv += rc; +- ++ else { ++ if ( errno == EAGAIN && retry-- ) { ++ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry); ++ /* wait for max 1s */ ++ struct timespec req; ++ struct timespec rem; ++ req.tv_sec = 0; ++ req.tv_nsec= 100000000; ++ nanosleep(&req, &rem); ++ rc = 1; ++ } ++ } + } + return bytes_recv; + } |