Update to epson-inkjet-printer-escpr-1.7.8.

This commit is contained in:
ajacoutot 2020-10-25 20:47:53 +00:00
parent 36aa6ac3a2
commit ae02938422
4 changed files with 15 additions and 30 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2020/04/17 16:14:40 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2020/10/25 20:47:53 ajacoutot Exp $
# MASTER_SITES changes at each version; when looking for updates, try searching
# ${HOMEPAGE} for a linux driver, for e.g. sx200
PORTROACH= ignore
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6d9cb64872f817bce1920b8/
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/12/04/32/1a455ef8618def65700ca4e446311c2fb43cd839/
COMMENT= printer driver for Epson ESC/P-R inkjets
DISTNAME= epson-inkjet-printer-escpr-1.7.7
DISTNAME= epson-inkjet-printer-escpr-1.7.8
EXTRACT_SUFX= -1lsb3.2.tar.gz
SHARED_LIBS += escpr 0.0 # 1.0

View File

@ -1,2 +1,2 @@
SHA256 (epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz) = jZZDaKE5WokCuGN+PcF21nk/Cv3+PyHpVQnymJRwDU4=
SIZE (epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz) = 4767015
SHA256 (epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz) = 13RN11iCUQxZo4Dyg1jBy8R9M/9twGJYOwI+0ZZ4z98=
SIZE (epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz) = 4809140

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_filter_c,v 1.1.1.1 2019/09/29 13:22:28 ajacoutot Exp $
$OpenBSD: patch-src_filter_c,v 1.2 2020/10/25 20:47:53 ajacoutot Exp $
Index: src/filter.c
--- src/filter.c.orig
@ -14,15 +14,7 @@ Index: src/filter.c
#include "err.h"
#include "mem.h"
@@ -41,6 +44,7 @@
#include "libprtX.h"
#include "optBase.h"
#include "linux_cmn.h"
+#include "xfifo.h"
#define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
@@ -380,7 +384,7 @@ main (int argc, char *argv[])
@@ -380,7 +383,7 @@ main (int argc, char *argv[])
}
printJob.jobStatus = EPS_STATUS_ESTABLISHED;
@ -31,7 +23,7 @@ Index: src/filter.c
///////////////////////////////////////////////////////////////////////////////////////////////////////////
print_area_x = printJob.printableAreaWidth;
@@ -409,7 +413,7 @@ main (int argc, char *argv[])
@@ -409,7 +412,7 @@ main (int argc, char *argv[])
while ((read_page_no = read (STDIN_FILENO, &page_num, 1)) > 0) // 最初に page番号を読み込み
{
long x_count, y_count;
@ -40,7 +32,7 @@ Index: src/filter.c
y_count = 0;
band_line_count = 0;
@@ -497,7 +501,11 @@ main (int argc, char *argv[])
@@ -497,7 +500,11 @@ main (int argc, char *argv[])
pagebuf+= bandBmp.widthBytes;
posbuf+=bandBmp.widthBytes;
@ -52,7 +44,7 @@ Index: src/filter.c
bandBmp.bits += band_line_count;
}
@@ -508,13 +516,17 @@ main (int argc, char *argv[])
@@ -508,13 +515,17 @@ main (int argc, char *argv[])
memcpy(pagebuf, bandBmp.bits, bandBmp.widthBytes);
pagebuf+= bandBmp.widthBytes;
posbuf+= bandBmp.widthBytes;
@ -71,7 +63,7 @@ Index: src/filter.c
for (revert = print_area_y; revert > 0; revert--)
{
if (3 != byte_par_pixel)
@@ -658,7 +670,11 @@ main (int argc, char *argv[])
@@ -658,7 +669,11 @@ main (int argc, char *argv[])
#endif
debug_msg("printHeight = %d\n", printHeight);
debug_msg("widthByte = %d\n", bandBmp.widthBytes);
@ -83,7 +75,7 @@ Index: src/filter.c
bandBmp.bits += band_line_count;
}
@@ -680,7 +696,11 @@ main (int argc, char *argv[])
@@ -680,7 +695,11 @@ main (int argc, char *argv[])
fprintf(fp, "\n");
fclose(fp);
#endif
@ -95,12 +87,3 @@ Index: src/filter.c
bandBmp.bits += band_line_count;
}
@@ -879,7 +899,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
// fwrite (pBuf, cbBuf, 1, outfp);
- XFIFOWrite(context, pBuf, cbBuf);
+ XFIFOWrite(context, (char *)pBuf, cbBuf);
return 1;
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2020/01/02 19:27:13 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2020/10/25 20:47:53 ajacoutot Exp $
@static-lib lib/libescpr.a
lib/libescpr.la
@lib lib/libescpr.so.${LIBescpr_VERSION}
@ -53,6 +53,7 @@ share/ppd/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-710A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-711A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-712A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-713A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd
@ -68,6 +69,7 @@ share/ppd/epson-inkjet-printer-escpr/Epson-EP-808A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-810A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-811A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-812A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-813A_Series-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd
share/ppd/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd