commit: 437a600eacc3aba6ed0527e5655b0a142921b4ae Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sat Nov 9 12:59:26 2024 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sat Nov 9 14:06:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437a600e
media-gfx/sane-backends: add 1.3.1 Closes: https://bugs.gentoo.org/910100 Closes: https://bugs.gentoo.org/931886 Closes: https://bugs.gentoo.org/933236 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> media-gfx/sane-backends/Manifest | 1 + .../files/sane-backends-1.3.1-verfix.patch | 23 ++ media-gfx/sane-backends/sane-backends-1.3.1.ebuild | 362 +++++++++++++++++++++ 3 files changed, 386 insertions(+) diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index d77bbff58364..b2d6f0408880 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1 +1,2 @@ +DIST backends-1.3.1.tar.bz2 4409356 BLAKE2B 8cedc3adb21c481f346c20de5363439aecabbf81606e3fb81accf4a7af4433eb83cecb3f25be9f4944990651fc66a97ce5f2796cc80846c8e066e4f611c6f8ff SHA512 20774d7b81bbb6a5905f36a312be519e0f664a3fb90ff521f2196c341d80c1ef12164262f063ae0a7b449690213c1e3b8065ebfd6b1e1804cc1581d863f4b720 DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1 diff --git a/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch b/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch new file mode 100644 index 000000000000..32f22f6c181c --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch @@ -0,0 +1,23 @@ +diff --git a/configure.ac b/configure.ac +index ddb52b9..c3046b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,13 +16,11 @@ AM_SILENT_RULES + dnl ****************************************************************** + dnl Determine SANE version components and release status + dnl ****************************************************************** +-AS_IF([test x = "x$AWK"],[AC_PROG_AWK]) +-AS_IF([test x = "x`echo $VERSION | sed 's/[[.0-9]]//g'`"], +- [is_release=yes], +- [is_release=no]) +-V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'` +-V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'` +-V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/^\([[0-9]]*\).*/\1/'`; ++is_release=yes ++is_release=no ++V_MAJOR=1 ++V_MINOR=3 ++V_REV=1 + + AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number]) + AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number]) diff --git a/media-gfx/sane-backends/sane-backends-1.3.1.ebuild b/media-gfx/sane-backends/sane-backends-1.3.1.ebuild new file mode 100644 index 000000000000..573d4ca4c003 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.3.1.ebuild @@ -0,0 +1,362 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +# python-any-r1 required for a script in backends/pixma/scripts/ +inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev + +MY_PN=backends +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/"; +SRC_URI="https://gitlab.com/sane-project/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"; + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# 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_lide70 + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + epsonds + 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 + pieusb + 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 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 ) +" + +# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build +RDEPEND=" + acct-user/saned + acct-group/scanner + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + ) + sane_backends_escl? ( + app-text/poppler[cairo] + || ( + net-dns/avahi[dbus] + net-dns/avahi[gtk] + ) + 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? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + snmp? ( net-analyzer/net-snmp:= ) + systemd? ( sys-apps/systemd:= ) + 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="${PYTHON_DEPS} + dev-build/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}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch + "${FILESDIR}/${P}-verfix.patch" +) + +# ./configure checks to see if these are defined in sys/io.h, +# so if they're undefined... that's the point. +QA_CONFIG_IMPL_DECL_SKIP=( inb outb ) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +src_prepare() { + default + + eautoreconf + + # Needed for udev rules generation/installation + multilib_copy_sources +} + +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+=" v4l" + use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl" + local backend + for backend in ${IUSE_SANE_BACKENDS[@]} ; do + if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then + lbackends+=" ${backend}" + fi + done + + local myconf=( + $(use_with usb) + $(multilib_native_use_with snmp) + + $(multilib_native_use_with sane_backends_escl poppler-glib) + # you can only enable this backend, not disable it... + $(usex sane_backends_pnm --enable-pnm-backend '') + $(usex sane_backends_mustek_pp --enable-parport-directio '') + ) + + 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 + # 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 + myconf+=( + --enable-ipv6 + --disable-locking + $(use_with gphoto2) + $(multilib_native_use_with systemd) + $(use_with v4l) + $(use_enable threads pthread) + $(use_with zeroconf avahi) + ) + + ECONF_SOURCE="${S}" SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${lbackends}" econf "${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 + + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + + # From Fedora and Arch, prevent permission conflicts + # https://github.com/OpenPrinting/cups/issues/314 + # https://gitlab.com/sane-project/backends/-/issues/546 + # + # Generate udev udev+hwdb, not needing scanner group + install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die + tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die + tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die + # generate udev hwdb + install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die + tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" + # NOTE: an empty new line is required between the two .desc collections + printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die + tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die + # udev rule for saned (SANE scanning daemon) to be able to write on usb port + udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules + fi +} + +multilib_src_install_all() { + dodir /etc/env.d + + if use systemd ; then + systemd_newunit "${FILESDIR}"/saned_at.service-r1 "[email protected]" + 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 "${ED}" -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_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload + + optfeature "Network scanner backend" media-gfx/sane-airscan + 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 +}
