[arch-commits] Commit in iscan/repos (22 files)
Fabio Castelli
muflone at archlinux.org
Mon Jan 23 00:02:49 UTC 2017
Date: Monday, January 23, 2017 @ 00:02:48
Author: muflone
Revision: 208462
db-move: moved iscan from [community-testing] to [community] (i686, x86_64)
Added:
iscan/repos/community-i686/PKGBUILD
(from rev 208460, iscan/repos/community-testing-i686/PKGBUILD)
iscan/repos/community-i686/epkowa.conf
(from rev 208460, iscan/repos/community-testing-i686/epkowa.conf)
iscan/repos/community-i686/iscan.install
(from rev 208460, iscan/repos/community-testing-i686/iscan.install)
iscan/repos/community-i686/jpegstream.cc.patch
(from rev 208460, iscan/repos/community-testing-i686/jpegstream.cc.patch)
iscan/repos/community-i686/libpng15.patch
(from rev 208460, iscan/repos/community-testing-i686/libpng15.patch)
iscan/repos/community-x86_64/PKGBUILD
(from rev 208460, iscan/repos/community-testing-x86_64/PKGBUILD)
iscan/repos/community-x86_64/epkowa.conf
(from rev 208460, iscan/repos/community-testing-x86_64/epkowa.conf)
iscan/repos/community-x86_64/iscan.install
(from rev 208460, iscan/repos/community-testing-x86_64/iscan.install)
iscan/repos/community-x86_64/jpegstream.cc.patch
(from rev 208460, iscan/repos/community-testing-x86_64/jpegstream.cc.patch)
iscan/repos/community-x86_64/libpng15.patch
(from rev 208460, iscan/repos/community-testing-x86_64/libpng15.patch)
Deleted:
iscan/repos/community-i686/PKGBUILD
iscan/repos/community-i686/epkowa.conf
iscan/repos/community-i686/iscan.install
iscan/repos/community-i686/jpegstream.cc.patch
iscan/repos/community-i686/libpng15.patch
iscan/repos/community-testing-i686/
iscan/repos/community-testing-x86_64/
iscan/repos/community-x86_64/PKGBUILD
iscan/repos/community-x86_64/epkowa.conf
iscan/repos/community-x86_64/iscan.install
iscan/repos/community-x86_64/jpegstream.cc.patch
iscan/repos/community-x86_64/libpng15.patch
--------------------------------------+
/PKGBUILD | 152 +++++++++++++++++++++++++++++++++
/epkowa.conf | 2
/iscan.install | 10 ++
/jpegstream.cc.patch | 42 +++++++++
/libpng15.patch | 96 ++++++++++++++++++++
community-i686/PKGBUILD | 77 ----------------
community-i686/epkowa.conf | 1
community-i686/iscan.install | 5 -
community-i686/jpegstream.cc.patch | 21 ----
community-i686/libpng15.patch | 48 ----------
community-x86_64/PKGBUILD | 77 ----------------
community-x86_64/epkowa.conf | 1
community-x86_64/iscan.install | 5 -
community-x86_64/jpegstream.cc.patch | 21 ----
community-x86_64/libpng15.patch | 48 ----------
15 files changed, 302 insertions(+), 304 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-i686/PKGBUILD 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Frederic Bezies < fredbezies at gmail dot com>
-# Contributor: garion < garion @ mailoo.org >
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=iscan
-pkgver=2.30.2
-pkgrel=1
-_pkgrev=2
-pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
-arch=('i686' 'x86_64')
-url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-license=('GPL2' 'custom:AVASYSPL')
-depends=('gtk2' 'sane' 'libstdc++5')
-makedepends=('gettext' 'gimp')
-optdepends=('iscan-data: Image Scan! data files required for some devices')
-source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver}-${_pkgrev}.tar.gz"
- "libpng15.patch"
- "jpegstream.cc.patch"
- "epkowa.conf")
-sha256sums=('ca2322a527ab41c8207b060ee54fc3782cba84c444bcf6b9c8ee32f7cda007d9'
- '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
- '44990a5264e530a7a8ad1f95524e5d70e4f0f9009c53c8ea593cedf8d861a669'
- '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
-install="${pkgname}.install"
-backup=("etc/sane.d/epkowa.conf")
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- # patch for building iscan against libpng15 by giovanni
- patch -Np0 -i "../libpng15.patch"
- # patch for ambiguous div in jpegstream.cc
- patch -Np0 -i "../jpegstream.cc.patch"
- # add fix for CXX ABI different than 1002
- ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- export LDFLAGS="${LDFLAGS} -ldl -lpng16"
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --enable-dependency-reduction \
- --enable-frontend \
- --enable-jpeg \
- --enable-tiff \
- --enable-png \
- --enable-gimp
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- # install files
- make DESTDIR="${pkgdir}" install
-
- # install sane configuration files
- install -m 755 -d "${pkgdir}/etc/sane.d"
- install -m 644 -D "backend/epkowa.conf" "${pkgdir}/etc/sane.d/"
- install -m 755 -d "${pkgdir}/etc/sane.d/dll.d"
- install -m 644 "${srcdir}/epkowa.conf" "${pkgdir}/etc/sane.d/dll.d/"
-
- # install desktop file
- install -m 755 -d "${pkgdir}/usr/share/applications"
- install -m 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
-
- # install license
- install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m 644 "non-free/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
-
- # install plugin for GIMP
- install -m 755 -d "${pkgdir}/usr/lib/gimp/2.0/plug-ins"
- ln -s "/usr/bin/iscan" "${pkgdir}/usr/lib/gimp/2.0/plug-ins/"
-}
-
Copied: iscan/repos/community-i686/PKGBUILD (from rev 208460, iscan/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Frederic Bezies < fredbezies at gmail dot com>
+# Contributor: garion < garion @ mailoo.org >
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=iscan
+pkgver=2.30.3.1
+pkgrel=1
+pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
+arch=('i686' 'x86_64')
+url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+license=('GPL2' 'custom:AVASYSPL')
+depends=('gtk2' 'sane' 'libstdc++5')
+makedepends=('gettext' 'gimp')
+optdepends=('iscan-data: Image Scan! data files required for some devices')
+source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver%.*}-${pkgver/*.}.tar.gz"
+ "libpng15.patch"
+ "jpegstream.cc.patch"
+ "epkowa.conf")
+sha256sums=('91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67'
+ '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
+ '44990a5264e530a7a8ad1f95524e5d70e4f0f9009c53c8ea593cedf8d861a669'
+ '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
+install="${pkgname}.install"
+backup=("etc/sane.d/epkowa.conf")
+
+prepare() {
+ cd "${pkgname}-${pkgver%.*}"
+ # patch for building iscan against libpng15 by giovanni
+ patch -Np0 -i "../libpng15.patch"
+ # patch for ambiguous div in jpegstream.cc
+ patch -Np0 -i "../jpegstream.cc.patch"
+ # add fix for CXX ABI different than 1002
+ ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
+}
+
+build() {
+ cd "${pkgname}-${pkgver%.*}"
+ export LDFLAGS="${LDFLAGS} -ldl -lpng16"
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --enable-dependency-reduction \
+ --enable-frontend \
+ --enable-jpeg \
+ --enable-tiff \
+ --enable-png \
+ --enable-gimp
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver%.*}"
+
+ # install files
+ make DESTDIR="${pkgdir}" install
+
+ # install sane configuration files
+ install -m 755 -d "${pkgdir}/etc/sane.d"
+ install -m 644 -D "backend/epkowa.conf" "${pkgdir}/etc/sane.d/"
+ install -m 755 -d "${pkgdir}/etc/sane.d/dll.d"
+ install -m 644 "${srcdir}/epkowa.conf" "${pkgdir}/etc/sane.d/dll.d/"
+
+ # install desktop file
+ install -m 755 -d "${pkgdir}/usr/share/applications"
+ install -m 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
+
+ # install license
+ install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m 644 "non-free/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
+
+ # install plugin for GIMP
+ install -m 755 -d "${pkgdir}/usr/lib/gimp/2.0/plug-ins"
+ ln -s "/usr/bin/iscan" "${pkgdir}/usr/lib/gimp/2.0/plug-ins/"
+}
+
Deleted: community-i686/epkowa.conf
===================================================================
--- community-i686/epkowa.conf 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-i686/epkowa.conf 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1 +0,0 @@
-epkowa
Copied: iscan/repos/community-i686/epkowa.conf (from rev 208460, iscan/repos/community-testing-i686/epkowa.conf)
===================================================================
--- community-i686/epkowa.conf (rev 0)
+++ community-i686/epkowa.conf 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1 @@
+epkowa
Deleted: community-i686/iscan.install
===================================================================
--- community-i686/iscan.install 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-i686/iscan.install 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,5 +0,0 @@
-post_install() {
- echo "==> In order to use the scanner most probably you have to install a specific"
- echo "==> firmware for your device. See: https://wiki.archlinux.org/index.php/Sane"
-}
-
Copied: iscan/repos/community-i686/iscan.install (from rev 208460, iscan/repos/community-testing-i686/iscan.install)
===================================================================
--- community-i686/iscan.install (rev 0)
+++ community-i686/iscan.install 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,5 @@
+post_install() {
+ echo "==> In order to use the scanner most probably you have to install a specific"
+ echo "==> firmware for your device. See: https://wiki.archlinux.org/index.php/Sane"
+}
+
Deleted: community-i686/jpegstream.cc.patch
===================================================================
--- community-i686/jpegstream.cc.patch 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-i686/jpegstream.cc.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,21 +0,0 @@
---- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200
-+++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200
-@@ -33,7 +33,7 @@
-
- #include "jpegstream.hh"
-
--#include <cstdlib>
-+// #include <cstdlib>
- #include <ios>
-
- namespace iscan
-@@ -82,7 +82,8 @@
- // only that _bits != 8.
- for (unsigned int i = 0; i < _h_sz; ++i)
- {
-- div_t index = div (i, 8 * sizeof (JSAMPLE));
-+ div_t index = div (static_cast<int>(i),
-+ static_cast<int>(8 * sizeof (JSAMPLE)));
- int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
- _scanline[i] = ((line[index.quot] & (1 << offset))
- ? 0 : ~0);
Copied: iscan/repos/community-i686/jpegstream.cc.patch (from rev 208460, iscan/repos/community-testing-i686/jpegstream.cc.patch)
===================================================================
--- community-i686/jpegstream.cc.patch (rev 0)
+++ community-i686/jpegstream.cc.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,21 @@
+--- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200
++++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+
+ #include "jpegstream.hh"
+
+-#include <cstdlib>
++// #include <cstdlib>
+ #include <ios>
+
+ namespace iscan
+@@ -82,7 +82,8 @@
+ // only that _bits != 8.
+ for (unsigned int i = 0; i < _h_sz; ++i)
+ {
+- div_t index = div (i, 8 * sizeof (JSAMPLE));
++ div_t index = div (static_cast<int>(i),
++ static_cast<int>(8 * sizeof (JSAMPLE)));
+ int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+ _scanline[i] = ((line[index.quot] & (1 << offset))
+ ? 0 : ~0);
Deleted: community-i686/libpng15.patch
===================================================================
--- community-i686/libpng15.patch 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-i686/libpng15.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,48 +0,0 @@
---- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100
-@@ -83,7 +83,12 @@
- #if HAVE_PNG_H
- set_error_handler (_png, _info);
-
-+/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */
-+#if PNG_LIBPNG_VER > 10499
-+ if (!_footer && _v_sz == lib->get_current_row_number(_png))
-+#else
- if (_header && !_footer && _png->num_rows == _png->flush_rows)
-+#endif
- {
- lib->write_end (_png, _info);
- _footer = true;
-@@ -167,6 +172,9 @@
- funcsym (write_row);
- funcsym (write_flush);
- funcsym (write_end);
-+#if PNG_LIBPNG_VER > 10499
-+ funcsym (get_current_row_number);
-+#endif
-
- if (lib->access_version_number
- && lib->create_write_struct
-@@ -176,6 +184,9 @@
- && lib->set_IHDR
- && lib->set_pHYs
- && lib->set_invert_mono
-+#if PNG_LIBPNG_VER > 10499
-+ && lib->get_current_row_number
-+#endif
- && lib->write_info
- && lib->write_row
- && lib->write_flush
---- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100
-@@ -108,6 +108,10 @@
- png_structp);
- fundecl (void, write_end,
- png_structp, png_infop);
-+#if PNG_LIBPNG_VER > 10499
-+ fundecl (png_uint_32, get_current_row_number,
-+ png_structp);
-+#endif
- #endif /* HAVE_PNG_H */
- };
- static png_lib_handle *lib;
Copied: iscan/repos/community-i686/libpng15.patch (from rev 208460, iscan/repos/community-testing-i686/libpng15.patch)
===================================================================
--- community-i686/libpng15.patch (rev 0)
+++ community-i686/libpng15.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,48 @@
+--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100
+@@ -83,7 +83,12 @@
+ #if HAVE_PNG_H
+ set_error_handler (_png, _info);
+
++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */
++#if PNG_LIBPNG_VER > 10499
++ if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+ if (_header && !_footer && _png->num_rows == _png->flush_rows)
++#endif
+ {
+ lib->write_end (_png, _info);
+ _footer = true;
+@@ -167,6 +172,9 @@
+ funcsym (write_row);
+ funcsym (write_flush);
+ funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++ funcsym (get_current_row_number);
++#endif
+
+ if (lib->access_version_number
+ && lib->create_write_struct
+@@ -176,6 +184,9 @@
+ && lib->set_IHDR
+ && lib->set_pHYs
+ && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++ && lib->get_current_row_number
++#endif
+ && lib->write_info
+ && lib->write_row
+ && lib->write_flush
+--- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100
+@@ -108,6 +108,10 @@
+ png_structp);
+ fundecl (void, write_end,
+ png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++ fundecl (png_uint_32, get_current_row_number,
++ png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+ };
+ static png_lib_handle *lib;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-x86_64/PKGBUILD 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: Frederic Bezies < fredbezies at gmail dot com>
-# Contributor: garion < garion @ mailoo.org >
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=iscan
-pkgver=2.30.2
-pkgrel=1
-_pkgrev=2
-pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
-arch=('i686' 'x86_64')
-url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-license=('GPL2' 'custom:AVASYSPL')
-depends=('gtk2' 'sane' 'libstdc++5')
-makedepends=('gettext' 'gimp')
-optdepends=('iscan-data: Image Scan! data files required for some devices')
-source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver}-${_pkgrev}.tar.gz"
- "libpng15.patch"
- "jpegstream.cc.patch"
- "epkowa.conf")
-sha256sums=('ca2322a527ab41c8207b060ee54fc3782cba84c444bcf6b9c8ee32f7cda007d9'
- '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
- '44990a5264e530a7a8ad1f95524e5d70e4f0f9009c53c8ea593cedf8d861a669'
- '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
-install="${pkgname}.install"
-backup=("etc/sane.d/epkowa.conf")
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- # patch for building iscan against libpng15 by giovanni
- patch -Np0 -i "../libpng15.patch"
- # patch for ambiguous div in jpegstream.cc
- patch -Np0 -i "../jpegstream.cc.patch"
- # add fix for CXX ABI different than 1002
- ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- export LDFLAGS="${LDFLAGS} -ldl -lpng16"
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --enable-dependency-reduction \
- --enable-frontend \
- --enable-jpeg \
- --enable-tiff \
- --enable-png \
- --enable-gimp
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- # install files
- make DESTDIR="${pkgdir}" install
-
- # install sane configuration files
- install -m 755 -d "${pkgdir}/etc/sane.d"
- install -m 644 -D "backend/epkowa.conf" "${pkgdir}/etc/sane.d/"
- install -m 755 -d "${pkgdir}/etc/sane.d/dll.d"
- install -m 644 "${srcdir}/epkowa.conf" "${pkgdir}/etc/sane.d/dll.d/"
-
- # install desktop file
- install -m 755 -d "${pkgdir}/usr/share/applications"
- install -m 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
-
- # install license
- install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m 644 "non-free/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
-
- # install plugin for GIMP
- install -m 755 -d "${pkgdir}/usr/lib/gimp/2.0/plug-ins"
- ln -s "/usr/bin/iscan" "${pkgdir}/usr/lib/gimp/2.0/plug-ins/"
-}
-
Copied: iscan/repos/community-x86_64/PKGBUILD (from rev 208460, iscan/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Frederic Bezies < fredbezies at gmail dot com>
+# Contributor: garion < garion @ mailoo.org >
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=iscan
+pkgver=2.30.3.1
+pkgrel=1
+pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
+arch=('i686' 'x86_64')
+url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+license=('GPL2' 'custom:AVASYSPL')
+depends=('gtk2' 'sane' 'libstdc++5')
+makedepends=('gettext' 'gimp')
+optdepends=('iscan-data: Image Scan! data files required for some devices')
+source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver%.*}-${pkgver/*.}.tar.gz"
+ "libpng15.patch"
+ "jpegstream.cc.patch"
+ "epkowa.conf")
+sha256sums=('91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67'
+ '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
+ '44990a5264e530a7a8ad1f95524e5d70e4f0f9009c53c8ea593cedf8d861a669'
+ '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
+install="${pkgname}.install"
+backup=("etc/sane.d/epkowa.conf")
+
+prepare() {
+ cd "${pkgname}-${pkgver%.*}"
+ # patch for building iscan against libpng15 by giovanni
+ patch -Np0 -i "../libpng15.patch"
+ # patch for ambiguous div in jpegstream.cc
+ patch -Np0 -i "../jpegstream.cc.patch"
+ # add fix for CXX ABI different than 1002
+ ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
+}
+
+build() {
+ cd "${pkgname}-${pkgver%.*}"
+ export LDFLAGS="${LDFLAGS} -ldl -lpng16"
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --enable-dependency-reduction \
+ --enable-frontend \
+ --enable-jpeg \
+ --enable-tiff \
+ --enable-png \
+ --enable-gimp
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver%.*}"
+
+ # install files
+ make DESTDIR="${pkgdir}" install
+
+ # install sane configuration files
+ install -m 755 -d "${pkgdir}/etc/sane.d"
+ install -m 644 -D "backend/epkowa.conf" "${pkgdir}/etc/sane.d/"
+ install -m 755 -d "${pkgdir}/etc/sane.d/dll.d"
+ install -m 644 "${srcdir}/epkowa.conf" "${pkgdir}/etc/sane.d/dll.d/"
+
+ # install desktop file
+ install -m 755 -d "${pkgdir}/usr/share/applications"
+ install -m 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
+
+ # install license
+ install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m 644 "non-free/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
+
+ # install plugin for GIMP
+ install -m 755 -d "${pkgdir}/usr/lib/gimp/2.0/plug-ins"
+ ln -s "/usr/bin/iscan" "${pkgdir}/usr/lib/gimp/2.0/plug-ins/"
+}
+
Deleted: community-x86_64/epkowa.conf
===================================================================
--- community-x86_64/epkowa.conf 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-x86_64/epkowa.conf 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1 +0,0 @@
-epkowa
Copied: iscan/repos/community-x86_64/epkowa.conf (from rev 208460, iscan/repos/community-testing-x86_64/epkowa.conf)
===================================================================
--- community-x86_64/epkowa.conf (rev 0)
+++ community-x86_64/epkowa.conf 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1 @@
+epkowa
Deleted: community-x86_64/iscan.install
===================================================================
--- community-x86_64/iscan.install 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-x86_64/iscan.install 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,5 +0,0 @@
-post_install() {
- echo "==> In order to use the scanner most probably you have to install a specific"
- echo "==> firmware for your device. See: https://wiki.archlinux.org/index.php/Sane"
-}
-
Copied: iscan/repos/community-x86_64/iscan.install (from rev 208460, iscan/repos/community-testing-x86_64/iscan.install)
===================================================================
--- community-x86_64/iscan.install (rev 0)
+++ community-x86_64/iscan.install 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,5 @@
+post_install() {
+ echo "==> In order to use the scanner most probably you have to install a specific"
+ echo "==> firmware for your device. See: https://wiki.archlinux.org/index.php/Sane"
+}
+
Deleted: community-x86_64/jpegstream.cc.patch
===================================================================
--- community-x86_64/jpegstream.cc.patch 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-x86_64/jpegstream.cc.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,21 +0,0 @@
---- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200
-+++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200
-@@ -33,7 +33,7 @@
-
- #include "jpegstream.hh"
-
--#include <cstdlib>
-+// #include <cstdlib>
- #include <ios>
-
- namespace iscan
-@@ -82,7 +82,8 @@
- // only that _bits != 8.
- for (unsigned int i = 0; i < _h_sz; ++i)
- {
-- div_t index = div (i, 8 * sizeof (JSAMPLE));
-+ div_t index = div (static_cast<int>(i),
-+ static_cast<int>(8 * sizeof (JSAMPLE)));
- int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
- _scanline[i] = ((line[index.quot] & (1 << offset))
- ? 0 : ~0);
Copied: iscan/repos/community-x86_64/jpegstream.cc.patch (from rev 208460, iscan/repos/community-testing-x86_64/jpegstream.cc.patch)
===================================================================
--- community-x86_64/jpegstream.cc.patch (rev 0)
+++ community-x86_64/jpegstream.cc.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,21 @@
+--- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200
++++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+
+ #include "jpegstream.hh"
+
+-#include <cstdlib>
++// #include <cstdlib>
+ #include <ios>
+
+ namespace iscan
+@@ -82,7 +82,8 @@
+ // only that _bits != 8.
+ for (unsigned int i = 0; i < _h_sz; ++i)
+ {
+- div_t index = div (i, 8 * sizeof (JSAMPLE));
++ div_t index = div (static_cast<int>(i),
++ static_cast<int>(8 * sizeof (JSAMPLE)));
+ int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+ _scanline[i] = ((line[index.quot] & (1 << offset))
+ ? 0 : ~0);
Deleted: community-x86_64/libpng15.patch
===================================================================
--- community-x86_64/libpng15.patch 2017-01-23 00:02:46 UTC (rev 208461)
+++ community-x86_64/libpng15.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -1,48 +0,0 @@
---- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100
-@@ -83,7 +83,12 @@
- #if HAVE_PNG_H
- set_error_handler (_png, _info);
-
-+/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */
-+#if PNG_LIBPNG_VER > 10499
-+ if (!_footer && _v_sz == lib->get_current_row_number(_png))
-+#else
- if (_header && !_footer && _png->num_rows == _png->flush_rows)
-+#endif
- {
- lib->write_end (_png, _info);
- _footer = true;
-@@ -167,6 +172,9 @@
- funcsym (write_row);
- funcsym (write_flush);
- funcsym (write_end);
-+#if PNG_LIBPNG_VER > 10499
-+ funcsym (get_current_row_number);
-+#endif
-
- if (lib->access_version_number
- && lib->create_write_struct
-@@ -176,6 +184,9 @@
- && lib->set_IHDR
- && lib->set_pHYs
- && lib->set_invert_mono
-+#if PNG_LIBPNG_VER > 10499
-+ && lib->get_current_row_number
-+#endif
- && lib->write_info
- && lib->write_row
- && lib->write_flush
---- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100
-@@ -108,6 +108,10 @@
- png_structp);
- fundecl (void, write_end,
- png_structp, png_infop);
-+#if PNG_LIBPNG_VER > 10499
-+ fundecl (png_uint_32, get_current_row_number,
-+ png_structp);
-+#endif
- #endif /* HAVE_PNG_H */
- };
- static png_lib_handle *lib;
Copied: iscan/repos/community-x86_64/libpng15.patch (from rev 208460, iscan/repos/community-testing-x86_64/libpng15.patch)
===================================================================
--- community-x86_64/libpng15.patch (rev 0)
+++ community-x86_64/libpng15.patch 2017-01-23 00:02:48 UTC (rev 208462)
@@ -0,0 +1,48 @@
+--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100
+@@ -83,7 +83,12 @@
+ #if HAVE_PNG_H
+ set_error_handler (_png, _info);
+
++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */
++#if PNG_LIBPNG_VER > 10499
++ if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+ if (_header && !_footer && _png->num_rows == _png->flush_rows)
++#endif
+ {
+ lib->write_end (_png, _info);
+ _footer = true;
+@@ -167,6 +172,9 @@
+ funcsym (write_row);
+ funcsym (write_flush);
+ funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++ funcsym (get_current_row_number);
++#endif
+
+ if (lib->access_version_number
+ && lib->create_write_struct
+@@ -176,6 +184,9 @@
+ && lib->set_IHDR
+ && lib->set_pHYs
+ && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++ && lib->get_current_row_number
++#endif
+ && lib->write_info
+ && lib->write_row
+ && lib->write_flush
+--- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100
+@@ -108,6 +108,10 @@
+ png_structp);
+ fundecl (void, write_end,
+ png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++ fundecl (png_uint_32, get_current_row_number,
++ png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+ };
+ static png_lib_handle *lib;
More information about the arch-commits
mailing list