sane: update to 1.0.27

This commit is contained in:
Alessio Sergi 2017-05-26 13:02:27 +02:00
parent 733a60e70b
commit 1c025c5c09
3 changed files with 6 additions and 105 deletions

View file

@ -1,24 +0,0 @@
--- include/sane/sanei_backend.h
+++ include/sane/sanei_backend.h
@@ -68,9 +68,11 @@
/* Just enough backwards compatibility that we get by in the backends
without making handstands. */
+#if 0
# ifdef sigset_t
# undef sigset_t
# endif
+#endif
# ifdef sigemptyset
# undef sigemptyset
# endif
@@ -96,7 +98,9 @@
# undef SIG_SETMASK
# endif
+#if 0
# define sigset_t int
+#endif
# define sigemptyset(set) do { *(set) = 0; } while (0)
# define sigfillset(set) do { *(set) = ~0; } while (0)
# define sigaddset(set,signal) do { *(set) |= sigmask (signal); } while (0)

View file

@ -1,73 +0,0 @@
--- include/sane/sanei_udp.h
+++ include/sane/sanei_udp.h
@@ -27,6 +27,9 @@
#include <netinet/in.h>
#include <netdb.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp);
extern SANE_Status sanei_udp_open_broadcast(int *fdp);
--- backend/kvs20xx_cmd.h
+++ backend/kvs20xx_cmd.h
@@ -9,6 +9,10 @@
Panasonic KV-S20xx USB-SCSI scanners.
*/
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
#define COMMAND_BLOCK 1
#define DATA_BLOCK 2
#define RESPONSE_BLOCK 3
--- backend/kvs40xx.h
+++ backend/kvs40xx.h
@@ -10,6 +10,9 @@
#include "../include/sane/config.h"
#include <semaphore.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
#undef BACKEND_NAME
#define BACKEND_NAME kvs40xx
--- backend/hp5400.c
+++ backend/hp5400.c
@@ -67,6 +67,9 @@
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memcpy */
#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
#define HP5400_CONFIG_FILE "hp5400.conf"
--- backend/hp5590.c
+++ backend/hp5590.c
@@ -48,6 +48,9 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
#include "../include/sane/sane.h"
#define BACKEND_NAME hp5590
--- backend/epsonds-io.c
+++ backend/epsonds-io.c
@@ -16,6 +16,9 @@
#include "sane/config.h"
#include <ctype.h>
#include <unistd.h> /* sleep */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
#include "epsonds.h"
#include "epsonds-io.h"

View file

@ -1,26 +1,24 @@
# Template file for 'sane'
pkgname=sane
version=1.0.25
revision=2
version=1.0.27
revision=1
wrksrc="sane-backends-${version}"
build_style=gnu-configure
build_options="snmp"
configure_args="--disable-locking --enable-avahi --disable-latex --enable-ipv6
--with-docdir=/usr/share/doc/sane --enable-libusb_1_0 --enable-pthread
ac_cv_func_mmap_fixed_mapped=yes
configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread
--with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
$(vopt_with snmp)"
hostmakedepends="pkg-config"
makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
v4l-utils-devel libusb-devel libressl-devel $(vopt_if snmp net-snmp-devel)"
depends="$(vopt_if snmp net-snmp)"
replaces="sane-udev-rules>=0"
conf_files="/etc/sane.d/*.conf"
short_desc="Scanner Access Now Easy"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.sane-project.org/"
license="GPL-2"
distfiles="http://ftp.lfs-matrix.net/pub/blfs/conglomeration/sane-backends/sane-backends-${version}.tar.gz"
checksum=a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c
distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz"
checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
post_install() {
# fix hp officejets