snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

sane: update to 1.0.28. 

* release tarballs are now provided on gitlab
* cleanup post_install()
* fix license
This commit is contained in:
Piraty 2019-09-18 09:02:39 +02:00 committed by Piraty
parent 57d6154a94
commit 3a3d0ef781
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srcpkgs/sane/patches/sane-desc-cross.patch
View File

@ -5,7 +5,7 @@
sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES)
@rm -f sane-desc$(EXEEXT) @rm -f sane-desc$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS) - $(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS)
+ cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c ../lib/isfdtype.c -o $@ + cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c -o $@
sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES) sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES)
@rm -f sane-find-scanner$(EXEEXT) @rm -f sane-find-scanner$(EXEEXT)

41
srcpkgs/sane/template
View File

@ -1,10 +1,10 @@
# Template file for 'sane' # Template file for 'sane'
pkgname=sane pkgname=sane
version=1.0.27 _gitlab_release_hash=9e718daff347826f4cfe21126c8d5091
revision=2 version=1.0.28
revision=1
wrksrc="sane-backends-${version}" wrksrc="sane-backends-${version}"
build_style=gnu-configure build_style=gnu-configure
build_options="snmp"
configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread
--with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
$(vopt_with snmp)" $(vopt_with snmp)"
@ -14,35 +14,40 @@ makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
depends="$(vopt_if snmp net-snmp)" depends="$(vopt_if snmp net-snmp)"
conf_files="/etc/sane.d/*.conf" conf_files="/etc/sane.d/*.conf"
short_desc="Scanner Access Now Easy" short_desc="Scanner Access Now Easy"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-2.0-or-later, SANE-exception"
homepage="http://www.sane-project.org/" homepage="http://www.sane-project.org/"
license="GPL-2" distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz" checksum=31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
post_install() { build_options="snmp"
# fix hp officejets
echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
post_build() {
# generate udev file # generate udev file
cd tools cd tools
mkdir -p udev mkdir -p udev
make udev/libsane.rules make udev/libsane.rules
}
post_install() {
vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
# install udev file # install udev file
vinstall udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules vinstall tools/udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
# fix udev rules
sed -i 's|NAME="%k", ||g' ${DESTDIR}/usr/lib/udev/rules.d/49-sane.rules 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"
} }
libsane_package() { libsane_package() {
short_desc+=" - runtime shared library" short_desc+=" - runtime shared library"
pkg_install() { pkg_install() {
vmove usr/lib/libsane.so.* vmove "usr/lib/libsane.so.*"
} }
} }
sane-devel_package() { sane-devel_package() {
depends="libsane>=${version}_${revision}" depends="libsane>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
@ -51,6 +56,6 @@ sane-devel_package() {
vmove usr/bin/sane-config vmove usr/bin/sane-config
vmove usr/share/man/man1/sane-config.1 vmove usr/share/man/man1/sane-config.1
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove usr/lib/*.so vmove "usr/lib/*.so"
} }
} }