wok-current diff sane-backends/receipt @ rev 24035

updated sane-backends and sane-backends-dev (1.0.22 -> 1.0.24)
author Hans-G?nter Theisgen
date Sun Apr 11 15:30:14 2021 +0100 (2021-04-11)
parents 970c5ec9a60a
children dc0f7fd1ff7d
line diff
     1.1 --- a/sane-backends/receipt	Sun May 20 13:28:18 2018 +0200
     1.2 +++ b/sane-backends/receipt	Sun Apr 11 15:30:14 2021 +0100
     1.3 @@ -1,63 +1,77 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="sane-backends"
     1.7 -VERSION="1.0.22"
     1.8 +VERSION="1.0.24"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Scanner Access Now Easy."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 +WEB_SITE="http://www.sane-project.org/"
    1.14 +
    1.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.16 -WEB_SITE="http://www.sane-project.org/"
    1.17 -WGET_URL="ftp://ftp2.sane-project.org/pub/sane/$PACKAGE-$VERSION/$TARBALL"
    1.18 +WGET_URL="https://gitlab.com/sane-project/backends/-/archive/RELEASE_${VERSION//./_}/backends-RELEASE_${VERSION//./_}.tar.gz"
    1.19  
    1.20 -DEPENDS="libusb-compat jpeg tiff zlib libgphoto2 libv4l libltdl"
    1.21 -BUILD_DEPENDS="libusb-compat-dev jpeg-dev tiff-dev zlib-dev libv4l-dev \
    1.22 -libgphoto2-dev libtool"
    1.23 -SUGGESTED="imagemagick gocr tesseract-ocr"
    1.24 +DEPENDS="jpeg libgphoto2 libltdl libusb-compat libv4l tiff zlib"
    1.25 +BUILD_DEPENDS="jpeg-dev libgphoto2-dev libtool libusb-compat-dev 
    1.26 +	libv4l-dev tiff-dev zlib-dev"
    1.27 +SUGGESTED="gocr imagemagick sane-backends-lang tesseract-ocr"
    1.28  
    1.29  # Rules to configure and make the package.
    1.30  compile_rules()
    1.31  {
    1.32 -	sed -i 's|prefix}/doc|prefix}/share/doc|' configure
    1.33 -	patch -Np1 -i $stuff/libv4l-0.8.3.patch
    1.34 +	# 1.0.24: no longer needed
    1.35 +#	sed -i 's|prefix}/doc|prefix}/share/doc|' configure
    1.36 +
    1.37 +	# 1.0.24: no longer needed
    1.38 +#	patch -Np1 -i $stuff/libv4l-0.8.3.patch
    1.39 +
    1.40 +	# 1.0.24: no longer needed
    1.41  	# fix https://bugs.archlinux.org/task/26114
    1.42 -	patch -Np1 -i $stuff/xerox_mfp_fix_usb_devices.patch
    1.43 -	./configure \
    1.44 -		--prefix=/usr \
    1.45 -		--sysconfdir=/etc \
    1.46 -		--mandir=/usr/share/man \
    1.47 +#	patch -Np1 -i $stuff/xerox_mfp_fix_usb_devices.patch
    1.48 +
    1.49 +	./configure						\
    1.50 +		--prefix=/usr					\
    1.51 +                --with-docdir=/usr/share/doc/$PACKAGE-$VERSION  \
    1.52 +		--sysconfdir=/etc				\
    1.53 +		--mandir=/usr/share/man				\
    1.54  		$CONFIGURE_ARGS &&
    1.55  	make &&
    1.56  	make -j 1 DESTDIR=$DESTDIR install
    1.57  
    1.58  	# copy the missing udev rule
    1.59 -	[ ! -d $DESTDIR/etc/udev/rules.d ] && mkdir -p $DESTDIR/etc/udev/rules.d
    1.60 -	cp -a $src/tools/udev/libsane.rules $DESTDIR/etc/udev/rules.d/55-sane.rules
    1.61 +	[ ! -d $DESTDIR/etc/udev/rules.d ] &&
    1.62 +		mkdir -p $DESTDIR/etc/udev/rules.d
    1.63 +	cp -a $src/tools/udev/libsane.rules	\
    1.64 +		$DESTDIR/etc/udev/rules.d/55-sane.rules
    1.65  }
    1.66  
    1.67  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.68  genpkg_rules()
    1.69  {
    1.70 -	mkdir -p $fs/usr/lib $fs/usr/share \
    1.71 -	         $fs/var/lock/sane $fs/etc/sane.d \
    1.72 -	         $fs/var/www/tazpanel/lib \
    1.73 -	         $fs/var/www/tazpanel/report.d \
    1.74 -	         $fs/var/www/tazpanel/menu.d/hardware \
    1.75 -	         $fs/var/www/tazpanel/styles/default/images
    1.76 -	
    1.77 -	cp -a $install/etc/sane.d $fs/etc
    1.78 -	cp -a $install/usr/bin $fs/usr
    1.79 -	cp -a $install/usr/sbin $fs/usr
    1.80 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.81 -	cp -a $install/usr/lib/sane $fs/usr/lib
    1.82 -	cp -a $install/usr/share/sane $fs/usr/share
    1.83 -	cp $stuff/tazpanel/sane.cgi $fs/var/www/tazpanel/
    1.84 -	cp $stuff/tazpanel/sane $fs/var/www/tazpanel/report.d/
    1.85 -	cp $stuff/tazpanel/crop.js $fs/var/www/tazpanel/lib/
    1.86 -	cp $stuff/tazpanel/drag.gif $fs/var/www/tazpanel/styles/default/images/
    1.87 -	ln -s ../../sane.cgi $fs/var/www/tazpanel/menu.d/hardware/sane
    1.88 -	
    1.89 -	# fix groups/permissions on /var/lock/sane ; add it to scanner group
    1.90 +	mkdir -p $fs/etc/sane.d
    1.91 +	mkdir -p $fs/usr/lib
    1.92 +	mkdir -p $fs/usr/share
    1.93 +	mkdir -p $fs/var/lock/sane
    1.94 +	mkdir -p $fs/var/www/tazpanel/lib
    1.95 +	mkdir -p $fs/var/www/tazpanel/menu.d/hardware
    1.96 +	mkdir -p $fs/var/www/tazpanel/report.d
    1.97 +	mkdir -p $fs/var/www/tazpanel/styles/default/images
    1.98 +
    1.99 +	cp -a $install/etc/sane.d	$fs/etc
   1.100 +
   1.101 +	cp -a $install/usr/bin		$fs/usr
   1.102 +	cp -a $install/usr/sbin		$fs/usr
   1.103 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
   1.104 +	cp -a $install/usr/lib/sane	$fs/usr/lib
   1.105 +	cp -a $install/usr/share/sane	$fs/usr/share
   1.106 +
   1.107 +	cp $stuff/tazpanel/sane.cgi	$fs/var/www/tazpanel/
   1.108 +	cp $stuff/tazpanel/sane		$fs/var/www/tazpanel/report.d/
   1.109 +	cp $stuff/tazpanel/crop.js	$fs/var/www/tazpanel/lib/
   1.110 +	cp $stuff/tazpanel/drag.gif	$fs/var/www/tazpanel/styles/default/images/
   1.111 +	ln -s ../../sane.cgi		$fs/var/www/tazpanel/menu.d/hardware/sane
   1.112 +
   1.113 +	# fix groups and permissions on /var/lock/sane ; add it to scanner group
   1.114  	chmod 775 "$fs/var/lock/sane"
   1.115  	chgrp 96 "$fs/var/lock/sane"
   1.116     
   1.117 @@ -70,21 +84,24 @@
   1.118  	tazpkg reconfigure udev --root="$1"
   1.119  	
   1.120  	# add group scanner
   1.121 -	if ! grep -q scanner "$1/etc/group" ; then
   1.122 +	if ! grep -q scanner "$1/etc/group"
   1.123 +	  then
   1.124  		chroot "$1/" addgroup -g 96 scanner
   1.125  	fi
   1.126 -	chroot "$1/" chgrp scanner /usr/bin/scanimage
   1.127 -	chmod 4750 $1/usr/bin/scanimage
   1.128 -	
   1.129 +
   1.130 +	chroot "$1/" chgrp scanner	/usr/bin/scanimage
   1.131 +	chmod 4750			$1/usr/bin/scanimage
   1.132 +
   1.133  	echo
   1.134 -	echo " ADD yourself to group scanner to use sane: addgroup tux scanner"
   1.135 +	echo " ADD user(s) to group scanner to use sane: addgroup <user> scanner"
   1.136  	
   1.137  	rm -f "$1"/var/cache/tazpanel/* 2> /dev/null
   1.138  	[ -e "$1/var/www/tazpanel/tmp" ] ||
   1.139 -	ln -s /tmp "$1/var/www/tazpanel/tmp"
   1.140 +		ln -s /tmp "$1/var/www/tazpanel/tmp"
   1.141  }
   1.142  
   1.143  post_remove()
   1.144  {
   1.145 +	# delete group scanner
   1.146  	chroot "$1/" delgroup scanner & >/dev/null
   1.147  }