public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/
Date: Wed, 20 Oct 2021 01:14:31 +0000 (UTC)	[thread overview]
Message-ID: <1634692181.708719b2b0f6c899950e6da443a60d306601cd81.sam@gentoo> (raw)

commit:     708719b2b0f6c899950e6da443a60d306601cd81
Author:     Guillaume Castagnino <casta <AT> xwing <DOT> info>
AuthorDate: Mon Oct 18 19:13:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 01:09:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708719b2

media-gfx/sane-backends: bump to 1.0.32

* fix tarball source
(https://gitlab.com/sane-project/backends/-/issues/248)
* remove patches not needed anymore

Signed-off-by: Guillaume Castagnino <casta <AT> xwing.info>
Closes: https://bugs.gentoo.org/818838
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/22628
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/sane-backends/Manifest                   |   1 +
 .../sane-backends/sane-backends-1.0.32.ebuild      | 352 +++++++++++++++++++++
 2 files changed, 353 insertions(+)

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 789686c7720..7d1b5d8608b 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1 +1,2 @@
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
+DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5

diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
new file mode 100644
index 00000000000..36bb18f0a98
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+# 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
+
+# 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
+	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 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 )
+"
+
+DESCRIPTION="Scanner Access Now Easy - Backends"
+HOMEPAGE="http://www.sane-project.org/"
+SRC_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
+RDEPEND="
+	acct-group/scanner
+	acct-user/saned
+	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? (
+		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? ( >=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="
+	${PYTHON_DEPS}
+	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}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/sane-config
+)
+
+src_prepare() {
+	default
+
+	# Patch out the git reference so we can run eautoreconf
+	sed \
+		-e "s/m4_esyscmd_s(\[git describe --dirty\])/${PV}/" \
+		-e '/^AM_MAINTAINER_MODE/d' \
+		-i 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
+
+	# don't bleed user LDFLAGS into pkgconfig files
+	sed 's|@LDFLAGS@ ||' -i tools/*.pc.in || 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+=" 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+=(
+		--disable-locking
+		$(use_with gphoto2)
+		$(multilib_native_use_with systemd)
+		$(use_with v4l)
+		$(use_enable ipv6)
+		$(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
+
+		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 "${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_postinst() {
+	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
+}


             reply	other threads:[~2021-10-20  1:14 UTC|newest]

Thread overview: 134+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-20  1:14 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-02 10:48 [gentoo-commits] repo/gentoo:master commit in: media-gfx/sane-backends/ Sam James
2025-03-02  8:21 Sam James
2025-01-24  7:38 Joonas Niilola
2025-01-24  7:35 Sam James
2025-01-24  7:35 Sam James
2025-01-24  7:31 Joonas Niilola
2025-01-24  6:08 Sam James
2024-11-10 13:24 Sam James
2024-05-31  7:17 Andreas Sturmlechner
2024-04-05  1:21 Sam James
2024-04-05  1:21 Sam James
2024-04-05  1:21 Sam James
2023-05-01  8:53 Sam James
2023-05-01  6:25 Sam James
2023-05-01  4:15 Sam James
2023-05-01  3:15 Sam James
2023-05-01  2:26 Sam James
2023-05-01  2:26 Sam James
2023-05-01  1:53 Sam James
2023-02-07  4:30 Sam James
2023-01-08  8:06 Joonas Niilola
2022-12-19  3:52 Sam James
2022-12-19  3:52 Sam James
2022-12-19  3:52 Sam James
2022-12-19  3:52 Sam James
2022-12-19  3:01 Sam James
2022-12-19  2:59 Sam James
2022-12-19  1:13 Sam James
2022-12-18 23:52 Maciej Mrozowski
2022-12-18  9:40 Pacho Ramos
2022-12-18  7:10 Sam James
2022-12-18  7:07 Sam James
2022-12-02  0:46 Sam James
2022-12-02  0:46 Sam James
2022-12-01 22:28 Jakov Smolić
2022-12-01 22:24 Jakov Smolić
2022-12-01 22:22 Jakov Smolić
2022-12-01 22:22 Jakov Smolić
2022-12-01 20:48 Arthur Zamarin
2022-11-29 15:58 WANG Xuerui
2022-11-04  4:39 Sam James
2022-11-04  4:20 Sam James
2022-07-24  0:59 Sam James
2022-03-12  9:35 Arthur Zamarin
2022-03-10  9:08 Jakov Smolić
2022-03-06  7:58 Sam James
2022-03-06  7:44 Sam James
2022-02-22 19:35 Jakov Smolić
2022-02-22 19:25 Sam James
2022-02-22 19:25 Sam James
2022-02-13 23:41 Jakov Smolić
2022-01-22 10:26 Pacho Ramos
2022-01-15  9:31 Joonas Niilola
2021-12-25 10:21 Sam James
2021-12-24 19:32 Arthur Zamarin
2021-12-24 16:03 Arthur Zamarin
2021-12-24 16:01 Arthur Zamarin
2021-12-24 16:01 Arthur Zamarin
2021-12-24 13:51 Jakov Smolić
2021-11-25 13:45 Jason A. Donenfeld
2021-08-02 12:33 Marek Szuba
2021-04-24 15:49 Andreas Sturmlechner
2021-04-24 15:49 Andreas Sturmlechner
2021-04-24 15:49 Andreas Sturmlechner
2021-04-11 20:52 Conrad Kostecki
2021-03-30 16:17 Thomas Deutschmann
2021-03-19 18:12 Mikle Kolyada
2021-03-15  3:51 Sam James
2021-03-14 22:11 Sam James
2021-03-14 22:11 Sam James
2021-03-14 22:03 Sam James
2021-01-29 12:58 Lars Wendler
2021-01-14  7:51 Lars Wendler
2021-01-13 19:01 Lars Wendler
2021-01-13  9:33 Lars Wendler
2021-01-13  1:58 Lars Wendler
2020-09-02 21:03 Sergei Trofimovich
2020-08-29 17:57 Thomas Deutschmann
2020-07-19 10:43 Joonas Niilola
2020-07-11 18:21 Sam James
2020-07-10 13:23 Sam James
2020-07-06 11:27 Mart Raudsepp
2020-07-06  7:22 Sergei Trofimovich
2020-07-06  7:02 Sergei Trofimovich
2020-06-28  7:41 Joonas Niilola
2020-06-28  7:41 Joonas Niilola
2020-06-27  8:14 Joonas Niilola
2020-06-27  6:18 Joonas Niilola
2020-02-16 20:24 David Seifert
2019-06-02 15:00 Pacho Ramos
2019-06-02 15:00 Pacho Ramos
2019-06-02 15:00 Pacho Ramos
2019-03-05 21:18 Sergei Trofimovich
2019-02-16  8:55 Pacho Ramos
2019-02-07 17:02 Mikle Kolyada
2019-02-07 17:01 Mikle Kolyada
2019-01-31 22:15 Thomas Deutschmann
2019-01-31 18:58 Tobias Klausmann
2019-01-27 14:14 Sergei Trofimovich
2019-01-27 14:09 Sergei Trofimovich
2019-01-27 12:13 Sergei Trofimovich
2019-01-27  9:49 Sergei Trofimovich
2018-05-26 11:29 Mikle Kolyada
2018-05-26 11:28 Mikle Kolyada
2018-05-20 14:42 Sergei Trofimovich
2018-05-14 16:50 Tobias Klausmann
2018-04-30  1:10 Jeroen Roovers
2018-04-29 15:25 Mikle Kolyada
2018-04-21 20:11 Sergei Trofimovich
2018-04-19 19:42 Sergei Trofimovich
2018-04-18 21:30 Aaron Bauman
2018-02-23 10:15 Sergei Trofimovich
2018-01-20 14:53 Aaron Bauman
2017-11-19 12:19 Sergei Trofimovich
2017-10-28 20:53 Sergei Trofimovich
2017-10-26 17:38 Thomas Deutschmann
2017-10-25  9:31 Agostino Sarubbo
2017-10-24 19:23 Sergei Trofimovich
2017-10-24 17:38 Markus Meier
2017-01-15 10:02 Jeroen Roovers
2016-12-20 19:16 Tobias Klausmann
2016-10-28  4:51 Markus Meier
2016-10-16 17:45 Tobias Klausmann
2016-10-08 10:30 Pacho Ramos
2016-04-26 22:27 Austin English
2016-04-26 22:27 Austin English
2015-11-02 22:47 Mike Frysinger
2015-11-02 22:47 Mike Frysinger
2015-11-02 22:47 Mike Frysinger
2015-11-02 22:47 Mike Frysinger
2015-11-02 22:47 Mike Frysinger
2015-11-02 22:47 Mike Frysinger
2015-08-21 16:43 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1634692181.708719b2b0f6c899950e6da443a60d306601cd81.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox