mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

print/epson-inkjet-printer-escpr: Update to 1.8.5

Browse Source 
- Add support for Epson-EP-716A_Series, Epson-EP-901A_series,
  Epson-EP-M476T_Series, Epson-ET-2860_Series, Epson-ET-2870_Series,
  Epson-EW-056A_Series, Epson-EW-456A_Series, Epson-L1270_Series,
  Epson-L3270_Series, Epson-L3280_Series and Epson-L5310_Series

PR:		280343
This commit is contained in:
Jose Alonso Cardenas Marquez 2024-07-23 01:25:53 -05:00
parent 802a051103
commit 65786c213a
No known key found for this signature in database
GPG Key ID: 335B9246BA5E30F4
12 changed files with 99 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/epson-inkjet-printer-escpr/Makefile
View File

@ -1,8 +1,8 @@
PORTNAME= epson-inkjet-printer-escpr
DISTVERSION= 1.7.26
DISTVERSIONSUFFIX= -1lsb3.2
DISTVERSION= 1.8.5
DISTVERSIONSUFFIX= -1
CATEGORIES= print
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/14/48/15/c864d000b06bebeec8832ce6f68bb079c36d838a/
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/15/68/89/fbff579f15226ffcc4a16895bd6bce6842277802/
MAINTAINER= tatsuki_makino@hotmail.com
COMMENT= Epson Inkjet Printer Driver (ESC/P-R) for Linux

6
print/epson-inkjet-printer-escpr/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1681182000
SHA256 (epson-inkjet-printer-escpr-1.7.26-1lsb3.2.tar.gz) = 690e8c9c5b993489830de5ddb16ba2ba4c21b474978bda082ed7d1d1c48482e9
SIZE (epson-inkjet-printer-escpr-1.7.26-1lsb3.2.tar.gz) = 5484887
TIMESTAMP = 1721358000
SHA256 (epson-inkjet-printer-escpr-1.8.5-1.tar.gz) = 27ca5426abece5ff1da859caa5ac4bc993b0a00e8ea74af63ffd9960c6a36a24
SIZE (epson-inkjet-printer-escpr-1.8.5-1.tar.gz) = 5666905

4
print/epson-inkjet-printer-escpr/files/patch-lib_Makefile.am
View File

@ -1,4 +1,4 @@
--- lib/Makefile.am.orig 2019-07-31 06:49:48 UTC
--- lib/Makefile.am.orig 2024-03-13 01:23:02 UTC
+++ lib/Makefile.am
@@ -43,7 +43,7 @@ DEFINES += -DGCOMSW_ASYNCJOB_SUPPORT
DEFINES += -DGCOMSW_RAWFILE_SUPPORT
@ -9,7 +9,7 @@
## Make sure these will be cleaned even when they're not built by
## default.
CLEANFILES = libescpr.la
@@ -70,5 +70,5 @@ libescpr_la_SOURCES = \
@@ -66,5 +66,5 @@ libescpr_la_SOURCES = \
epson-typedefs.h \
epson-usb.c epson-usb.h

22
print/epson-inkjet-printer-escpr/files/patch-lib_epson-cbt.c Normal file
View File

