public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/, ...
@ 2015-09-07 19:24 Mike Gilbert
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2015-09-07 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8f61f9f422df21bb5038da851a2a68df5984e842
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 19:23:36 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 19:24:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f61f9f4

net-print/epson-inkjet-printer-escpr: Bump to 1.5.2

Package-Manager: portage-2.2.20

 net-print/epson-inkjet-printer-escpr/Manifest      |  1 +
 .../epson-inkjet-printer-escpr-1.5.2.ebuild        | 32 ++++++++++++++++++++++
 .../files/1.5.2-warnings.patch                     | 32 ++++++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index e4128a1..8e347bc 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1 +1,2 @@
 DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d96b6448bd96b5e9ac622786e3fc5024e13cae2fc248f8858db2f6 SHA512 7a3f1f880dba9048773d051cfe54ea2ee929d82a85efb496d4df4b84b33ed2f48bb6020892615d5d22da6b5671501b82df55cea6e11b35fea392392f115a6330 WHIRLPOOL 856bcffc4fe45c6bb15c7ecbe1c41e315ee68bf2c3c93697ac4f314324e2b3a0a8796ba741c04e962f1ca9148dbf38d529649ffd5d7ddaaa757666ea066e32a0
+DIST epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz 2852564 SHA256 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8 SHA512 680ffa68ea84830463bea1e6ffc4e1380ed60dc45689844afa15989177a8c3a2a67becd8a7b899b6ee6c8078de9b217563af06c70b1d42aefa7469327c0601af WHIRLPOOL 1abaf4954781c2734e13a79f7dfde26d27ddec45fd360fa1983d544fe49123ff92305b9b30fdd8482d0c2f5cb954d1e7472d9cd18804cd093c41f81669bf5970

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild
new file mode 100644
index 0000000..b87f354
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://www.epson.com/"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/11/66/a0e858032ab0fd6a32c7fb3b7e447a0229e79141/epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/1.5.2-warnings.patch"
+}
+
+src_configure() {
+	econf --disable-shared
+}
+
+src_install() {
+	default
+	rm -r "${ED%/}/usr/$(get_libdir)" || die
+}

diff --git a/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch
new file mode 100644
index 0000000..e60606f
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch
@@ -0,0 +1,32 @@
+--- a/lib/epson-escpr-api.h
++++ b/lib/epson-escpr-api.h
+@@ -98,6 +98,9 @@
+     /*** -------------------------------------------------------------------------------*/
+ extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );
+ 
++extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );
++extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );
++extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -38,6 +38,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include "err.h"
+ #include "mem.h"
+ 
+ void *


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/, ...
@ 2015-11-08  0:20 Mike Gilbert
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2015-11-08  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     78a80c659895bd748e4fb30fb416046ea6b9b73d
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 00:12:53 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 00:19:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a80c65

net-print/epson-inkjet-printer-escpr: Bump to 1.6.1

Bug: https://bugs.gentoo.org/564516

Package-Manager: portage-2.2.23_p18

 net-print/epson-inkjet-printer-escpr/Manifest      |  1 +
 .../epson-inkjet-printer-escpr-1.6.1.ebuild        | 38 ++++++++++++++++++++
 .../files/1.6.1-warnings.patch                     | 40 ++++++++++++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 8e347bc..c326aac 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,2 +1,3 @@
 DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d96b6448bd96b5e9ac622786e3fc5024e13cae2fc248f8858db2f6 SHA512 7a3f1f880dba9048773d051cfe54ea2ee929d82a85efb496d4df4b84b33ed2f48bb6020892615d5d22da6b5671501b82df55cea6e11b35fea392392f115a6330 WHIRLPOOL 856bcffc4fe45c6bb15c7ecbe1c41e315ee68bf2c3c93697ac4f314324e2b3a0a8796ba741c04e962f1ca9148dbf38d529649ffd5d7ddaaa757666ea066e32a0
 DIST epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz 2852564 SHA256 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8 SHA512 680ffa68ea84830463bea1e6ffc4e1380ed60dc45689844afa15989177a8c3a2a67becd8a7b899b6ee6c8078de9b217563af06c70b1d42aefa7469327c0601af WHIRLPOOL 1abaf4954781c2734e13a79f7dfde26d27ddec45fd360fa1983d544fe49123ff92305b9b30fdd8482d0c2f5cb954d1e7472d9cd18804cd093c41f81669bf5970
