diff options
| author | wiz <wiz> | 2015-11-11 12:40:03 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-11-11 12:40:03 +0000 |
| commit | 6730f1d7908e57f3b93fd9d258aed9ea94addddd (patch) | |
| tree | 57a2364547501c2ea38422387b4f08a021badeaa /graphics/sane-backends | |
| parent | 42e7fca9e5c3655e6f95a81bfef26cbabee6c9fc (diff) | |
| download | pkgsrc-6730f1d7908e57f3b93fd9d258aed9ea94addddd.tar.gz | |
Replace patch with upstream version.
Diffstat (limited to 'graphics/sane-backends')
| -rw-r--r-- | graphics/sane-backends/distinfo | 4 | ||||
| -rw-r--r-- | graphics/sane-backends/patches/patch-backend_pieusb__buffer.c | 21 |
2 files changed, 16 insertions, 9 deletions
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index cdee77004d7..34bf85b9043 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2015/11/04 17:41:19 agc Exp $ +$NetBSD: distinfo,v 1.42 2015/11/11 12:40:03 wiz Exp $ SHA1 (sane-backends-1.0.25.tar.gz) = 05824922d91571e1fc2f5cdd270745783d593754 RMD160 (sane-backends-1.0.25.tar.gz) = 1cfd81eeddf3ef3c2cea98f6ca7640522b249fab @@ -13,5 +13,5 @@ SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76 SHA1 (patch-backend_kodakaio.c) = f96af8b2fb0369f51d2320285253c5e67218e629 -SHA1 (patch-backend_pieusb__buffer.c) = eef6201f7c13b40398f254c4d84369aa0d1a61d5 +SHA1 (patch-backend_pieusb__buffer.c) = 7e7c6dbb0798876532a04a0831be2ab2bd2931ca SHA1 (patch-sanei_sanei__ir.c) = 66e913d7db9d03a42850778aca39da8f0dde02fa diff --git a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c index 32d45b28067..0e24343721e 100644 --- a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c +++ b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c @@ -1,4 +1,4 @@ -$NetBSD: patch-backend_pieusb__buffer.c,v 1.2 2015/10/27 11:29:35 wiz Exp $ +$NetBSD: patch-backend_pieusb__buffer.c,v 1.3 2015/11/11 12:40:03 wiz Exp $ Remove unportable header inclusion. XXX: should be fixed better, hope upstream does that. @@ -6,13 +6,20 @@ https://alioth.debian.org/tracker/index.php?func=detail&aid=315209&group_id=3018 --- backend/pieusb_buffer.c.orig 2015-09-01 00:31:33.000000000 +0000 +++ backend/pieusb_buffer.c -@@ -100,7 +100,9 @@ +@@ -100,15 +100,8 @@ #include <stdio.h> #include <fcntl.h> #include <sys/mman.h> -+#ifdef HAVE_ENDIAN_H - #include <endian.h> -+#endif +-#include <endian.h> + +-/* When creating the release backend, make complains about unresolved external +- * le16toh, although it finds the include <endian.h> */ +-#if __BYTE_ORDER == __LITTLE_ENDIAN +- #define le16toh(x) (x) +-#else +- #define le16toh(x) __bswap_16 (x) +-#endif ++#include "byteorder.h" + + static void buffer_update_read_index(struct Pieusb_Read_Buffer* buffer, int increment); - /* When creating the release backend, make complains about unresolved external - * le16toh, although it finds the include <endian.h> */ |