From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- media-gfx/sane-backends/Manifest | 5 + ...backends-1.0.30-add_hpaio_epkowa_dll.conf.patch | 11 + .../sane-backends-1.0.30-bigendian-depth.patch | 14 + ...ne-backends-1.0.30-missing-stdint-include.patch | 14 + .../sane-backends/sane-backends-1.0.30-r2.ebuild | 346 +++++++++++++++++++++ 5 files changed, 390 insertions(+) create mode 100644 media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch create mode 100644 media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch create mode 100644 media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch create mode 100644 media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild (limited to 'media-gfx/sane-backends') diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 5d33c27ebd1c..37e088e58901 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -4,11 +4,16 @@ AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515 AUX sane-backends-1.0.27-network.patch 1022 BLAKE2B bcc929635fe62af4201f474cddd141b95bf1b7520f7279b713771ed9614990b3331ec1b42f309d88e375d6c9cffacb7195e7e3f063e491bb9cd6e4ae39f79eea SHA512 04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d AUX sane-backends-1.0.27-revert-samsung.patch 14137 BLAKE2B ec41dcc9862a50f09518207b0db83f37d14f7e3ba6b101800144a8bc7059eb9c0fb5fcbab42dc8ec68001f61b304baa628c3f2ac73be9031b946fe8088e5cf37 SHA512 70e8d86291fbb21c7c9c5fa9ba5df54c808e5e75e3155af33ab9c18c768bc1eaa05890802c52daa3e60619fa8961b7162cac4c51e2dd2dd6c7114986d3a6136f AUX sane-backends-1.0.27-uninitialized-variable.patch 902 BLAKE2B 6f2e86d6d79f85f73d564bc1877667c1278108d876f61551cc89abb159dee68e6b454bec190cb44eee61255fa648010293382f5575d208dd7c1e33c1492be3e9 SHA512 b3c5675e5ec3a92345832d081025dae72bcfda9854f79565fc2801e6ea710a83e953a9f075ef9754c6d893fb099544989b4aaabf8a177d5c52b8a4b9c6eac052 +AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3 +AUX sane-backends-1.0.30-bigendian-depth.patch 372 BLAKE2B f93f510496f1234c586f57b4814ad45ea3dd0bf78a934edd6ab951c5423be235560e54d871d8f9edef6fe51b4d9e18ecf33367635cefa1e500f8ed29a722e0bd SHA512 0cfe593471be5a89666ad9bb112999368d9195f0bf3aa13597251b3a5ebf645eeb776b29df04291f4fda6e330f2bdfbbbc04865588d9af54c5f610b9e923d9fb +AUX sane-backends-1.0.30-missing-stdint-include.patch 374 BLAKE2B e20005c96096a228126b7e1d414ae2c127bf7ad16894defc8e3c65230380449e61f75b3cd63bd80b16bf8b1ebc08e5f974eb621d16f9c6b994105bb9d95e1a89 SHA512 521a3275879e84f6727ebc3b8e5ae4fbbb1495d2c41cb6880e170c62f684da2af7ea47b0a89d0806687f8a48791f2562959158a31a30dd240880757b6c81a321 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 +DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 EBUILD sane-backends-1.0.27-r3.ebuild 8101 BLAKE2B e6ff1e73fad9d33c8b9d4a475de311b5ddf60a66fe2604f6c8573bfd593688292a84ac554dc06d0c9d1181f443f31e0e9fc6e6e520a0e76fe62f373129f92388 SHA512 1434b237b354d84eecfab48624805dcbd8dcaaf42e5315ca25c980942551a2cb0cae39453907982d96ffe2a4042def9eb7d44b9ad768750aa35d65a18057c06c +EBUILD sane-backends-1.0.30-r2.ebuild 8153 BLAKE2B 4a837163fb0ca438814f3ecb54f5a9d1ab6e229b243dc8348b624c2e28ecc489897f728252410e0409d0885d8fcbf6801a5bb5a67479a52284368aa25699ac96 SHA512 6f6ce83f0b66c15eb193c19916fc2978f49b19068efa6dbaa7e6ed9b414c71ecf6513978a725cb95d27a4f304cbc8f377e837aa42af6aeaa16495fd29fbc1f25 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659 diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch new file mode 100644 index 000000000000..b92e14b67791 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch @@ -0,0 +1,11 @@ +diff -Naur backends-1.0.30/backend/dll.conf.in backends-1.0.30-r1/backend/dll.conf.in +--- backends-1.0.30/backend/dll.conf.in 2020-05-17 14:16:28.000000000 +0300 ++++ backends-1.0.30-r1/backend/dll.conf.in 2020-06-27 08:24:18.378856341 +0300 +@@ -98,3 +98,7 @@ + #umax_pp + v4l + xerox_mfp ++# Add support for the HP-specific backend. Needs net-print/hplip installed. ++hpaio ++# Add support for the Epson-specific backend. Needs media-gfx/iscan installed. ++epkowa diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch new file mode 100644 index 000000000000..bac06593b9e6 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-bigendian-depth.patch @@ -0,0 +1,14 @@ +Correct overlooked bigendian case. This has been fixed upstream in a different +way since the 1.0.30 release. + +--- a/backend/genesys/low.cpp ++++ b/backend/genesys/low.cpp +@@ -539,7 +539,7 @@ + } + + #ifdef WORDS_BIGENDIAN +- if (depth == 16) { ++ if (session.params.depth == 16) { + dev->pipeline.push_node(); + } + #endif diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch new file mode 100644 index 000000000000..14c97ae95bf6 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.30-missing-stdint-include.patch @@ -0,0 +1,14 @@ +https://gitlab.com/sane-project/backends/-/issues/314 +https://gitlab.com/sane-project/backends/-/commit/6bb87fdf1f3dc190cfc4b7d64b0c8c8c3d10151b.diff +--- a/sanei/sanei_usb.c ++++ b/sanei/sanei_usb.c +@@ -48,6 +48,9 @@ + + #include "../include/sane/config.h" + ++#ifdef HAVE_STDINT_H ++# include ++#endif + #include + #include + #include diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild new file mode 100644 index 000000000000..d81a991ad811 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools eutils flag-o-matic multilib-minimal systemd toolchain-funcs udev user + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +IUSE_SANE_BACKENDS=" + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + escl + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpljm1005 + hpsj5s + hs2p + ibm + kodak + kodakaio + kvs1025 + kvs20xx + kvs40xx + leo + lexmark + ma1509 + magicolor + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + mustek_usb2 + nec + net + niash + p5 + pie + pixma + plustek + plustek_pp + pnm + qcam + ricoh + ricoh2 + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax1220u + umax_pp + xerox_mfp" + +IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf" + +for GBACKEND in ${IUSE_SANE_BACKENDS}; do + case ${GBACKEND} in + # Disable backends that require parallel ports as no one has those anymore. + canon_pp|hpsj5s|mustek_pp|\ + pnm|mustek_usb2|kvs40xx) + IUSE+=" sane_backends_${GBACKEND}" + ;; + *) + IUSE+=" +sane_backends_${GBACKEND}" + esac +done + +REQUIRED_USE=" + sane_backends_escl? ( zeroconf ) + sane_backends_kvs40xx? ( threads ) + sane_backends_mustek_usb2? ( threads ) +" + +MY_PN=${PN//sane-/} +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build +RDEPEND=" + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + ) + sane_backends_escl? ( + net-dns/avahi[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] + ) + sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + snmp? ( net-analyzer/net-snmp:0= ) + systemd? ( sys-apps/systemd:0= ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) + v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + xinetd? ( sys-apps/xinetd ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND} + dev-libs/libxml2 + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND=" + sys-devel/autoconf-archive + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch + "${FILESDIR}"/${P}-missing-stdint-include.patch + "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch + "${FILESDIR}"/${PN}-1.0.30-bigendian-depth.patch +) + +S="${WORKDIR}/${MY_P}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +pkg_setup() { + enewgroup scanner + enewuser saned -1 -1 -1 scanner +} + +src_prepare() { + default + + # Patch out the git reference so we can run eautoreconf + sed -i -e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" configure.ac || die + eautoreconf + + # Fix for "make check". Upstream sometimes forgets to update this. + local ver=$(./configure --version | awk '{print $NF; exit 0}') + sed -i \ + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ + testsuite/tools/data/html* || die + +} + +src_configure() { + # From Fedora + append-flags -fno-strict-aliasing + multilib-minimal_src_configure +} + +multilib_src_configure() { + # the blank is intended - an empty string would result in building ALL backends. + local lbackends=" " + + use gphoto2 && lbackends="gphoto2" + use v4l && lbackends="${lbackends} v4l" + for backend in ${IUSE_SANE_BACKENDS}; do + if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then + lbackends="${lbackends} ${backend}" + fi + done + + local myconf=( + $(use_with usb) + $(multilib_native_use_with snmp) + ) + + # you can only enable this backend, not disable it... + if use sane_backends_pnm; then + myconf+=( --enable-pnm-backend ) + fi + if use sane_backends_mustek_pp; then + myconf+=( --enable-parport-directio ) + fi + if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then + myconf+=( sane_cv_use_libieee1284=no ) + fi + + # relative path must be used for tests to work properly + # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory + # --without-api-spec to not automagically depend on tons of stuff + # that break in many ways, bug #636202, #668232, #668350 + # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html + ECONF_SOURCE=${S} \ + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${lbackends}" \ + econf \ + --disable-locking \ + --without-api-spec \ + $(use_with gphoto2) \ + $(multilib_native_use_with systemd) \ + $(use_with v4l) \ + $(use_enable ipv6) \ + $(use_enable threads pthread) \ + $(use_enable zeroconf avahi) \ + "${myconf[@]}" +} + +multilib_src_compile() { + emake VARTEXFONTS="${T}/fonts" + + if tc-is-cross-compiler; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + + # The build system sucks and doesn't handle this properly. + # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ + "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ + "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die + local dirs=( hal hotplug hotplug-ng udev ) + local targets=( + hal/libsane.fdi + hotplug/libsane.usermap + hotplug-ng/libsane.db + udev/libsane.rules + ) + mkdir -p "${dirs[@]}" || die + emake "${targets[@]}" + + popd >/dev/null || die + fi + + if use usb; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die + fi +} + +multilib_src_install() { + emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir="${EPREFIX}"/usr/share/doc/${PF} + + if multilib_is_native_abi; then + if use usb; then + insinto /etc/hotplug/usb + doins tools/hotplug/libsane.usermap + fi + + udev_newrules tools/udev/libsane.rules 41-libsane.rules + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + fi +} + +multilib_src_install_all() { + keepdir /var/lib/lock/sane + fowners root:scanner /var/lib/lock/sane + fperms g+w /var/lib/lock/sane + dodir /etc/env.d + + if use systemd; then + systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service" + systemd_newunit "${FILESDIR}"/saned.socket saned.socket + fi + + if use usb; then + exeinto /etc/hotplug/usb + doexe tools/hotplug/libusbscanner + newdoc tools/hotplug/README README.hotplug + fi + + dodoc NEWS AUTHORS PROBLEMS README README.linux + find "${D}" -name '*.la' -delete || die + + if use xinetd; then + insinto /etc/xinetd.d + doins "${FILESDIR}"/saned + fi + + newinitd "${FILESDIR}"/saned.initd saned + newconfd "${FILESDIR}"/saned.confd saned +} + +pkg_postinst() { + elog "Optional backends:" + optfeature "Epson-specific backend" media-gfx/iscan + optfeature "HP-specific backend" net-print/hplip + + if use xinetd; then + elog "If you want remote clients to connect, edit" + elog "/etc/sane.d/saned.conf and /etc/hosts.allow" + fi + + if ! use systemd; then + elog "If you are using a USB scanner, add all users who want" + elog "to access your scanner to the \"scanner\" group." + fi +} -- cgit v1.2.3