+DIST epson-inkjet-printer-escpr-1.6.1-1lsb3.2.tar.gz 3044091 SHA256 bb7dea7439c571662db9cf7a8834cb87ed69fa249a7945218403187c6097c76f SHA512 e4e6749ffcb8dd3b35bb6ba931165695b1b983fd9b47d5981358d191870c9658fec92aff63352b854f7d1362129e2359ef96166713ed11863e3536dbb5832bb3 WHIRLPOOL e958b2921541177255176f9efd512ac0b981f2faf8828dc03409c364d14dc53ec113dcd37f116b12ecf0a3d8e59e1df9b589ec88f6fabf10ba61707386990126

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild
new file mode 100644
index 0000000..18b5c89
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://www.epson.com/"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/23/02/a5ee7e1622b0ba692bea6763d6d7f4810a8d0808/epson-inkjet-printer-escpr-1.6.1-1lsb3.2.tar.gz"
+# http://download.ebz.epson.net/dsc/search/01/search/
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/1.6.1-warnings.patch"
+}
+
+src_configure() {
+	econf --disable-shared
+
+	# Makefile calls ls to generate a file list which is included in Makefile.am
+	# Set the collation to C to avoid automake being called automatically
+	unset LC_ALL
+	export LC_COLLATE=C
+}
+
+src_install() {
+	default
+	rm -r "${ED%/}/usr/$(get_libdir)" || die
+}

diff --git a/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch
new file mode 100644
index 0000000..7eeba30
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch
@@ -0,0 +1,40 @@
+--- a/lib/epson-escpr-api.h
++++ b/lib/epson-escpr-api.h
+@@ -111,6 +111,9 @@
+     /*** -------------------------------------------------------------------------------*/
+ extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );
+ 
++extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );
++extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );
++extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );
+ #ifdef __cplusplus
+ }
+ #endif
+--- a/src/filter.c
++++ b/src/filter.c
+@@ -37,6 +37,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -45,6 +46,7 @@
+ #include "libprtX.h"
+ #include "optBase.h"
+ #include "linux_cmn.h"
++#include "xfifo.h"
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+ 
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include "err.h"
+ #include "mem.h"
+ 
+ void *


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/, ...
@ 2020-05-23 12:12 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-05-23 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f8a9560f2c35af8c6cb49a0db8c132c5cb2ed97c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 11:56:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 23 12:12:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a9560f

net-print/epson-inkjet-printer-escpr: Fix build with -fno-common

Closes: https://bugs.gentoo.org/707248
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../epson-inkjet-printer-escpr-1.7.7.ebuild                   |  5 ++++-
 .../files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch    | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
index 1e0db2c8f85..5407e22e981 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
@@ -14,7 +14,10 @@ KEYWORDS="amd64 ~ppc64"
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/1.6.5-warnings.patch" )
+PATCHES=(
+	"${FILESDIR}/1.6.5-warnings.patch"
+	"${FILESDIR}/${P}-fnocommon.patch"
+)
 
 src_configure() {
 	econf --disable-shared

diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch
new file mode 100644
index 00000000000..e2e35719ca8
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch
@@ -0,0 +1,11 @@
+--- a/src/filter.c	2020-05-23 13:50:19.064756474 +0200
++++ b/src/filter.c	2020-05-23 13:53:01.936647646 +0200
+@@ -68,7 +68,7 @@
+ extern EPS_UINT8*   tmpLineBuf;
+ 
+ extern EPS_CMN_FUNC epsCmnFnc;
+-EPS_JOB_FUNCS		jobFnc;
++extern EPS_JOB_FUNCS	jobFnc;
+ 
+ extern EPS_INT32 tonerSave;
+ extern EPS_INT32 back_type;


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/, ...
@ 2024-05-19 22:03 Mike Pagano
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2024-05-19 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     8af8fa0a14d9e5494eb507a36af508649ee406da
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 22:02:01 2024 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun May 19 22:02:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af8fa0a

net-print/epson-inkjet-printer-escpr: Fix to compile with gcc 14

Closes: https://bugs.gentoo.org/921258

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 .../epson-inkjet-printer-escpr-1.2.9-r1.ebuild     |  36 ++++
 .../files/epson-inkjet-printer-escpr-2-gcc14.patch | 228 +++++++++++++++++++++
 2 files changed, 264 insertions(+)

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9-r1.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..ee7aecc88746
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
+HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/15/33/96/607198a4f064daa9e7931913eaf27f3a58125f2b/${MY_P}-1.tar.gz"
+S="${WORKDIR}/${MY_P}"
+LICENSE="EPSON LGPL-2.1+"
+SLOT="2"
+KEYWORDS="amd64"
+
+QA_FLAGS_IGNORED="/usr/lib64/libescpr2.so.1.0.0"
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${SLOT}-gcc14.patch"
+)
+
+src_configure() {
+	econf \
+		--with-cupsfilterdir="${EPREFIX}/usr/libexec/cups/filter"
+		--with-cupsppddir="${EPREFIX}/usr/share/ppd"
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr/lib64" -name "*.la" -delete \
+		|| die "Removal of libtool files (.la) has failed."
+}

diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-2-gcc14.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-2-gcc14.patch
new file mode 100644
index 000000000000..d415384cfbf1
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-2-gcc14.patch
@@ -0,0 +1,228 @@
+--- a/src/mem.c	2024-05-19 17:31:29.121223820 -0400
++++ b/src/mem.c	2024-05-19 17:31:43.985467218 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <stdlib.h>
+ #include "mem.h"
++#include "err.h"
+ 
+ void *
+ mem_malloc (unsigned int size, bool_t crit)
+--- /dev/null	2024-05-19 14:31:56.295999966 -0400
++++ b/src/epson-escpr-services.h	2024-05-19 17:40:16.646097437 -0400
+@@ -0,0 +1,194 @@
++/*_____________________________  epson-escpr-services.h   ______________________________*/
++
++/*       1         2         3         4         5         6         7         8        */
++/*34567890123456789012345678901234567890123456789012345678901234567890123456789012345678*/
++/*******************************************|********************************************/
++/*
++ *   Copyright (c) 2009  Seiko Epson Corporation                 All rights reserved.
++ *
++ *   Copyright protection claimed includes all forms and matters of
++ *   copyrightable material and information now allowed by statutory or judicial
++ *   law or hereinafter granted, including without limitation, material generated
++ *   from the software programs which are displayed on the screen such as icons,
++ *   screen display looks, etc.
++ *
++ */
++/*******************************************|********************************************/
++/*                                                                                      */
++/*                            Epson ESC/PR Sevice Functions                             */
++/*                                                                                      */
++/*******************************************|********************************************/
++#ifndef __EPSON_ESCPR_SERVICES_H__
++#define __EPSON_ESCPR_SERVICES_H__
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*------------------------------------  Includes   -------------------------------------*/
++/*******************************************|********************************************/
++#include "epson-typedefs.h"
++#include "epson-escpr-pvt.h"
++
++/*------------------------------------- Data Types -------------------------------------*/
++/*******************************************|********************************************/
++
++/*--------------------------------------  Macros   -------------------------------------*/
++/*******************************************|********************************************/
++
++/*-----------------------------------  Definitions  ------------------------------------*/
++/*******************************************|********************************************/
++    /*** Ink Cartridge Type                                                             */
++    /*** -------------------------------------------------------------------------------*/
++#define MI_CARTRIDGE_INDEP          0x00        /* Independent Cartridge                */
++#define MI_CARTRIDGE_ONE            0x01        /* One Cartridge                        */
++
++    /*** Device States                                                                  */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_ST_ERROR                        0x01
++#define EPS_ST_SELF_PRINTING                0x02
++#define EPS_ST_BUSY                         0x04
++#define EPS_ST_WAITING                      0x08
++#define EPS_ST_IDLE                         0x10
++/*#define EPS_ST_PAUSE                      0x20*/   /* Not supported by 2006 Model  */
++/*#define EPS_ST_INKDRYING                  0x40*/   /* Not supported by 2006 Model  */
++#define EPS_ST_CLEANING                     0x80
++#define EPS_ST_FACTORY_SHIPMENT            0x100
++/*#define EPS_ST_MOTOR_DRIVE_OFF           0x200*/   /* Not supported by 2006 Model  */
++#define EPS_ST_SHUTDOWN                    0x400
++/*#define EPS_ST_WAITPAPERINIT             0x800*/   /* Not supported by 2006 Model  */
++/*#define EPS_ST_INIT_PAPER               0x1000*/   /* Not supported by 2006 Model  */
++
++    /*** Device Warnings                                                                */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_PRNWARN_NONE                       0x00     /* No Warnings                  */
++#define EPS_PRNWARN_INKLOW                 (1 << 0)     /* Ink Low                      */
++#define EPS_PRNWARN_DISABLE_CLEAN          (1 << 1)     /* disable cleaning             */
++#define EPS_PRNWARN_COLOR_INKOUT           (1 << 2)     /* disable color print          */
++	
++
++    /*** Ink Error                                                                      */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_INKERR_NONE                0
++
++#define EPS_INKERR_INKENDB            -1
++#define EPS_INKERR_INKENDC            -2
++#define EPS_INKERR_INKENDCY           -3
++#define EPS_INKERR_INKENDMA           -4
++#define EPS_INKERR_INKENDYL           -5
++#define EPS_INKERR_INKENDLC           -6
++#define EPS_INKERR_INKENDLM           -7
++#define EPS_INKERR_INKENDLY           -8
++#define EPS_INKERR_INKENDDY           -9
++#define EPS_INKERR_INKENDB2          -10
++#define EPS_INKERR_INKENDRD          -11
++#define EPS_INKERR_INKENDBL          -12
++#define EPS_INKERR_INKENDMB          -13
++#define EPS_INKERR_INKENDPB          -14
++#define EPS_INKERR_INKENDGO          -15
++#define EPS_INKERR_INKENDALL         -16
++#define EPS_INKERR_INKENDBC          -17
++
++#define EPS_INKERR_CEMPTYB          -101
++#define EPS_INKERR_CEMPTYC          -102
++#define EPS_INKERR_CEMPTYCY         -103
++#define EPS_INKERR_CEMPTYMA         -104
++#define EPS_INKERR_CEMPTYYL         -105
++#define EPS_INKERR_CEMPTYLC         -106
++#define EPS_INKERR_CEMPTYLM         -107
++#define EPS_INKERR_CEMPTYLY         -108
++#define EPS_INKERR_CEMPTYDY         -109
++#define EPS_INKERR_CEMPTYB2         -110
++#define EPS_INKERR_CEMPTYRD         -111
++#define EPS_INKERR_CEMPTYBL         -112
++#define EPS_INKERR_CEMPTYMB         -113
++#define EPS_INKERR_CEMPTYPB         -114
++#define EPS_INKERR_CEMPTYGO         -115
++#define EPS_INKERR_CEMPTYBC         -116
++#define EPS_INKERR_CEMPTYALL        -117
++
++#define EPS_INKERR_CFAILB           -201
++#define EPS_INKERR_CFAILC           -202
++#define EPS_INKERR_CFAILCY          -203
++#define EPS_INKERR_CFAILMA          -204
++#define EPS_INKERR_CFAILYL          -205
++#define EPS_INKERR_CFAILLC          -206
++#define EPS_INKERR_CFAILLM          -207
++#define EPS_INKERR_CFAILLY          -208
++#define EPS_INKERR_CFAILDY          -209
++#define EPS_INKERR_CFAILB2          -210
++#define EPS_INKERR_CFAILRD          -211
++#define EPS_INKERR_CFAILBL          -212
++#define EPS_INKERR_CFAILMB          -213
++#define EPS_INKERR_CFAILPB          -214
++#define EPS_INKERR_CFAILGO          -215
++#define EPS_INKERR_CFAILBC          -216
++#define EPS_INKERR_CFAILALL         -217
++
++    /*** Cancel request from printer                                                    */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_CAREQ_CANCEL            -300
++#define EPS_CAREQ_NOCANCEL          -301
++
++    /*** Other Printer Information                                                      */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_PREPARE_OVERHEAT        -400
++#define EPS_PREPARE_NORMALHEAT      -401
++#define EPS_PREPARE_TRAYOPENED      -402
++#define EPS_PREPARE_TRAYCLOSED      -403
++
++    /*** reset mode                                                                      */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_PM_PAGE                   1
++#define EPS_PM_JOB                    2
++
++    /*** Misc                                                                           */
++    /*** -------------------------------------------------------------------------------*/
++#define _SECOND_                    1000    /* Unit for changing milli second to second */
++#define _STATUS_REPLY_BUF            512    /* Printer status buffer size               */
++
++
++    /*** Model depend                                                                   */
++    /*** -------------------------------------------------------------------------------*/
++#define EPS_MDC_STATUS				(1)
++#define EPS_MDC_NOZZLE				(2)
++
++/*---------------------------  Public Function Declarations  ---------------------------*/
++/*******************************************|********************************************/
++extern EPS_INT32    serParseDeviceID            (EPS_INT8*, EPS_INT32, EPS_INT8*, EPS_INT8*, 
++                                                 EPS_INT32*, EPS_UINT32*, EPS_UINT32*   );
++extern EPS_BOOL		serCheckLang				(EPS_INT8*, EPS_UINT32*					);
++extern EPS_ERR_CODE serAnalyzeStatus            (EPS_INT8*, EPS_UINT32, EPS_STATUS_INFO*);
++extern void         serDelayThread              (EPS_UINT32, EPS_CMN_FUNC*              );
++extern EPS_INT32    serInkLevelNromalize        (EPS_INT32                              );
++extern EPS_ERR_CODE serGetSerialNo              (EPS_INT8*, EPS_INT32, EPS_INT8*        );
++extern EPS_ERR_CODE serGetSerialNoFormST        (EPS_INT8*, EPS_INT8*, EPS_INT32        );
++extern EPS_ERR_CODE serGetSupplyInfo            (EPS_UINT8*, EPS_SUPPLY_INFO*           );
++
++#ifdef GCOMSW_EPSON_SLEEP
++extern EPS_ERR_CODE serSleep                    (EPS_UINT32                             );
++#endif
++
++
++extern void         obsSetPrinter               (const EPS_PRINTER_INN*                 );
++extern void         obsSetColorPlane            (EPS_UINT8                              );
++extern void         obsClear                    (void                                   );
++extern EPS_INT32    obsGetPageMode              (void                                   );
++extern EPS_BOOL		obsIsA3Model				(EPS_INT32                              );
++extern EPS_BOOL		obsEnableDuplex				(EPS_INT32                              );
++extern EPS_BOOL		obsEnableAutoFeed			(void                                   );
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif  /* def __EPSON_ESCPR_SERVICES_H__ */
++
++
++/*_____________________________  epson-escpr-services.h  _______________________________*/
++  
++/*34567890123456789012345678901234567890123456789012345678901234567890123456789012345678*/
++/*       1         2         3         4         5         6         7         8        */
++/*******************************************|********************************************/
++/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%|%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
++/***** End of File *** End of File *** End of File *** End of File *** End of File ******/
++/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%|%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+--- a/src/filter.c	2024-05-19 17:41:19.567178280 -0400
++++ b/src/filter.c	2024-05-19 17:46:15.780301782 -0400
+@@ -39,6 +39,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpr-services.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -48,6 +49,10 @@
+ #include "optBase.h"
+ #include "linux_cmn.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)
+ 
+ #define PIPSLITE_FILTER_VERSION "* epson-escpr is a part of " PACKAGE_STRING


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/, ...
@ 2024-08-24 20:34 Mike Pagano
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2024-08-24 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     29f7dc157c43bd4db7143776e36b48e3087668f5
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 20:33:47 2024 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 20:33:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f7dc15

net-print/epson-inkjet-printer-escpr: drop 1.2.14

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 net-print/epson-inkjet-printer-escpr/Manifest      |  1 -
 .../epson-inkjet-printer-escpr-1.2.14.ebuild       | 36 ---------
 ...c-no-implicit-function-declaration-1.2.14.patch | 89 ----------------------
 3 files changed, 126 deletions(-)

diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 7c8a45bc4bf0..d17bea35ff7d 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,4 +1,3 @@
 DIST epson-inkjet-printer-escpr-1.8.5-1.tar.gz 5666905 BLAKE2B 549c948709993779b5615b501038fdceb6c3d6f173709b8cf99459346fff89923bdbe1babe34ee98eed4e1ebbd7a4b5962ddbc9cec9711aa15ff2056fec3d436 SHA512 4117b1efe903e4f506bbc67c45079f1d467ff6527691308734e55d32feeda3ec44b2dd85361e0243114f924eef04a91b0a5e86b5008f0a32ef323989b3d2896f
-DIST epson-inkjet-printer-escpr2-1.2.14-1.tar.gz 5517765 BLAKE2B 94c56e7f36e05ce3464ac8e4e1d12c770f9235973465f374b2dbe6cefaf43c9647594ec3c6513501d4583a97181467d83fb0eed9d8d5264f7cc07078e1038e77 SHA512 1e5595c731957a9a2d0d009f63e75ab78bfa76312ee767583c352956b39cb51e56ac0a95c9d30a57ae2c2b27cc89a9d7f02011e201c51c4bb4362505dbd5a712
 DIST epson-inkjet-printer-escpr2-1.2.15-1.tar.gz 5560479 BLAKE2B 8180fe06df8175ec31044b0eec2a125b9567c11a827343401a07e59e8bd93e689617b9b29364374f1d6ba6d6bca320d6615f601791c59e966d3a4d63f7adbeb0 SHA512 62cd5161f65f8ca6f8c1a8bb755e06eb147d4a06b5f796a8068ed9235b3abf38e6ccb10e82bdd93fddc085b90a7f9332e024ba09679aa08490a05735c0372653
 DIST epson-inkjet-printer-escpr2-1.2.9-1.tar.gz 5367737 BLAKE2B 6868569a6bed622e2f50619a36ffb0a0f7e834fd8a794ae3bc906d971db26b0c86386c9545190ec384027d0b8e8f62ddda6cb24f1e3f60b9c535a1eeddff4332 SHA512 70ff744d42fac4c79d2994648763b0b3970ee5463a7a310a0721a63735d536cb9a0499c894289d946b30e6f564f9bf60aa61801580ab6635af211d50867921a1

diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.14.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.14.ebuild
deleted file mode 100644
index b1bc155ddd03..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.14.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
-HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/16/04/80/9eed4e48a994b2ce7d9c83aa7fa7766f2c2d7ef3/${MY_P}-1.tar.gz"
-S="${WORKDIR}/${MY_P}"
-LICENSE="EPSON LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~amd64"
-
-QA_FLAGS_IGNORED="/usr/lib64/libescpr2.so.1.0.0"
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gcc-no-implicit-function-declaration-${PV}.patch"
-)
-
-src_configure() {
-	econf \
-		--with-cupsfilterdir="${EPREFIX}/usr/libexec/cups/filter"
-		--with-cupsppddir="${EPREFIX}/usr/share/ppd"
-}
-
-src_install() {
-	default
-
-	find "${ED}/usr/lib64" -name "*.la" -delete \
-		|| die "Removal of libtool files (.la) has failed."
-}

diff --git a/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.14.patch b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.14.patch
deleted file mode 100644
index ab244ddbe71b..000000000000
--- a/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.14.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 70b13d5be6d9ca55c0a9ec0dd401c9401922b1b7 Mon Sep 17 00:00:00 2001
-From: Aleix Quintana Alsius <kinta@communia.org>
-Date: Fri, 31 May 2024 23:51:51 +0200
-Subject: [PATCH] reroll update x86-64 patch
-
----
- src/filter.c  | 12 +++++++++---
- src/mem.c     |  1 +
- src/wrapper.c |  1 +
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/filter.c b/src/filter.c
-index d53e091..5bb2a5f 100644
---- a/src/filter.c
-+++ b/src/filter.c
-@@ -39,6 +39,7 @@
- #include "epson-escpr-api.h"
- #include "epson-escpr-services.h"
- #include "epson-escpr-mem.h"
-+#include "epson-escpr-services.h"
- 
- #include "err.h"
- #include "mem.h"
-@@ -48,6 +49,11 @@
- #include "optBase.h"
- #include "linux_cmn.h"
- #include "custompage.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)
- 
-@@ -453,7 +459,7 @@ main (int argc, char *argv[])
- 	}
- 	
- 	printJob.jobStatus = EPS_STATUS_ESTABLISHED;
--	int printHeight = 0;
-+	EPS_UINT32 printHeight = 0;
- ///////////////////////////////////////////////////////////////////////////////////////////////////////////	
- 
- 	print_area_x = printJob.printableAreaWidth;
-@@ -632,7 +638,7 @@ main (int argc, char *argv[])
- 						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;
- 			}
- 
-@@ -925,7 +931,7 @@ set_pips_parameter (filter_option_t *filter_opt_p, EPS_OPT *printOpt)
- 
- 	/* Get number of pages */
- 	char page_num;
--	read (STDIN_FILENO, &page_num, 1);
-+	(void)read (STDIN_FILENO, &page_num, 1);
- 	debug_msg("total pages = %d\n", page_num);
- 
- 	/* Others */
-diff --git a/src/mem.c b/src/mem.c
-index f53f2bc..d6c945a 100644
---- a/src/mem.c
-+++ b/src/mem.c
-@@ -23,6 +23,7 @@
- 
- #include <stdlib.h>
- #include "mem.h"
-+#include "err.h"
- 
- void *
- mem_malloc (unsigned int size, bool_t crit)
-diff --git a/src/wrapper.c b/src/wrapper.c
-index 1fa6daa..bfd567d 100644
---- a/src/wrapper.c
-+++ b/src/wrapper.c
-@@ -33,6 +33,7 @@
- /* added 22-04-2004 */
- #include <signal.h>
- 
-+#include "custompage.h"
- #include "libprtX.h"
- 
- #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
--- 
-2.45.1
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-08-24 20:34 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-07 19:24 [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/, Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2015-11-08  0:20 Mike Gilbert
2020-05-23 12:12 Andreas Sturmlechner
2024-05-19 22:03 Mike Pagano
2024-08-24 20:34 Mike Pagano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox