From a3192f6d32e2170bfaeb028f0821779e08f64845 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 16 Dec 2022 01:26:10 +0000 Subject: media-gfx/iscan: add media-libs/libtiff subslot dep libtiff changed SONAME. Signed-off-by: Sam James --- media-gfx/iscan/iscan-2.30.4.2-r1.ebuild | 153 ------------------------------- media-gfx/iscan/iscan-2.30.4.2-r3.ebuild | 153 +++++++++++++++++++++++++++++++ media-gfx/iscan/iscan-3.65.0-r1.ebuild | 108 ++++++++++++++++++++++ media-gfx/iscan/iscan-3.65.0.ebuild | 108 ---------------------- 4 files changed, 261 insertions(+), 261 deletions(-) delete mode 100644 media-gfx/iscan/iscan-2.30.4.2-r1.ebuild create mode 100644 media-gfx/iscan/iscan-2.30.4.2-r3.ebuild create mode 100644 media-gfx/iscan/iscan-3.65.0-r1.ebuild delete mode 100644 media-gfx/iscan/iscan-3.65.0.ebuild diff --git a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild deleted file mode 100644 index c1eb390986e3..000000000000 --- a/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_DOC="userg_revQ" -inherit autotools desktop flag-o-matic - -# HINTS: -# -> non-free modules are x86 and amd64 only -# -> iscan frontend needs non-free modules -# -> sane-epkowa should be usable on every arch -# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3) -# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later) - -# FIXME: -# iscan doesn't compile w/o libusb, this should be fixed somehow. - -# TODO: -# (re)add closed-source binary modules which are needed for some scanners. - -DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)" -HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" -SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz - doc? ( - https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf - l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf ) - )" - -LICENSE="GPL-2 AVASYS" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc gimp l10n_ja nls X" - -REQUIRED_USE="gimp? ( X )" - -DEPEND=" - dev-libs/libxml2:2 - media-gfx/sane-backends - virtual/libusb:1 - virtual/udev - gimp? ( media-gfx/gimp:0/2 ) - X? ( - dev-libs/glib:2 - media-libs/libpng:= - media-libs/tiff:= - virtual/jpeg:= - x11-libs/gtk+:2 - ) -" -RDEPEND="${DEPEND} - media-gfx/iscan-data -" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -# Upstream ships broken sanity test -RESTRICT="test" - -S="${WORKDIR}/${PN}-$(ver_cut 1-3)" - -DOCS=( AUTHORS NEWS README ) - -PATCHES=( - "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch - "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch - "${FILESDIR}"/iscan-2.29.1-png-libs.patch - "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch - "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch - "${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch - "${FILESDIR}"/iscan-2.30.4.2-sscanf.patch - "${FILESDIR}"/iscan-2.30.4.2-c99.patch -) - -QA_PRESTRIPPED="usr/lib.*/libesmod.so.*" -QA_TEXTRELS="${QA_PRESTRIPPED}" -QA_FLAGS_IGNORED="${QA_PRESTRIPPED}" - -src_prepare() { - default - - if ! use X; then - sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \ - -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die - fi - - eautoreconf -} - -src_configure() { - append-cppflags -D_GNU_SOURCE # needed for 'strndup' - replace-flags "-O[0-9s]" "-O1" # fix selector box bug 388073 - - local myeconfargs=( - --enable-dependency-reduction - --disable-static - $(use_enable nls) - $(use_enable gimp) - $(use_enable X frontend) - $(use_enable X jpeg) - $(use_enable X png) - $(use_enable X tiff) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - use l10n_ja && DOCS+=( {NEWS,README}.ja ) - use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" ) - default - - # install sane config - insinto /etc/sane.d - doins backend/epkowa.conf - - # link iscan so it is seen as a plugin in gimp - local gimpplugindir - local gimptool - if use gimp; then - for gimptool in gimptool gimptool-2.0; do - if [[ -x /usr/bin/${gimptool} ]]; then - einfo "Setting plugin link for GIMP version $(/usr/bin/${gimptool} --version)" - gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins - break - fi - done - if [[ "/plug-ins" != "${gimpplugindir}" ]]; then - dodir ${gimpplugindir} - dosym ../../../../bin/iscan "${gimpplugindir}"/iscan - else - ewarn "No idea where to find the gimp plugin directory" - fi - fi - - use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner -} - -pkg_postinst() { - local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf" - local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf" - - if grep -q "^[ \t]*\" ${DLL_CONF}; then - elog "Please edit ${EPKOWA_CONF} to suit your needs." - elif grep -q "\" ${DLL_CONF}; then - elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}" - elog "Then edit ${EPKOWA_CONF} to suit your needs." - else - echo "epkowa" >> ${DLL_CONF} || die - elog "A new entry 'epkowa' was added to ${DLL_CONF}" - elog "Please edit ${EPKOWA_CONF} to suit your needs." - fi -} diff --git a/media-gfx/iscan/iscan-2.30.4.2-r3.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r3.ebuild new file mode 100644 index 000000000000..9b5dab52d145 --- /dev/null +++ b/media-gfx/iscan/iscan-2.30.4.2-r3.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_DOC="userg_revQ" +inherit autotools desktop flag-o-matic + +# HINTS: +# -> non-free modules are x86 and amd64 only +# -> iscan frontend needs non-free modules +# -> sane-epkowa should be usable on every arch +# -> ${P}-${SRC_REV}.tar.gz (for gcc 3.2/3.3) +# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later) + +# FIXME: +# iscan doesn't compile w/o libusb, this should be fixed somehow. + +# TODO: +# (re)add closed-source binary modules which are needed for some scanners. + +DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)" +HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz + doc? ( + https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf + l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf ) + )" + +LICENSE="GPL-2 AVASYS" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="doc gimp l10n_ja nls X" + +REQUIRED_USE="gimp? ( X )" + +DEPEND=" + dev-libs/libxml2:2 + media-gfx/sane-backends + virtual/libusb:1 + virtual/udev + gimp? ( media-gfx/gimp:0/2 ) + X? ( + dev-libs/glib:2 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/tiff:= + x11-libs/gtk+:2 + ) +" +RDEPEND="${DEPEND} + media-gfx/iscan-data +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +# Upstream ships broken sanity test +RESTRICT="test" + +S="${WORKDIR}/${PN}-$(ver_cut 1-3)" + +DOCS=( AUTHORS NEWS README ) + +PATCHES=( + "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch + "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch + "${FILESDIR}"/iscan-2.29.1-png-libs.patch + "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch + "${FILESDIR}"/iscan-2.30.1.1-gcc6.patch + "${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch + "${FILESDIR}"/iscan-2.30.4.2-sscanf.patch + "${FILESDIR}"/iscan-2.30.4.2-c99.patch +) + +QA_PRESTRIPPED="usr/lib.*/libesmod.so.*" +QA_TEXTRELS="${QA_PRESTRIPPED}" +QA_FLAGS_IGNORED="${QA_PRESTRIPPED}" + +src_prepare() { + default + + if ! use X; then + sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \ + -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die + fi + + eautoreconf +} + +src_configure() { + append-cppflags -D_GNU_SOURCE # needed for 'strndup' + replace-flags "-O[0-9s]" "-O1" # fix selector box bug 388073 + + local myeconfargs=( + --enable-dependency-reduction + --disable-static + $(use_enable nls) + $(use_enable gimp) + $(use_enable X frontend) + $(use_enable X jpeg) + $(use_enable X png) + $(use_enable X tiff) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + use l10n_ja && DOCS+=( {NEWS,README}.ja ) + use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" ) + default + + # install sane config + insinto /etc/sane.d + doins backend/epkowa.conf + + # link iscan so it is seen as a plugin in gimp + local gimpplugindir + local gimptool + if use gimp; then + for gimptool in gimptool gimptool-2.0; do + if [[ -x /usr/bin/${gimptool} ]]; then + einfo "Setting plugin link for GIMP version $(/usr/bin/${gimptool} --version)" + gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins + break + fi + done + if [[ "/plug-ins" != "${gimpplugindir}" ]]; then + dodir ${gimpplugindir} + dosym ../../../../bin/iscan "${gimpplugindir}"/iscan + else + ewarn "No idea where to find the gimp plugin directory" + fi + fi + + use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner +} + +pkg_postinst() { + local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf" + local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf" + + if grep -q "^[ \t]*\" ${DLL_CONF}; then + elog "Please edit ${EPKOWA_CONF} to suit your needs." + elif grep -q "\" ${DLL_CONF}; then + elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}" + elog "Then edit ${EPKOWA_CONF} to suit your needs." + else + echo "epkowa" >> ${DLL_CONF} || die + elog "A new entry 'epkowa' was added to ${DLL_CONF}" + elog "Please edit ${EPKOWA_CONF} to suit your needs." + fi +} diff --git a/media-gfx/iscan/iscan-3.65.0-r1.ebuild b/media-gfx/iscan/iscan-3.65.0-r1.ebuild new file mode 100644 index 000000000000..21dc24242f01 --- /dev/null +++ b/media-gfx/iscan/iscan-3.65.0-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic udev xdg-utils + +DESCRIPTION="EPSON Image Scan v3 for Linux" +HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi" +SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="graphicsmagick gui test" +KEYWORDS="~amd64 ~x86" + +# Disable opencl as during reorient.utr test it produces inconsistent results +BDEPEND=" + virtual/pkgconfig + test? ( + app-text/tesseract[png,tiff,training,-opencl] + dev-util/uncrustify + media-fonts/dejavu + virtual/imagemagick-tools[png,tiff] + ) +" +RDEPEND=" + dev-libs/boost:= + media-gfx/sane-backends + media-libs/libjpeg-turbo:= + media-libs/tiff:= + virtual/libusb:1 + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + gui? ( dev-cpp/gtkmm:2.4 ) +" +DEPEND="${RDEPEND}" +RESTRICT="!test? ( test )" +S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)" + +PATCHES=( + "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch + "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch + "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch + "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch + "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch + "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch + "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch + "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch + "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch + "${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch +) + +src_prepare() { + default + + # Remove vendored libraries + rm -r upstream/boost || die + # Workaround for deprecation warnings: + # https://gitlab.com/utsushi/utsushi/issues/90 + sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die + # Disable check-soname test + sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die + eautoreconf +} + +src_configure() { + # Workaround for: + # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory + append-ldflags $(no-as-needed) + # https://bugs.gentoo.org/720994 + append-ldflags -pthread + local myconf=( + $(use_with gui gtkmm) + --enable-sane-config + --enable-udev-config + --with-boost=yes + --with-jpeg + --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick) + --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick) + --with-sane + --with-tiff + --with-udev-confdir="$(get_udevdir)" + ) + econf "${myconf[@]}" +} + +src_install() { + default + dodoc lib/devices.conf + find "${ED}" -name '*.la' -delete || die + if use gui; then + newicon -s scalable doc/icon.svg "${PN}".svg + make_desktop_entry utsushi "Image Scan" + fi +} + +pkg_postinst() { + udev_reload + use gui && xdg_icon_cache_update + elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution)," + elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs." +} + +pkg_postrm() { + udev_reload + use gui && xdg_icon_cache_update +} diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild deleted file mode 100644 index b47d4d45f4ae..000000000000 --- a/media-gfx/iscan/iscan-3.65.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop flag-o-matic udev xdg-utils - -DESCRIPTION="EPSON Image Scan v3 for Linux" -HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi" -SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="graphicsmagick gui test" -KEYWORDS="~amd64 ~x86" - -# Disable opencl as during reorient.utr test it produces inconsistent results -BDEPEND=" - virtual/pkgconfig - test? ( - app-text/tesseract[png,tiff,training,-opencl] - dev-util/uncrustify - media-fonts/dejavu - virtual/imagemagick-tools[png,tiff] - ) -" -RDEPEND=" - dev-libs/boost:= - media-gfx/sane-backends - media-libs/tiff - virtual/jpeg - virtual/libusb:1 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - gui? ( dev-cpp/gtkmm:2.4 ) -" -DEPEND="${RDEPEND}" -RESTRICT="!test? ( test )" -S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)" - -PATCHES=( - "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch - "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch - "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch - "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch - "${FILESDIR}"/${PN}-3.62.0-fix-symbols.patch - "${FILESDIR}"/${PN}-3.62.0-tests-boost.patch - "${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch - "${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch - "${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch - "${FILESDIR}"/${PN}-3.65.0-sane-backends-1.1.patch -) - -src_prepare() { - default - - # Remove vendored libraries - rm -r upstream/boost || die - # Workaround for deprecation warnings: - # https://gitlab.com/utsushi/utsushi/issues/90 - sed -e 's|=-Werror|="-Werror -Wno-error=deprecated-declarations"|g' -i configure.ac || die - # Disable check-soname test - sed -e '/SANE_BACKEND_SANITY_CHECKS +=/d' -i sane/Makefile.am || die - eautoreconf -} - -src_configure() { - # Workaround for: - # /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory - append-ldflags $(no-as-needed) - # https://bugs.gentoo.org/720994 - append-ldflags -pthread - local myconf=( - $(use_with gui gtkmm) - --enable-sane-config - --enable-udev-config - --with-boost=yes - --with-jpeg - --with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick) - --with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick) - --with-sane - --with-tiff - --with-udev-confdir="$(get_udevdir)" - ) - econf "${myconf[@]}" -} - -src_install() { - default - dodoc lib/devices.conf - find "${ED}" -name '*.la' -delete || die - if use gui; then - newicon -s scalable doc/icon.svg "${PN}".svg - make_desktop_entry utsushi "Image Scan" - fi -} - -pkg_postinst() { - udev_reload - use gui && xdg_icon_cache_update - elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution)," - elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs." -} - -pkg_postrm() { - udev_reload - use gui && xdg_icon_cache_update -} -- cgit v1.2.3-65-gdbad