From owner-dev-commits-ports-main@freebsd.org Thu Apr 8 21:40:41 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ABA445C10DD; Thu, 8 Apr 2021 21:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGZST4Wv5z4j7m; Thu, 8 Apr 2021 21:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E70011CE4; Thu, 8 Apr 2021 21:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 138LefpK024480; Thu, 8 Apr 2021 21:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138LefAc024479; Thu, 8 Apr 2021 21:40:41 GMT (envelope-from git) Date: Thu, 8 Apr 2021 21:40:41 GMT Message-Id: <202104082140.138LefAc024479@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 846e4513295f - main - print/epson-inkjet-printer-escpr: Update to 1.7.9 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 846e4513295f697684415bca94149d7e0edfc190 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 21:40:41 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=846e4513295f697684415bca94149d7e0edfc190 commit 846e4513295f697684415bca94149d7e0edfc190 Author: Kevin Bowling AuthorDate: 2021-04-08 21:38:17 +0000 Commit: Kevin Bowling CommitDate: 2021-04-08 21:39:27 +0000 print/epson-inkjet-printer-escpr: Update to 1.7.9 PR: 250441 Approved by: Tatsuki Makino (maintainer) --- print/epson-inkjet-printer-escpr/Makefile | 9 ++-- print/epson-inkjet-printer-escpr/distinfo | 6 +-- .../files/patch-ppd_Makefile.am | 4 +- .../files/patch-src_filter.c | 31 ++++++++++++- .../files/pkg-message.in | 52 +++++++++++++++++----- print/epson-inkjet-printer-escpr/pkg-plist | 3 ++ 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile index f5eaa8f6c5d7..85905c95042a 100644 --- a/print/epson-inkjet-printer-escpr/Makefile +++ b/print/epson-inkjet-printer-escpr/Makefile @@ -1,8 +1,8 @@ PORTNAME= epson-inkjet-printer-escpr -PORTVERSION= 1.7.7 +DISTVERSION= 1.7.9 DISTVERSIONSUFFIX= -1lsb3.2 CATEGORIES= print -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/50/95/322b8d6b915ab85add33d41f04ba5130866aadbe/ MAINTAINER= tatsuki_makino@hotmail.com COMMENT= Epson Inkjet Printer Driver (ESC/P-R) for Linux @@ -10,10 +10,11 @@ COMMENT= Epson Inkjet Printer Driver (ESC/P-R) for Linux LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +RUN_DEPENDS= ${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters LIB_DEPENDS= libcupsimage.so:print/cups USES= autoreconf dos2unix gmake libtool -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} PORTDOCS= AUTHORS NEWS README README.ja GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-lsb @@ -23,7 +24,7 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS -PORTSCOUT= ignore # MASTER_SITES is changed in each version +PORTSCOUT= ignore:1 # MASTER_SITES is changed in each version post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/print/epson-inkjet-printer-escpr/distinfo b/print/epson-inkjet-printer-escpr/distinfo index 5898c132fd3d..5cace489e2be 100644 --- a/print/epson-inkjet-printer-escpr/distinfo +++ b/print/epson-inkjet-printer-escpr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1577415600 -SHA256 (epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz) = 8d964368a1395a8902b8637e3dc176d6793f0afdfe3f21e95509f29894700d4e -SIZE (epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz) = 4767015 +TIMESTAMP = 1613962800 +SHA256 (epson-inkjet-printer-escpr-1.7.9-1lsb3.2.tar.gz) = 80bdfbe70e93f0613680e8ff7129cf2eead725d771e9396ccbd6f51ae186d08c +SIZE (epson-inkjet-printer-escpr-1.7.9-1lsb3.2.tar.gz) = 4831399 diff --git a/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am b/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am index fe5caf615fcf..416ff807db74 100644 --- a/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am +++ b/print/epson-inkjet-printer-escpr/files/patch-ppd_Makefile.am @@ -1,6 +1,6 @@ ---- ppd/Makefile.am.orig 2019-08-28 05:35:05 UTC +--- ppd/Makefile.am.orig 2021-02-15 02:27:34 UTC +++ ppd/Makefile.am -@@ -624,8 +624,10 @@ EXTRA_DIST = $(cupsppd_DATA) +@@ -639,8 +639,10 @@ EXTRA_DIST = $(cupsppd_DATA) # LSBビルド環境の場合、~/.rpmmacros %adjust_ppds が担っている処理を実施 install-data-hook: diff --git a/print/epson-inkjet-printer-escpr/files/patch-src_filter.c b/print/epson-inkjet-printer-escpr/files/patch-src_filter.c index 6eef8c20262e..1a9fa21f3c65 100644 --- a/print/epson-inkjet-printer-escpr/files/patch-src_filter.c +++ b/print/epson-inkjet-printer-escpr/files/patch-src_filter.c @@ -1,4 +1,4 @@ ---- src/filter.c.orig 2019-07-31 06:49:48 UTC +--- src/filter.c.orig 2020-10-12 02:31:41 UTC +++ src/filter.c @@ -32,7 +32,10 @@ @@ -19,6 +19,15 @@ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) +@@ -225,7 +229,7 @@ main (int argc, char *argv[]) + EPS_BANDBMP bandBmp; + + /* Fifo for Backend */ +-// context = (void*)XFIFOOpen(); ++ context = (void*)XFIFOOpen(); + + /////////////////////////////////////////////////////////////////////////////////////////////////////////// + memset (&jobAttr, 0, sizeof(jobAttr)); @@ -380,7 +384,7 @@ main (int argc, char *argv[]) } @@ -92,11 +101,29 @@ bandBmp.bits += band_line_count; } +@@ -710,7 +730,7 @@ quit:; + mem_free(paper); + debug_msg("PRINT SUCCESS\n"); + +-// XFIFOClose(&context); ++ XFIFOClose(&context); + + return 0; + } +@@ -871,7 +891,7 @@ static int getMediaTypeID(char *rsc_name) + + EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT8* pBuf, EPS_UINT32 cbBuf) + { +-#if 1 ++#if 0 + 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 // fwrite (pBuf, cbBuf, 1, outfp); -- XFIFOWrite(context, pBuf, cbBuf); +-// XFIFOWrite(context, pBuf, cbBuf); + XFIFOWrite(context, (char *)pBuf, cbBuf); return 1; diff --git a/print/epson-inkjet-printer-escpr/files/pkg-message.in b/print/epson-inkjet-printer-escpr/files/pkg-message.in index a5a828058431..431799b8b964 100644 --- a/print/epson-inkjet-printer-escpr/files/pkg-message.in +++ b/print/epson-inkjet-printer-escpr/files/pkg-message.in @@ -1,24 +1,56 @@ [ { type: install message: <