kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
PR:		236796
Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)
This commit is contained in:
Steve Wills 2019-04-13 01:04:45 +00:00
parent 78469f3356
commit fd0f52c943
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=498786
8 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
print/epson-inkjet-printer-escpr/Makefile
View file

@ -1,10 +1,10 @@
# $FreeBSD$
PORTNAME= epson-inkjet-printer-escpr
PORTVERSION= 1.6.33
PORTVERSION= 1.6.38
DISTVERSIONSUFFIX= -1lsb3.2
CATEGORIES= print
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/
MASTER_SITES= https://download3.ebz.epson.net/dsc/f/03/00/09/25/30/1b345288d691386af8a0314a9b11ecbc400522ec/
MAINTAINER= tatsuki_makino@hotmail.com
COMMENT= Epson Inkjet Printer Driver (ESC/P-R) for Linux
@ -16,6 +16,7 @@ FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss
USES= autoreconf dos2unix gmake libtool
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-lsb

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

@ -1,3 +1,3 @@
TIMESTAMP = 1545868800
SHA256 (epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz) = f5c4f1084ec88f138309800dc030e93155890a30e8f9cbf0ede98488e1a172f3
SIZE (epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz) = 4402012
TIMESTAMP = 1554865200
SHA256 (epson-inkjet-printer-escpr-1.6.38-1lsb3.2.tar.gz) = 9b2ad2b2b47bbedb911b4389ea22ec0bda294ef77b44f7aeca152c3eb6b30dac
SIZE (epson-inkjet-printer-escpr-1.6.38-1lsb3.2.tar.gz) = 4471609

24
print/epson-inkjet-printer-escpr/files/patch-configure.ac
View file

@ -1,4 +1,4 @@
--- configure.ac.orig 2018-11-15 06:09:26 UTC
--- configure.ac.orig 2019-04-08 05:14:01 UTC
+++ configure.ac
@@ -58,9 +58,9 @@ AC_ARG_WITH([cupsfilterdir],
if test "xno" = "x${with_cupsfilterdir}"; then
@ -29,9 +29,9 @@
fi
else
CUPS_PPD_DIR="${with_cupsppddir}"
@@ -100,6 +98,16 @@ esac],[lsb=true])
AM_CONDITIONAL(LSB, test x$lsb = xtrue)
@@ -109,6 +107,16 @@ AC_ARG_WITH([internal],
AC_SUBST([INTERNAL_PPD])
AC_SUBST([INTERNAL_PPD_OPTION])
+if test "xyes" = "x$have_cups_config" ; then
+ CUPS_CPPFLAGS=`cups-config --cflags`
@ -46,15 +46,15 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_STAT
@@ -107,17 +115,23 @@ AC_HEADER_TIME
@@ -116,17 +124,23 @@ AC_HEADER_TIME
AC_STRUCT_TM
AC_TYPE_PID_T
AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CUPS_CPPFLAGS $CPPFLAGS"
+
AC_CHECK_HEADERS([\
cups/cups.h \
cups/ppd.h \
@ -71,20 +71,20 @@
signal.h \
stdarg.h \
stddef.h \
@@ -128,21 +142,45 @@ AC_CHECK_HEADERS([\
@@ -137,21 +151,45 @@ AC_CHECK_HEADERS([\
time.h \
unistd.h \
])
-
-# Checks for libraries.
-AC_CHECK_LIB([cups], [ppdOpenFile])
-AC_CHECK_LIB([cupsimage], [cupsRasterOpen])
+AC_CHECK_HEADERS([\
+ sys/ioctl.h \
+ sys/time.h \
+ termios.h \
+ ])
-# Checks for libraries.
-AC_CHECK_LIB([cups], [ppdOpenFile])
-AC_CHECK_LIB([cupsimage], [cupsRasterOpen])
-
# Checks for library functions.
#AC_FUNC_MALLOC avoiding rpl_malloc stupidness
AC_FUNC_MEMCMP

8
print/epson-inkjet-printer-escpr/files/patch-lib_epson-escpr-api.c
View file

@ -1,4 +1,4 @@
--- lib/epson-escpr-api.c.orig 2017-03-24 04:35:04 UTC
--- lib/epson-escpr-api.c.orig 2019-04-08 01:01:18 UTC
+++ lib/epson-escpr-api.c
@@ -62,6 +62,7 @@
@ -8,7 +8,7 @@
#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 +232,7 @@ static const EPS_UINT8 PrintQualityCmd[] = {
/*** ESC/P-R Commands (Print Num) */
/*** -------------------------------------------------------------------------------*/
@ -17,7 +17,7 @@
0x1B, 'n', 0x02, 0x00, 0x00, 0x00,
's', 'e', 't', 'n',
0x00, 0x00};
@@ -244,7 +245,7 @@ static const EPS_UINT8 PrintNumCmd2[] =
@@ -244,7 +245,7 @@ static const EPS_UINT8 PrintNumCmd2[] = {
/*** ESC/P-R Commands (custom setting) */
/*** -------------------------------------------------------------------------------*/
@ -26,7 +26,7 @@
0x1B, 'm', 0x01, 0x00, 0x00, 0x00,
's', 'e', 't', 'c',
0x00 };
@@ -4463,7 +4464,7 @@ EPS_UINT8 array4[4] = {0, 0, 0, 0}
@@ -4474,7 +4475,7 @@ EPS_UINT8 array4[4] = {0, 0, 0, 0}; /* Tempora
/*======================================================================================*/
/*** Set up ESC/PR "Print Num" Command */
/*======================================================================================*/

11
print/epson-inkjet-printer-escpr/files/patch-lib_epson-typedefs.h Normal file
View file

@ -0,0 +1,11 @@
--- lib/epson-typedefs.h.orig 2019-04-08 01:01:26 UTC
+++ lib/epson-typedefs.h
@@ -41,7 +41,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 */
-typedef signed char EPS_INT8; /* signed 8-bit Min: -128 Max: 127 */
+typedef char EPS_INT8; /* signed 8-bit Min: -128 Max: 127 */
typedef short EPS_INT16; /* signed 16-bit Min: -32768 Max: 32767 */
typedef int EPS_INT32; /* signed 32-bit Min:-2147483648 Max: 2147483647 */
typedef float EPS_FLOAT; /* float 32-bit Min:3.4E-38 Max: 3.4E+38 */

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

@ -1,6 +1,6 @@
--- ppd/Makefile.am.orig 2018-11-15 06:21:39 UTC
--- ppd/Makefile.am.orig 2019-04-08 05:29:11 UTC
+++ ppd/Makefile.am
@@ -596,8 +596,10 @@ EXTRA_DIST = $(cupsppd_DATA)
@@ -605,8 +605,10 @@ EXTRA_DIST = $(cupsppd_DATA)
# LSBビルド環境の場合、~/.rpmmacros %adjust_ppds が担っている処理を実施
install-data-hook:

4
print/epson-inkjet-printer-escpr/files/patch-src_filter.c
View file

@ -1,4 +1,4 @@
--- src/filter.c.orig 2018-03-08 04:25:24 UTC
--- src/filter.c.orig 2019-01-17 09:25:18 UTC
+++ src/filter.c
@@ -33,7 +33,10 @@
@ -92,7 +92,7 @@
bandBmp.bits += band_line_count;
}
@@ -880,7 +900,7 @@ EPS_INT32 print_spool_fnc(void* hParam,
@@ -880,7 +900,7 @@ EPS_INT32 print_spool_fnc(void* hParam, const EPS_UINT
// fwrite (pBuf, cbBuf, 1, outfp);

7
print/epson-inkjet-printer-escpr/pkg-plist
View file

@ -79,6 +79,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-EP-977A3_Series-epson-escpr-en
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-978A3_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-979A3_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-EP-M570T_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-1110_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-16500_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2500_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2550_Series-epson-escpr-en.ppd
@ -87,7 +88,9 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2610_Series-epson-escpr-en.
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2650_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2700_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2710_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2720_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2750_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-2760_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ET-4700_Series-epson-escpr-en.ppd
@ -110,6 +113,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-L3070_Series-epson-escpr-en.pp
share/cups/model/epson-inkjet-printer-escpr/Epson-L3100_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L3110_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L3150_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L3160_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L364_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L375_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-L385_Series-epson-escpr-en.ppd
@ -257,6 +261,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_280-epson-escpr
share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_290-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_300-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-PictureMate_PM_310-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-ST-2000_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-Stylus_CX2800-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-Stylus_CX2900-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-Stylus_CX3700-epson-escpr-en.ppd
@ -422,7 +427,7 @@ share/cups/model/epson-inkjet-printer-escpr/Epson-WF-5190_Series-epson-escpr-en.
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-5620_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-5690_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6090_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6530-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6530_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-6590_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-7110_Series-epson-escpr-en.ppd
share/cups/model/epson-inkjet-printer-escpr/Epson-WF-7510_Series-epson-escpr-en.ppd