diff options
| -rw-r--r-- | media-gfx/sane-backends/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/sane-backends/files/epson2fixes-1.0.19.patch | 41 | ||||
| -rw-r--r-- | media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild | 152 |
3 files changed, 200 insertions, 1 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index c3e66bd1b644..4d9fd4ddfa1d 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/sane-backends # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.144 2008/06/17 01:19:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.145 2008/08/01 15:18:23 phosphan Exp $ + +*sane-backends-1.0.19-r2 (01 Aug 2008) + + 01 Aug 2008; Patrick Kursawe <phosphan@gentoo.org> + +files/epson2fixes-1.0.19.patch, +sane-backends-1.0.19-r2.ebuild: + Included epson2 related fixes from SANE cvs 17 Jun 2008; Jeroen Roovers <jer@gentoo.org> sane-backends-1.0.19-r1.ebuild: diff --git a/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch b/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch new file mode 100644 index 000000000000..a32f207f328c --- /dev/null +++ b/media-gfx/sane-backends/files/epson2fixes-1.0.19.patch @@ -0,0 +1,41 @@ +Index: epson2.c +=================================================================== +RCS file: /cvsroot/sane/sane-backends/backend/epson2.c,v +retrieving revision 1.15 +retrieving revision 1.17 +diff -u -r1.15 -r1.17 +--- backend/epson2.c 3 Feb 2008 12:09:09 -0000 1.15 ++++ backend/epson2.c 3 May 2008 14:43:07 -0000 1.17 +@@ -1243,6 +1243,7 @@ + * set dummy values. + */ + ++ s->fd = -1; + s->hw = dev; + + dev->name = NULL; +@@ -1323,7 +1324,6 @@ + if (status != SANE_STATUS_GOOD) { + DBG(1, "%s: inquiry failed: %s\n", __func__, + sane_strstatus(status)); +- close_scanner(s); + goto free; + } + +@@ -1534,8 +1534,6 @@ + dev->need_reset_on_source_change = SANE_TRUE; + } + +- close_scanner(s); +- + /* we are done with this one, prepare for the next scanner */ + num_devices++; + dev->next = first_dev; +@@ -1545,6 +1543,7 @@ + *devp = dev; + + free: ++ close_scanner(s); + free(s); + return status; + } diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild new file mode 100644 index 000000000000..ff5a78cda482 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild,v 1.1 2008/08/01 15:18:23 phosphan Exp $ + +inherit eutils + +IUSE="usb gphoto2 ipv6 v4l doc" + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" + +RDEPEND=">=media-libs/jpeg-6b + amd64? ( sys-libs/libieee1284 ) + x86? ( sys-libs/libieee1284 ) + usb? ( >=dev-libs/libusb-0.1.8 ) + gphoto2? ( media-libs/libgphoto2 ) + v4l? ( sys-kernel/linux-headers )" + +DEPEND="${RDEPEND} + doc? ( + || ( app-text/tetex + ( + app-text/texlive + dev-texlive/texlive-latexextra + ) + ) + ) + >=sys-apps/sed-4" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114" + +BROTHERMFCPATCHVER="1.0.19" +BROTHERMFCDRIVER="sane-${BROTHERMFCPATCHVER}-brother-driver.diff" + +# Could not access via ftp on 2006-07-20 +SRC_URI="http://alioth.debian.org/frs/download.php/2318/${P}.tar.gz + ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz + ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz + usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 + http://dev.gentoo.org/~phosphan/${BROTHERMFCDRIVER}.bz2 )" +SLOT="0" +LICENSE="GPL-2 public-domain" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + +# To enable specific backends, define SANE_BACKENDS with the backends you want +# in those: +# abaton agfafocus apple artec as6e avision bh brother canon +# canon630u coolscan coolscan2 dc25 dmc epjitsu +# epson fujitsu genesys gt68xx hp leo lexmark matsushita microtek +# microtek2 mustek mustek_usb nec pie pixma plustek_pp +# ricoh s9036 sceptre sharp +# sp15c st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u +# artec_eplus48u ma1509 ibm hs2p hp5400 u12 snapscan niash sm3840 hp4200 +# sm3600 hp3500 stv680 epson2 hp5590 hp3900 hpljm1005" + +# Note that some backends has specific dependencies which make the compilation +# fail because not supported on your current platform. + +pkg_setup() { + enewgroup scanner + + if [[ "${SANE_BACKENDS}" != "" ]]; then + use gphoto2 && SANE_BACKENDS="${SANE_BACKENDS} gphoto2" + use v4l && SANE_BACKENDS="${SANE_BACKENDS} v4l" + fi + IEEE1284_BACKENDS="canon_pp hpsj5s mustek_pp" + if ! use x86 && ! use amd64; then + tmp="${SANE_BACKENDS}" + for backend in ${IEEE1284_BACKENDS}; do + if [[ "${tmp/$backend/}" != "${SANE_BACKENDS}" ]]; then + ewarn "You selected a backend which is disabled because it's not usable in your arch." + fi + done + fi +} + +src_unpack() { + if [ -z "${SANE_BACKENDS}" ]; then + elog "You can use the variable SANE_BACKENDS to pick backends" + elog "instead of building all of them." + fi + unpack ${A} + + if use usb; then + unpack ${BROTHERMFCDRIVER}.bz2 + fi + + cd "${S}" + + if ! use doc; then + sed -i -e 's:@USE_LATEX@:no:' doc/Makefile.in + fi + + if use usb; then + epatch "${WORKDIR}/${BROTHERMFCDRIVER}" + sed -e 's/bh canon/bh brother canon/' -i configure || \ + die "could not add 'brother' to backend list" + fi + epatch "${FILESDIR}"/udev-rule-5.patch + epatch "${FILESDIR}"/fujitsu_DBG_LEVEL.patch + epatch "${FILESDIR}"/epson2fixes-"${PV}".patch + cat >> backend/dll.conf.in <<-EOF + # Add support for the HP-specific backend. Needs net-print/hplip installed. + hpaio + EOF +} + +src_compile() { + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${SANE_BACKENDS}" \ + econf \ + $(use_enable usb libusb) \ + $(use_with gphoto2) \ + $(use_enable ipv6) \ + ${myconf} || die "econf failed" + + emake VARTEXFONTS="${T}/fonts" || die + + if use usb; then + cd tools/hotplug + grep -v '^$' libsane.usermap > libsane.usermap.new + mv libsane.usermap.new libsane.usermap + fi +} + +src_install () { + make INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir=/usr/share/doc/${PF} + 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 usb; then + cd tools/hotplug + insinto /etc/hotplug/usb + exeinto /etc/hotplug/usb + doins libsane.usermap + doexe libusbscanner + newdoc README README.hotplug + echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb" + cd ../.. + fi + cd tools/udev + dodir /etc/udev/rules.d + insinto /etc/udev/rules.d + newins libsane.rules 70-libsane.rules + cd ../.. + dodoc NEWS AUTHORS ChangeLog* README README.linux + echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane +} |