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: Mon, 19 Dec 2022 01:13:41 +0000 (UTC) [thread overview]
Message-ID: <1671412393.0891f002e96a1ca716a201e8479f2ec75e0b2274.sam@gentoo> (raw)
commit: 0891f002e96a1ca716a201e8479f2ec75e0b2274
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 01:10:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 01:13:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0891f002
media-gfx/sane-backends: restore clang, musl patches & udev rules
Closes: https://bugs.gentoo.org/886997
Signed-off-by: Sam James <sam <AT> gentoo.org>
...1-r12.ebuild => sane-backends-1.1.1-r13.ebuild} | 29 +++++++++++++---------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
similarity index 96%
rename from media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
rename to media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
index 432ddeab111d..385b090370aa 100644
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r12.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r13.ebuild
@@ -103,7 +103,7 @@ IUSE_SANE_BACKENDS=(
xerox_mfp
)
-IUSE="gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf"
+IUSE="gphoto2 snmp systemd threads usb v4l xinetd +zeroconf"
for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do
case ${GBACKEND} in
@@ -134,16 +134,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
RDEPEND="
acct-user/saned
+ acct-group/scanner
gphoto2? (
- media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
>=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/libjpeg-turbo:=[${MULTILIB_USEDEP}]
>=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}]
+ media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}]
)
sane_backends_escl? (
app-text/poppler[cairo]
@@ -182,6 +183,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch
# https://gitlab.com/sane-project/backends/-/merge_requests/688
"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch
+ "${FILESDIR}"/${P}-gcc12-tests.patch
+ "${FILESDIR}"/${PN}-1.1.1-configure-clang16.patch
+ "${FILESDIR}"/${P}-musl.patch
)
MULTILIB_CHOST_TOOLS=(
@@ -250,14 +254,15 @@ multilib_src_configure() {
# 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 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}" \
@@ -324,7 +329,7 @@ multilib_src_install() {
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_dorules "${FILESDIR}/66-saned.rules"
+ udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules
fi
}
@@ -332,7 +337,7 @@ multilib_src_install_all() {
dodir /etc/env.d
if use systemd ; then
- systemd_newunit "${FILESDIR}"/saned_at.service "saned@.service"
+ systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service"
systemd_newunit "${FILESDIR}"/saned.socket saned.socket
fi
@@ -354,7 +359,13 @@ multilib_src_install_all() {
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
@@ -363,10 +374,4 @@ pkg_postinst() {
elog "If you want remote clients to connect, edit"
elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
fi
-
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
}
next reply other threads:[~2022-12-19 1:13 UTC|newest]
Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 1:13 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: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-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-10-20 1:14 Sam James
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=1671412393.0891f002e96a1ca716a201e8479f2ec75e0b2274.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