* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/files/, ...
@ 2016-05-14 17:47 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2016-05-14 17:47 UTC (permalink / raw
To: gentoo-commits
commit: d18a3a3774de48cb6587a5236cf7daed4d9098bc
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 17:45:40 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 14 17:47:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18a3a37
net-print/epson-inkjet-printer-escpr: bump to 1.6.5
Package-Manager: portage-2.2.28_p107_p258719
net-print/epson-inkjet-printer-escpr/Manifest | 1 +
.../epson-inkjet-printer-escpr-1.6.5.ebuild | 37 +++++++++++++++++++
.../files/1.6.5-warnings.patch | 42 ++++++++++++++++++++++
3 files changed, 80 insertions(+)
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 9818fb7..b0f661f 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -2,3 +2,4 @@ DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d9
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
DIST epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz 3243924 SHA256 76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754 SHA512 cb00eb1e71d3d4c4d8855fae20ea6f7babf2e861ac703d349a6d2a61e05055902f4347c72b237b9c56ec548735d30bdd3c613102bdabec701cef320ede9c3a9e WHIRLPOOL 1e2923387d9d4650987020114bd539bfc7827f81e2fa6db646eb9a36b268fd8c5edce4eb2debc2daa6962375161fc994628c04c4690cb2881d2d8ceb9f44e755
+DIST epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz 3277627 SHA256 1cd9e0506bf181e1476bd8305f1c6b8dbc4354eab9415d0d5529850856129e4c SHA512 31c3e11f9a19de592727318d8714940c62a3ee7a443fe5b1e51e8f995e536b427d4054e47438645f333816a44accb7c880f8b6e74e9973c072a07016ee94b7da WHIRLPOOL 7a8ab154d4c52d0fab4a89938127a4d76c60fa4d0edbde35a0c7b1e7cdece7ca4ba9e8a8073adb64126e02adf9c024dc922af117013f35834019a37a1277a06e
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
new file mode 100644
index 0000000..37d7cba
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-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}"
+
+PATCHES=(
+ "${FILESDIR}/1.6.5-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() {
+ emake -C ppd DESTDIR="${D}" install
+ emake -C src DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch
new file mode 100644
index 0000000..afd88b9
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch
@@ -0,0 +1,42 @@
+--- 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
+@@ -33,7 +33,9 @@
+
+ #include "epson-protocol.h"
+ #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"
+@@ -42,6 +44,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/files/, ...
@ 2016-09-03 20:10 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2016-09-03 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 65895a57facc0747d24cf77dc5f415c9ab703167
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 20:05:55 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 20:09:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65895a57
net-print/epson-inkjet-printer-escpr: remove old
Package-Manager: portage-2.3.0_p24
net-print/epson-inkjet-printer-escpr/Manifest | 4 --
.../epson-inkjet-printer-escpr-1.4.4.ebuild | 32 ----------------
.../epson-inkjet-printer-escpr-1.5.2.ebuild | 32 ----------------
.../epson-inkjet-printer-escpr-1.6.1.ebuild | 38 -------------------
.../epson-inkjet-printer-escpr-1.6.4.ebuild | 37 -------------------
.../files/1.4.4-warnings.patch | 43 ----------------------
.../files/1.5.2-warnings.patch | 32 ----------------
.../files/1.6.1-warnings.patch | 40 --------------------
8 files changed, 258 deletions(-)
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index b0f661f..1f8f34e 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,5 +1 @@
-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
-DIST epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz 3243924 SHA256 76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754 SHA512 cb00eb1e71d3d4c4d8855fae20ea6f7babf2e861ac703d349a6d2a61e05055902f4347c72b237b9c56ec548735d30bdd3c613102bdabec701cef320ede9c3a9e WHIRLPOOL 1e2923387d9d4650987020114bd539bfc7827f81e2fa6db646eb9a36b268fd8c5edce4eb2debc2daa6962375161fc994628c04c4690cb2881d2d8ceb9f44e755
DIST epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz 3277627 SHA256 1cd9e0506bf181e1476bd8305f1c6b8dbc4354eab9415d0d5529850856129e4c SHA512 31c3e11f9a19de592727318d8714940c62a3ee7a443fe5b1e51e8f995e536b427d4054e47438645f333816a44accb7c880f8b6e74e9973c072a07016ee94b7da WHIRLPOOL 7a8ab154d4c52d0fab4a89938127a4d76c60fa4d0edbde35a0c7b1e7cdece7ca4ba9e8a8073adb64126e02adf9c024dc922af117013f35834019a37a1277a06e
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild
deleted file mode 100644
index 3e76ec4..00000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.4.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/03/29/49/36201e41f124a1f4f7b793533b1ade1202032276/epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/1.4.4-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/epson-inkjet-printer-escpr-1.5.2.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild
deleted file mode 100644
index b87f354..00000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/epson-inkjet-printer-escpr-1.6.1.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild
deleted file mode 100644
index 18b5c89..00000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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/epson-inkjet-printer-escpr-1.6.4.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.4.ebuild
deleted file mode 100644
index bf45609..00000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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/37/97/88177bc0dc7025905eae4a0da1e841408f82e33c/epson-inkjet-printer-escpr-1.6.4-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}"
-
-PATCHES=(
- "${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() {
- emake -C ppd DESTDIR="${D}" install
- emake -C src DESTDIR="${D}" install
- einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/files/1.4.4-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.4.4-warnings.patch
deleted file mode 100644
index 34ec173..00000000
--- a/net-print/epson-inkjet-printer-escpr/files/1.4.4-warnings.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/lib/epson-escpage-mono.c
-+++ b/lib/epson-escpage-mono.c
-@@ -885,7 +885,7 @@
-
- EPS_LOG_FUNCIN;
-
-- memset(pBand, 0, sizeof(pBand));
-+ memset(pBand, 0, sizeof(EPS_PAGE_BAND_M));
-
- pBand->WidthInPixels = widthInPixels;
- pBand->WidthInBytes = (pBand->WidthInPixels+7)/8;
---- 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 *
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
deleted file mode 100644
index e60606f..00000000
--- a/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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 *
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
deleted file mode 100644
index 7eeba30..00000000
--- a/net-print/epson-inkjet-printer-escpr/files/1.6.1-warnings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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/files/, ...
@ 2024-03-20 16:25 Mike Pagano
0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2024-03-20 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 1cda17ab63dd54ca96124fe4f6a7445501a87bfb
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 16:25:25 2024 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 16:25:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cda17ab
net-print/epson-inkjet-printer-escpr: Unify patch
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
.../epson-inkjet-printer-escpr-1.8.4.ebuild | 2 +-
.../epson-inkjet-printer-escpr-1.8.5.ebuild | 2 +-
...inkjet-printer-escpr-1.8-missing-include.patch} | 0
...jet-printer-escpr-1.8.5-1-missing-include.patch | 129 ---------------------
4 files changed, 2 insertions(+), 131 deletions(-)
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
index 0f22fc7d8835..64af8c42cefc 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/1.6.5-warnings.patch"
"${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
- "${FILESDIR}/${P}-1-missing-include.patch"
+ "${FILESDIR}/${PN}-1.8-missing-include.patch"
)
src_configure() {
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
index 051693641546..661f5e9b014f 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.5.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/1.6.5-warnings.patch"
"${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
- "${FILESDIR}/${P}-1-missing-include.patch"
+ "${FILESDIR}/${PN}-1.8-missing-include.patch"
)
src_configure() {
diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.4-1-missing-include.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8-missing-include.patch
similarity index 100%
rename from net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.4-1-missing-include.patch
rename to net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8-missing-include.patch
diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.5-1-missing-include.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.5-1-missing-include.patch
deleted file mode 100644
index 4229d649bb26..000000000000
--- a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.8.5-1-missing-include.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- /dev/null 2024-02-07 07:14:59.428332875 -0500
-+++ b/lib/epson-escpage.h 2024-02-07 12:39:28.463235607 -0500
-@@ -0,0 +1,126 @@
-+/*__________________________________ epson-escpage.h ________________________________*/
-+
-+/* 1 2 3 4 5 6 7 8 */
-+/*34567890123456789012345678901234567890123456789012345678901234567890123456789012345678*/
-+/*******************************************|********************************************/
-+/*
-+ * Copyright (c) 2010 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/Page command Functions */
-+/* */
-+/*******************************************|********************************************/
-+
-+#ifndef __EPSON_ESCPAGE_H__
-+#define __EPSON_ESCPAGE_H__
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+/*------------------------------------ Includes -------------------------------------*/
-+/*******************************************|********************************************/
-+#include "epson-escpr-pvt.h"
-+#include "epson-escpr-media.h"
-+
-+/*------------------------------- Global Compiler Switch -------------------------------*/
-+/*******************************************|********************************************/
-+#define EPS_PAGE_RIT (1)
-+#define EPS_PAGE_TONER_SAVE (0)
-+#define EPS_PAGE_OUTUNIT_FACEDOWN (1)
-+#define EPS_PAGE_LOWRES_MODE (1) /* OFF=0 / ON=1 */
-+#define EPS_PAGE_HT_ERR_DIFFUSION (1) /* Halftoning mode */
-+
-+/*----------------------------------- Definitions ------------------------------------*/
-+/*******************************************|********************************************/
-+#define dim(x) (sizeof(x) / sizeof(x[0]))
-+#define EPS_EJL_LINEMAX (256)
-+
-+/*--------------------------- ESC/Page Media Declarations ---------------------------*/
-+/*******************************************|********************************************/
-+typedef struct _tagEPS_PAGE_MEDIASIZE_ {
-+ EPS_INT32 id;
-+ EPS_INT32 paper_x;
-+ EPS_INT32 paper_y;
-+ EPS_INT32 print_area_x_border;
-+ EPS_INT32 print_area_y_border;
-+ const EPS_INT8 *name;
-+} EPS_PAGE_MEDIASIZE;
-+
-+/* Size 600dpi */
-+static const EPS_PAGE_MEDIASIZE pageMediaSize[] = {
-+ { EPS_MSID_A4, 4960, 7016, 4720, 6776, "A4" },
-+ { EPS_MSID_A3, 7016, 9920, 6776, 9680, "A3" },
-+ { EPS_MSID_B4, 6072, 8600, 5832, 8360, "B4" },
-+ { EPS_MSID_B5, 4300, 6072, 4060, 5832, "B5" },
-+ { EPS_MSID_LETTER, 5100, 6600, 4860, 6360, "LT" },
-+ { EPS_MSID_LEGAL, 5100, 8400, 4860, 8160, "LGL"},
-+ { EPS_MSID_POSTCARD,2362, 3496, 2122, 3256, "PC" }
-+};
-+
-+/*--------------------------- Data Structure Declarations ---------------------------*/
-+/*******************************************|********************************************/
-+/* command data buffer */
-+typedef struct tagEPS_COMMAND_BUFFER
-+{
-+ EPS_UINT32 size; /* allocated buffer size */
-+ EPS_UINT32 len; /* data size */
-+ EPS_INT8* p;
-+ void* pExtent;
-+} EPS_COMMAND_BUFFER;
-+
-+/*-------------------------- Public Function Declarations ---------------------------*/
-+/*******************************************|********************************************/
-+extern EPS_ERR_CODE pageInitJob (const EPS_JOB_ATTRIB *pJobAttr);
-+extern EPS_ERR_CODE pageAllocBuffer (void);
-+extern void pageRelaseBuffer (void);
-+extern EPS_ERR_CODE pageStartJob (void);
-+extern EPS_ERR_CODE pageEndJob (void);
-+extern EPS_ERR_CODE pageStartPage (void);
-+extern EPS_ERR_CODE pageEndPage (void);
-+extern EPS_ERR_CODE pageColorRow (const EPS_BANDBMP*, EPS_RECT*);
-+extern EPS_ERR_CODE pageSendLeftovers (void);
-+
-+ /*** Get Supported Media Function */
-+ /*** -------------------------------------------------------------------------------*/
-+extern EPS_ERR_CODE pageCreateMediaInfo (EPS_PRINTER_INN* printer, EPS_UINT8* pmString,
-+ EPS_INT32 pmSize );
-+extern void pageClearSupportedMedia (EPS_PRINTER_INN* printer );
-+extern EPS_ERR_CODE pageGetPrintAreaInfoFromTable(const EPS_JOB_ATTRIB*,
-+ EPS_UINT32*, EPS_UINT32*, EPS_LAYOUT_INFO*);
-+extern EPS_ERR_CODE pageCreatePrintAreaInfoFromTable (EPS_UINT32,EPS_PRINT_AREA_INFO* );
-+
-+ /*** Get Printable Area */
-+ /*** -------------------------------------------------------------------------------*/
-+extern EPS_ERR_CODE pageGetPrintableArea (EPS_JOB_ATTRIB*, EPS_UINT32*, EPS_UINT32* );
-+
-+
-+/*----------------------- ESC/Page Local Function Declarations ----------------------*/
-+/*******************************************|********************************************/
-+typedef EPS_ERR_CODE (*PAGE_CmdBuffGrow )(EPS_COMMAND_BUFFER *pCmdBuff, EPS_INT32 addSize);
-+
-+extern EPS_ERR_CODE ejlStart (EPS_COMMAND_BUFFER *pCmdBuff, PAGE_CmdBuffGrow pfncGrow);
-+extern EPS_ERR_CODE ejlEnd (EPS_COMMAND_BUFFER *pCmdBuff, PAGE_CmdBuffGrow pfncGrow,
-+ EPS_INT32 pageCount );
-+extern EPS_ERR_CODE ejlPageEsc (EPS_COMMAND_BUFFER *pCmdBuff, PAGE_CmdBuffGrow pfncGrow);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* def __EPSON_ESCPAGE_H__ */
-+
-+/*__________________________________ epson-escpage.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 ******/
-+/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%|%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/files/, ...
@ 2024-08-24 20:13 Mike Pagano
0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2024-08-24 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 1071b341c6e786067c2fa5d66bdfa9703ea74e8c
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 20:13:08 2024 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 20:13:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1071b341
net-print/epson-inkjet-printer-escpr: add 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 insertions(+)
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index b911f5172313..f789b17f35f2 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.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.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
new file mode 100644
index 000000000000..b1bc155ddd03
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.14.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/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
new file mode 100644
index 000000000000..ab244ddbe71b
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.14.patch
@@ -0,0 +1,89 @@
+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
* [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/files/, ...
@ 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: e10d77f3b1b6f3b5cc5fca27209d1b44a671b568
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 20:33:20 2024 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat Aug 24 20:33:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10d77f3
net-print/epson-inkjet-printer-escpr: add 1.2.15
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
net-print/epson-inkjet-printer-escpr/Manifest | 1 +
.../epson-inkjet-printer-escpr-1.2.15.ebuild | 39 ++++++++++
.../gcc-no-implicit-function-declaration-1.2.patch | 89 ++++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index f789b17f35f2..7c8a45bc4bf0 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,3 +1,4 @@
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.15.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild
new file mode 100644
index 000000000000..953d408154c0
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15.ebuild
@@ -0,0 +1,39 @@
+# 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/06/85/fddc1d5996d0cab4dceea35852a2e430fb124993/${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"
+ "${FILESDIR}/gcc-no-implicit-function-declaration-$(ver_cut 1-2 ${PV}).patch"
+)
+
+echo "PATCHES is ${PATCHES}"
+
+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.patch b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch
new file mode 100644
index 000000000000..ab244ddbe71b
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/gcc-no-implicit-function-declaration-1.2.patch
@@ -0,0 +1,89 @@
+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 --
2024-08-24 20:34 [gentoo-commits] repo/gentoo:master commit in: net-print/epson-inkjet-printer-escpr/files/, Mike Pagano
-- strict thread matches above, loose matches on Subject: below --
2024-08-24 20:13 Mike Pagano
2024-03-20 16:25 Mike Pagano
2016-09-03 20:10 Mike Gilbert
2016-05-14 17:47 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox