Date: Saturday, October 20, 2018 @ 21:27:18
Author: ffy00
Revision: 398140
archrelease: copy trunk to community-x86_64
Added:
epson-inkjet-printer-escpr/repos/community-x86_64/
epson-inkjet-printer-escpr/repos/community-x86_64/PKGBUILD
(from rev 398139, epson-inkjet-printer-escpr/trunk/PKGBUILD)
epson-inkjet-printer-escpr/repos/community-x86_64/bug_x86_64.patch
(from rev 398139, epson-inkjet-printer-escpr/trunk/bug_x86_64.patch)
------------------+
PKGBUILD | 44 +++++++++++++++++++++++
bug_x86_64.patch | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 143 insertions(+)
Copied: epson-inkjet-printer-escpr/repos/community-x86_64/PKGBUILD (from rev
398139, epson-inkjet-printer-escpr/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2018-10-20 21:27:18 UTC (rev 398140)
@@ -0,0 +1,44 @@
+# Maintainer: Filipe Laíns (FFY00) <[email protected]>
+# Contributor: Hyacinthe Cartiaux <[email protected]>
+# Contributor: James An <[email protected]>
+# Contributor: Stefano Bergamini <bergs at live dot it>
+# Contributor: Heiko Baums <[email protected]>
+# Contributor: Quentin Foussette <[email protected]>
+# Contributor: MetaNova
+
+pkgname=epson-inkjet-printer-escpr
+pkgver=1.6.31
+pkgrel=1
+pkgdesc='Epson Inkjet Printer Driver (ESC/P-R) for Linux'
+arch=('x86_64')
+url='http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX'
+license=('GPL2')
+depends=('cups' 'ghostscript')
+source=("https://download3.ebz.epson.net/dsc/f/03/00/08/37/47/d522643d893358c730210b29712d67560555181a/epson-inkjet-printer-escpr-$pkgver-1lsb3.2.tar.gz";
+ 'bug_x86_64.patch')
+sha512sums=('f6559a205fce4db9ad0b940be4ff0b959968ed3380eb132732f0bd44b5fbb258a4882bf66b0c3c8feddf9d6e2944a6ff3b335f943c3abb7d4be5d2045c2a0550'
+
'ff4f736ec884c4d2354a83c89ee535732cb414ef0c6443bdc8ec869f889f486b242d76e143ad59d61b182231697dfe3bdf68122cb8aae873a9776ce109a07dab')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -p1 < ../bug_x86_64.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --with-cupsfilterdir=/usr/lib/cups/filter \
+ --with-cupsppddir=/usr/share/ppd
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
+
Copied: epson-inkjet-printer-escpr/repos/community-x86_64/bug_x86_64.patch
(from rev 398139, epson-inkjet-printer-escpr/trunk/bug_x86_64.patch)
===================================================================
--- community-x86_64/bug_x86_64.patch (rev 0)
+++ community-x86_64/bug_x86_64.patch 2018-10-20 21:27:18 UTC (rev 398140)
@@ -0,0 +1,99 @@
+diff -Naur epson-inkjet-printer-escpr-1.6.9/src/filter.c
epson-inkjet-printer-escpr-1.6.9-fixed/src/filter.c
+--- epson-inkjet-printer-escpr-1.6.9/src/filter.c 2016-09-21
03:55:30.000000000 +0200
++++ epson-inkjet-printer-escpr-1.6.9-fixed/src/filter.c 2016-10-07
22:07:23.965463021 +0200
+@@ -34,6 +34,8 @@
+ #include "epson-protocol.h"
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpr-services.h"
++#include "epson-escpage.h"
+
+ #include "err.h"
+ #include "mem.h"
+@@ -42,6 +44,11 @@
+ #include "libprtX.h"
+ #include "optBase.h"
+ #include "linux_cmn.h"
++#include "xfifo.h"
++
++extern EPS_ERR_CODE SetupJobAttrib (const EPS_JOB_ATTRIB*);
++extern EPS_ERR_CODE SendStartJob ();
++extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*);
+
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+
+@@ -380,10 +387,10 @@
+ }else{
+ debug_msg("pageStartJob() success");
+ }
+-
++
+ printJob.jobStatus = EPS_STATUS_ESTABLISHED;
+- int printHeight = 0;
+-///////////////////////////////////////////////////////////////////////////////////////////////////////////
++ EPS_UINT32 printHeight = 0;
++///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ print_area_x = printJob.printableAreaWidth;
+ print_area_y = printJob.printableAreaHeight;
+@@ -535,7 +542,7 @@
+ memcpy(rever_buf + k*3,
startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3);
+ }
+ }
+- PrintBand (rever_buf, bandBmp.widthBytes,
&printHeight);
++ PrintBand ((const EPS_UINT8 *)rever_buf,
bandBmp.widthBytes, &printHeight);
+ pos -= bandBmp.widthBytes;
+ }
+
+@@ -642,17 +649,17 @@
+ }
+ }
+ }
+-
++
+ band_line_count ++;
+-
++
+ if (band_line_count >= band_line)
+ {
+ printHeight = band_line_count;
+ PrintBand (bandBmp.bits,
bandBmp.widthBytes, &printHeight);
+ #if (HAVE_PPM)
+ fp = fopen(ppmfilename, "a+");
+- int i=0;
+- for(i=0;
i<bytes_per_line/byte_par_pixel*3; i++){
++ int i=0;
++ for(i=0;
i<bytes_per_line/byte_par_pixel*3; i++){
+ fprintf(fp, "%u ", (unsigned
char)bandBmp.Bits[i]);
+ }
+ fprintf(fp, "\n");
+@@ -831,7 +838,7 @@
+
+ /* Get number of pages */
+ char page_num;
+- read (STDIN_FILENO, &page_num, 1);
++ (void)read (STDIN_FILENO, &page_num, 1);
+
+ /* Others */
+ jobAttr.apfAutoCorrect = EPS_APF_ACT_STANDARD;
+@@ -881,7 +888,7 @@
+
+ // fwrite (pBuf, cbBuf, 1, outfp);
+
+- XFIFOWrite(context, pBuf, cbBuf);
++ XFIFOWrite(context, (char *)pBuf, cbBuf);
+
+ return 1;
+ }
+diff -Naur epson-inkjet-printer-escpr-1.6.9/src/mem.c
epson-inkjet-printer-escpr-1.6.9-fixed/src/mem.c
+--- epson-inkjet-printer-escpr-1.6.9/src/mem.c 2016-09-21 03:55:30.000000000
+0200
++++ epson-inkjet-printer-escpr-1.6.9-fixed/src/mem.c 2016-10-07
22:07:59.519366574 +0200
+@@ -24,6 +24,7 @@
+
+ #include <stdlib.h>
+ #include "mem.h"
++#include "err.h"
+
+ void *
+ mem_malloc (unsigned int size, bool_t crit)
+