@ -0,0 +1,22 @@
--- lib/epson-cbt.c.orig 2023-02-15 02:57:29 UTC
+++ lib/epson-cbt.c
@@ -651,7 +651,9 @@ static EPS_INT32 commClose (
){
EPS_INT32 Ret = EPCBT_ERR_NONE;
+#ifdef COMM_DBG_ERROR
EPS_INT32 closePtlState = 0;
+#endif
EPS_LOG_FUNCIN;
@@ -661,7 +663,9 @@ static EPS_INT32 commClose (
{
Ret = EPCBT_Close(fd); /* Channel close & cbt exit */
+#ifdef COMM_DBG_ERROR
closePtlState = epsUsbFnc.closePortal(fd);
+#endif
ioOpenState = EPS_IO_NOT_OPEN; /* Open flag Off */
}

16
print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c
View File

@ -1,14 +1,6 @@
--- lib/epson-escpr-api.c.orig 2019-04-08 01:01:18 UTC
--- lib/epson-escpr-api.c.orig 2024-03-13 01:23:02 UTC
+++ lib/epson-escpr-api.c
@@ -62,6 +62,7 @@
/*------------------------------------ Includes -------------------------------------*/
/*******************************************|********************************************/
+#include <stddef.h>
#include "epson-escpr-pvt.h"
#include "epson-escpr-services.h"
#include "epson-escpr-pm.h"
@@ -231,7 +232,7 @@ static const EPS_UINT8 PrintQualityCmd[] = {
@@ -231,7 +231,7 @@ static const EPS_UINT8 PrintQualityCmd[] = {
/*** ESC/P-R Commands (Print Num) */
/*** -------------------------------------------------------------------------------*/
@ -17,7 +9,7 @@
0x1B, 'n', 0x02, 0x00, 0x00, 0x00,
's', 'e', 't', 'n',
0x00, 0x00};
@@ -244,7 +245,7 @@ static const EPS_UINT8 PrintNumCmd2[] = {
@@ -251,7 +251,7 @@ static const EPS_UINT8 SetiCmd[] = {
/*** ESC/P-R Commands (custom setting) */
/*** -------------------------------------------------------------------------------*/
@ -26,7 +18,7 @@
0x1B, 'm', 0x01, 0x00, 0x00, 0x00,
's', 'e', 't', 'c',
0x00 };
@@ -4474,7 +4475,7 @@ EPS_UINT8 array4[4] = {0, 0, 0, 0}; /* Tempora
@@ -4506,7 +4506,7 @@ EPS_UINT8 array4[4] = {0, 0, 0, 0}; /* Tempora
/*======================================================================================*/
/*** Set up ESC/PR "Print Num" Command */
/*======================================================================================*/

12
print/epson-inkjet-printer-escpr/files/patch-lib_epson-typedefs.h
View File

@ -1,6 +1,14 @@
--- lib/epson-typedefs.h.orig 2019-04-08 01:01:26 UTC
--- lib/epson-typedefs.h.orig 2023-02-15 02:57:29 UTC
+++ lib/epson-typedefs.h
@@ -41,7 +41,7 @@ extern "C" {
@@ -26,6 +26,7 @@ extern "C" {
/*--------------------------------- System Includes ---------------------------------*/
/*******************************************|********************************************/
+#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -41,7 +42,7 @@ extern "C" {
typedef unsigned char EPS_UINT8; /* unsigned 8-bit Min: 0 Max: 255 */
typedef unsigned short EPS_UINT16; /* unsigned 16-bit Min: 0 Max: 65535 */
typedef unsigned int EPS_UINT32; /* unsigned 32-bit Min: 0 Max: 4294967295 */

11
print/epson-inkjet-printer-escpr/files/patch-lib_epson-usb.c
View File

@ -1,5 +1,14 @@
--- lib/epson-usb.c.orig 2017-03-24 04:35:04 UTC
--- lib/epson-usb.c.orig 2023-02-15 02:57:29 UTC
+++ lib/epson-usb.c
@@ -709,7 +709,7 @@ EPS_ERR_CODE usbResetPrinter (
#define EPS_RSREPLY_SIZE (32)
EPS_ERR_CODE Ret;
EPS_INT32 ComSize = 0;
- EPS_INT32 retBufSize; /* Size of buffer written */
+ EPS_INT32 retBufSize __unused; /* Size of buffer written */
EPS_INT32 retryComm;
EPS_INT32 retryReset;
EPS_INT32 Size = EPS_RSREPLY_SIZE;
@@ -2325,7 +2325,7 @@ static EPS_ERR_CODE GetSerialNumber (
EPS_RETURN( ret );
}

4
print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am
View File

@ -1,6 +1,6 @@
--- ppd/Makefile.am.orig 2023-04-03 07:36:37 UTC
--- ppd/Makefile.am.orig 2024-03-13 04:11:35 UTC
+++ ppd/Makefile.am
@@ -707,8 +707,10 @@ EXTRA_DIST = $(cupsppd_DATA)
@@ -636,8 +636,10 @@ EXTRA_DIST = $(cupsppd_DATA)
# LSBビルド環境の場合、~/.rpmmacros %adjust_ppds が担っている処理を実施
install-data-hook:

28
print/epson-inkjet-printer-escpr/files/patch-src_filter.c
View File

@ -1,17 +1,15 @@
--- src/filter.c.orig 2020-10-12 02:31:41 UTC
--- src/filter.c.orig 2024-03-13 01:23:02 UTC
+++ src/filter.c
@@ -32,7 +32,10 @@
@@ -32,6 +32,8 @@
#include "epson-protocol.h"
#include "epson-escpr-api.h"
+#include "epson-escpr-api-private.h"
+#include "epson-escpr-services.h"
#include "epson-escpr-mem.h"
+#include "epson-escpage.h"
#include "err.h"
#include "mem.h"
@@ -41,6 +44,7 @@
@@ -41,6 +43,7 @@
#include "libprtX.h"
#include "optBase.h"
#include "linux_cmn.h"
@ -19,7 +17,7 @@
#define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
@@ -225,7 +229,7 @@ main (int argc, char *argv[])
@@ -225,7 +228,7 @@ main (int argc, char *argv[])
EPS_BANDBMP bandBmp;
/* Fifo for Backend */
@ -28,7 +26,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////
memset (&jobAttr, 0, sizeof(jobAttr));
@@ -380,7 +384,7 @@ main (int argc, char *argv[])
@@ -380,7 +383,7 @@ main (int argc, char *argv[])
}
printJob.jobStatus = EPS_STATUS_ESTABLISHED;
@ -37,7 +35,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////
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;
@ -46,7 +44,7 @@
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;
@ -58,7 +56,7 @@
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;
@ -77,7 +75,7 @@
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);
@ -89,7 +87,7 @@
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
@ -101,7 +99,7 @@
bandBmp.bits += band_line_count;
}
@@ -710,7 +730,7 @@ quit:;
@@ -710,7 +729,7 @@ quit:;
mem_free(paper);
debug_msg("PRINT SUCCESS\n");
@ -110,7 +108,7 @@
return 0;
}
@@ -871,7 +891,7 @@ static int getMediaTypeID(char *rsc_name)
@@ -871,7 +890,7 @@ static int getMediaTypeID(char *rsc_name)
EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT8* pBuf, EPS_UINT32 cbBuf)
{
@ -119,7 +117,7 @@
long int i;
for (i = 0; i < cbBuf; i++)
putc(*(pBuf + i), outfp);
@@ -879,7 +899,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
@@ -879,7 +898,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
// fwrite (pBuf, cbBuf, 1, outfp);

27
print/epson-inkjet-printer-escpr/files/patch-src_wrapper.c
View File

@ -1,13 +1,20 @@
--- src/wrapper.c.orig 2021-04-19 02:19:25 UTC
--- src/wrapper.c.orig 2024-03-13 01:23:02 UTC
+++ src/wrapper.c
@@ -178,8 +178,8 @@ main (int argc, char *argv[])
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
FILE *pfp;
int i; /* loop */
cups_raster_t *ras; /* raster stream for printing */
- cups_page_header_t header; /* page device dictionary header */
+ cups_page_header2_t header; /* page device dictionary header */
filter_option_t fopt;
int total_read = 0;
int total_read_cache = 0;
- char *page_raw; //2ページ分のバッファ
- char *page_raw_cache;//2ページ分のキャッシュ
+ char *page_raw = NULL; //2ページ分のバッファ
+ char *page_raw_cache = NULL;//2ページ分のキャッシュ
/* attach point */
@@ -188,7 +188,7 @@ main (int argc, char *argv[])
while (1)
{
int ret;
- ret = cupsRasterReadHeader (ras, &header);
+ ret = cupsRasterReadHeader2(ras, &header);
static BOOL first_fwrite = TRUE;
static BOOL cache_exist = FALSE;
if (ret == 0 || cancel_flg) //データをすべて読み終わった
{

5
print/epson-inkjet-printer-escpr/pkg-descr
View File

@ -5,6 +5,5 @@ with Seiko Epson Color Ink Jet Printers.
This product supports only EPSON ESC/P-R printers. This package can be
used for all EPSON ESC/P-R printers.
For detail list of supported printer, please refer to WWW site
provided by the following command:
pkg rquery %w epson-inkjet-printer-escpr
For detail list of supported printer, please refer to below site:
https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX

11
print/epson-inkjet-printer-escpr/pkg-plist
View File

@ -55,6 +55,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-712A_Series-epson-escpr-en.
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-713A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-714A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-715A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-716A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd.gz
@ -73,6 +74,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-812A_Series-epson-escpr-en.
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-813A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-814A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-815A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-816A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd.gz
@ -88,6 +90,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-976A3_Series-epson-escpr-en
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-977A3_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-978A3_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-979A3_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-M476T_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-M552T_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-M553T_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-M570T_Series-epson-escpr-en.ppd.gz
@ -109,6 +112,8 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2800_Series-epson-escpr-en.
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2810_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2820_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2850_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2860_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2870_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4700_Series-epson-escpr-en.ppd.gz
@ -119,6 +124,8 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1100_Series-epson-escpr-en
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M1120_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-M2120_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EW-052A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EW-056A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EW-456A_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M5071FT_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M571T_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd.gz
@ -127,6 +134,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EW-M970A3T_Series-epson-escpr-
share/cups/model/epson-inkjet-printer-escpr/Epson-K200-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-K300-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L1110_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L1270_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L1455_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L3050_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L3060_Series-epson-escpr-en.ppd.gz
@ -137,6 +145,8 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-L3150_Series-epson-escpr-en.pp
share/cups/model/epson-inkjet-printer-escpr/Epson-L3160_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L3250_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L3260_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L3270_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L3280_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L364_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L375_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L385_Series-epson-escpr-en.ppd.gz
@ -154,6 +164,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-L486_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L495_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L5190_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L5290_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L5310_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L565_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L575_Series-epson-escpr-en.ppd.gz
share/cups/model/epson-inkjet-printer-escpr/Epson-L605_Series-epson-escpr-en.ppd.gz