diff options
4 files changed, 34 insertions, 19 deletions
diff --git a/misc/iscan-proprietary-drivers/README b/misc/iscan-proprietary-drivers/README index 7a949757ff..3aed0f6e18 100644 --- a/misc/iscan-proprietary-drivers/README +++ b/misc/iscan-proprietary-drivers/README @@ -1,8 +1,9 @@ -These are the proprietary binary-only i386-only -libraries for EPSON USB scanners. The libraries -are provided under the terms of the license -agreement provided in the EAPL and LICENSE files -in the directory /usr/doc/iscan-proprietary-drivers/ +These are the proprietary binary-only i386-only +libraries for EPSON USB scanners. The libraries +are provided (in object code form only) under the +terms of the license agreement provided in the +EAPL and LICENSE files in the directory +/usr/doc/iscan-proprietary-drivers/ The proprietary libraries used by the driver epkowa are only needed for the following scanners: @@ -32,6 +33,10 @@ libesint68: Perfection V350 PHOTO / GT-F700 libesint7A: Perfection V200 PHOTO / GT-F670 +libesint7E: Stylus CX4300, Stylus CX4400, + Stylus CX5500, Stylus CX5600, + Stylus DX4400 + Additionally proprietary firmware files are only needed for the following scanners: diff --git a/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.SlackBuild b/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.SlackBuild index c58343e7df..becb8b6d72 100644 --- a/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.SlackBuild +++ b/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for iscan-proprietary-drivers -# Copyright 2008 Simone Giustetti (studiosg@giustetti.net) +# Copyright 2008-2009 Simone Giustetti (studiosg@giustetti.net) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=iscan-proprietary-drivers -VERSION=2.8.0.1 -RPMBUILD=11 # <-- This is the build number used by OpenSuSE in their RPM -ARCH=${ARCH:-noarch} +VERSION=2.10.0.1 +ARCH=${ARCH:-i586} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,6 +33,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "x86_64" ]; then + RPMBUILD="1.3" + LIBDIRSUFFIX="64" +else + ARCH="i586" + RPMBUILD="1.4" # <-- This is the build number used by OpenSuSE in their RPM + LIBDIRSUFFIX="" +fi + set -e rm -rf $PKG @@ -42,7 +50,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION -rpm2cpio $CWD/$PRGNAM-$VERSION-$RPMBUILD.i586.rpm | cpio -imdv +rpm2cpio $CWD/$PRGNAM-$VERSION-$RPMBUILD.$ARCH.rpm | cpio -imdv chown -R root:root . chmod -R u+w,go+r-w,a-s . cd usr/share @@ -55,12 +63,12 @@ cp -a doc/packages/iscan-proprietary-drivers/iscan-plugin-gt-f520-1.0.0/* \ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cd $TMP/$PRGNAM-$VERSION/usr/lib -mkdir -p $PKG/usr/lib/iscan -cp -a iscan/* $PKG/usr/lib/iscan +cd $TMP/$PRGNAM-$VERSION/usr/lib${LIBDIRSUFFIX} +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/iscan +cp -a iscan/* $PKG/usr/lib${LIBDIRSUFFIX}/iscan mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.info b/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.info index f33ef15cda..bedf0ed396 100644 --- a/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.info +++ b/misc/iscan-proprietary-drivers/iscan-proprietary-drivers.info @@ -1,8 +1,10 @@ PRGNAM="iscan-proprietary-drivers" -VERSION="2.8.0.1" +VERSION="2.10.0.1-1.4" HOMEPAGE="http://www.avasys.jp/english/linux_e/index.html" -DOWNLOAD="http://download.opensuse.org/distribution/10.3/repo/non-oss/suse/i586/iscan-proprietary-drivers-2.8.0.1-11.i586.rpm" -MD5SUM="2a87f33b1838ae5baa1652d1ac5d9bfc" +DOWNLOAD="http://download.opensuse.org/distribution/11.1/repo/non-oss/suse/i586/iscan-proprietary-drivers-2.10.0.1-1.4.i586.rpm" +MD5SUM="383eeb092a856ce16dd3ad215f522585" +DOWNLOAD_x86_64="http://download.opensuse.org/distribution/11.1/repo/non-oss/suse/x86_64/iscan-proprietary-drivers-2.10.0.1-1.3.x86_64.rpm" +MD5SUM_x86_64="6f86886b87c78d180f823c0d2b801be2" MAINTAINER="Simone Giustetti" EMAIL="studiosg@giustetti.net" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="dsomero" diff --git a/misc/iscan-proprietary-drivers/slack-desc b/misc/iscan-proprietary-drivers/slack-desc index 01bcd895c2..8e5edf3eb4 100644 --- a/misc/iscan-proprietary-drivers/slack-desc +++ b/misc/iscan-proprietary-drivers/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| iscan-proprietary-drivers: iscan (binary-only drivers for EPSON USB scanners) iscan-proprietary-drivers: iscan-proprietary-drivers: These are the binary-only drivers for EPSON USB scanners, |