From d3edd59c6e62c467b919979a5f0c6c33322ac331 Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 4 Oct 2021 22:46:36 +0200 Subject: [PATCH] sane: update to 1.0.32. --- srcpkgs/sane/template | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index 35dac1cc846a..4e8cdab17d61 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -1,14 +1,14 @@ # Template file for 'sane' pkgname=sane -_gitlab_release_hash=8bf1cae2e1803aefab9e5331550e5d5d -version=1.0.31 -revision=3 +_gitlab_release_hash=104f09c07d35519cc8e72e604f11643f +version=1.0.32 +revision=1 wrksrc="sane-backends-${version}" build_style=gnu-configure configure_args="--disable-locking --enable-ipv6 --enable-pthread --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes $(vopt_with snmp)" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config python3" makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel openssl-devel libxml2-devel $(vopt_if snmp net-snmp-devel)" @@ -16,14 +16,19 @@ depends="$(vopt_if snmp net-snmp)" conf_files="/etc/sane.d/*.conf" short_desc="Scanner Access Now Easy" maintainer="Piraty " -license="GPL-2.0-or-later, SANE-exception" +license="custom:GPL-2.0-or-later-with-SANE-exception" homepage="http://www.sane-project.org/" distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz" -checksum=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa +checksum=3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114 noshlibprovides="avoid false detection of device drivers" build_options="snmp" +# tests broken on 32bit. https://gitlab.com/sane-project/backends/-/issues/157 +if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then + make_check=no +fi + post_build() { # generate udev file cd tools @@ -39,7 +44,9 @@ post_install() { vlicense LICENSE # License clarification vlicense COPYING # GPL-2.0 - sed -n "1,43 p" "${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION" + sed -n \ + -e "/\/* sane - Scanner Access Now Easy./,/dynamic linking to load backends on demand./p" \ + "${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION" } libsane_package() {