From fb071e7b7ac900b4988e1aac6d556609db1e42ba Mon Sep 17 00:00:00 2001 From: Celeste Wouters Date: Fri, 3 Mar 2023 18:46:32 +0100 Subject: [PATCH] sane: fix PDF-producing eSCL scanners failing with `Invalid argument` eSCL-speaking scanners that produce PDF-formatted output scan properly, but completion is only met with `sane_start: Invalid argument` expressed in various forms depending on front-end. This is due to SANE being built without PDF support, provided by poppler-glib; this commit enables that as a default-on option, fixing support for those scanners. --- srcpkgs/sane/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index 27b8c46ad6fdb..66a1a346f1570 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -6,11 +6,12 @@ revision=1 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)" + $(vopt_with snmp) $(vopt_with poppler poppler-glib)" hostmakedepends="pkg-config python3" makedepends="libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel openssl-devel libxml2-devel libpng-devel - $(vopt_if snmp net-snmp-devel) $(vopt_if avahi 'avahi-libs-devel libcurl-devel')" + $(vopt_if snmp net-snmp-devel) $(vopt_if avahi 'avahi-libs-devel libcurl-devel') + $(vopt_if poppler 'cairo-devel poppler-glib-devel')" depends="$(vopt_if snmp net-snmp)" conf_files="/etc/sane.d/*.conf" short_desc="Scanner Access Now Easy" @@ -26,12 +27,15 @@ noshlibprovides="avoid false detection of device drivers" system_accounts="_saned" _saned_groups="lp,scanner" -build_options="avahi snmp" -build_options_default="avahi" +build_options="avahi snmp poppler" +build_options_default="avahi poppler" if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then make_check=no # tests broken on 32bit. https://gitlab.com/sane-project/backends/-/issues/157 fi +if [ "$build_option_poppler" ]; then + make_check=no # tests broken when poppler enabled due to bundled minigtest +fi post_build() { # generate udev file