From 211550847917b9fe17a89d0cebb36f2e720ae767 Mon Sep 17 00:00:00 2001 From: Declan Fledderjohn Date: Fri, 18 Sep 2026 01:08:38 -0400 Subject: [PATCH 1/2] epson-inkjet-printer-escpr2: epson-inkjet-printer-escpr2 upgrade to 1.2.42 --- .../patches/fix_build_error.patch | 36 ++++++++++++------- srcpkgs/epson-inkjet-printer-escpr2/template | 18 ++++++---- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch b/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch index 0dda28d41b48ae..ee96022fedea5d 100644 --- a/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch +++ b/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch @@ -1,7 +1,7 @@ -diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/filter.c epson-inkjet-printer-escpr2-1.2.3_mod/src/filter.c ---- epson-inkjet-printer-escpr2-1.2.3/src/filter.c 2023-06-08 13:53:38.000000000 +0800 -+++ epson-inkjet-printer-escpr2-1.2.3_mod/src/filter.c 2025-06-09 22:11:11.316042023 +0800 -@@ -39,6 +39,7 @@ +diff -ruN a/src/filter.c b/src/filter.c +--- a/src/filter.c 2025-03-12 07:46:22.000000000 +0100 ++++ b/src/filter.c 2025-05-03 18:42:46.418977873 +0200 +@@ -38,6 +38,7 @@ #include "epson-escpr-api.h" #include "epson-escpr-services.h" #include "epson-escpr-mem.h" @@ -9,20 +9,19 @@ diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/filter.c epson-ink #include "err.h" #include "mem.h" -@@ -47,6 +48,12 @@ - #include "libprtX.h" +@@ -47,6 +48,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 (int); +extern EPS_ERR_CODE PrintBand (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*); -+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4) -@@ -430,7 +437,7 @@ main (int argc, char *argv[]) +@@ -453,7 +459,7 @@ } printJob.jobStatus = EPS_STATUS_ESTABLISHED; @@ -31,7 +30,7 @@ diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/filter.c epson-ink /////////////////////////////////////////////////////////////////////////////////////////////////////////// print_area_x = printJob.printableAreaWidth; -@@ -604,7 +611,7 @@ main (int argc, char *argv[]) +@@ -624,7 +630,7 @@ memcpy(rever_buf + k*3, startpage + pos + (bandBmp.widthBytes - 6) - k*3, 3); } } @@ -40,7 +39,7 @@ diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/filter.c epson-ink pos -= bandBmp.widthBytes; } -@@ -897,7 +904,7 @@ set_pips_parameter (filter_option_t *fil +@@ -918,7 +924,7 @@ /* Get number of pages */ char page_num; @@ -49,9 +48,9 @@ diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/filter.c epson-ink debug_msg("total pages = %d\n", page_num); /* Others */ -diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/mem.c epson-inkjet-printer-escpr2-1.2.3_mod/src/mem.c ---- epson-inkjet-printer-escpr2-1.2.3/src/mem.c 2023-02-15 10:57:29.000000000 +0800 -+++ epson-inkjet-printer-escpr2-1.2.3_mod/src/mem.c 2025-06-09 22:09:42.622069865 +0800 +diff -ruN a/src/mem.c b/src/mem.c +--- a/src/mem.c 2023-10-17 09:37:18.000000000 +0200 ++++ b/src/mem.c 2025-05-03 18:37:18.940061028 +0200 @@ -23,6 +23,7 @@ #include @@ -60,3 +59,14 @@ diff '--color=auto' -up epson-inkjet-printer-escpr2-1.2.3/src/mem.c epson-inkjet void * mem_malloc (unsigned int size, bool_t crit) +diff -ruN a/src/wrapper.c b/src/wrapper.c +--- a/src/wrapper.c 2025-03-12 07:47:23.000000000 +0100 ++++ b/src/wrapper.c 2025-05-03 18:37:18.940134498 +0200 +@@ -33,6 +33,7 @@ + /* added 22-04-2004 */ + #include + ++#include "custompage.h" + #include "libprtX.h" + + #define HAVE_PPM_W 0 diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template index 5f63989a6c0c86..da1a5b60d3cd87 100644 --- a/srcpkgs/epson-inkjet-printer-escpr2/template +++ b/srcpkgs/epson-inkjet-printer-escpr2/template @@ -1,23 +1,27 @@ # Template file for 'epson-inkjet-printer-escpr2' pkgname=epson-inkjet-printer-escpr2 -version=1.2.3 -revision=2 -archs="x86_64 i686 aarch64 armv7l" +version=1.2.42 +revision=1 +archs="x86_64 i686 aarch64 armv6hf armv6l armv7hf armv7l" build_style=gnu-configure configure_args="--with-cupsfilterdir=/usr/lib/cups/filter --with-cupsppddir=/usr/share/ppd" -hostmakedepends="automake" +hostmakedepends="automake libtool" makedepends="cups-devel ghostscript-devel" depends="cups-filters" short_desc="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux" maintainer="Orphaned " license="custom:Proprietary" -homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" -distfiles="https://download3.ebz.epson.net/dsc/f/03/00/14/75/78/aeb37e000452a166daca5daad8ac74cd25b80be6/epson-inkjet-printer-escpr2-${version}-1.tar.gz" -checksum=bbed26ca1f3762138a6bcc08b8f5673bb90ab6c06418661adb84f652b08b7ff3 +homepage="https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php" +distfiles="https://download-center.epson.com/f/module/4d70b84a-1686-4134-8ce0-4ac8a838f31c/epson-inkjet-printer-escpr2-${version}-1.tar.gz" +checksum=fe08f82ba54fa2e5f04baa7405cedd805fe3f5597a61156a1fca729b513f4dfe restricted=yes repository=nonfree +pre_configure() { + autoreconf -fi +} + post_install() { vlicense COPYING vlicense COPYING.EPSON From 3f6fe3c55bf6e2bf230ead98d778dc5c442d5500 Mon Sep 17 00:00:00 2001 From: Declan Fledderjohn Date: Fri, 18 Sep 2026 01:54:16 -0400 Subject: [PATCH 2/2] epson-inkjet-printer-escpr2: nomenclature changes to make more uniform with previous patchfile --- .../patches/fix_build_error.patch | 18 +++++++++--------- srcpkgs/epson-inkjet-printer-escpr2/template | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch b/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch index ee96022fedea5d..10a26c28d441a2 100644 --- a/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch +++ b/srcpkgs/epson-inkjet-printer-escpr2/patches/fix_build_error.patch @@ -1,6 +1,6 @@ -diff -ruN a/src/filter.c b/src/filter.c ---- a/src/filter.c 2025-03-12 07:46:22.000000000 +0100 -+++ b/src/filter.c 2025-05-03 18:42:46.418977873 +0200 +diff -ruN epson-inkjet-printer-escpr2-1.2.42/src/filter.c epson-inkjet-printer-escpr2-1.2.42_mod/src/filter.c +--- epson-inkjet-printer-escpr2-1.2.42/src/filter.c 2025-03-12 07:46:22.000000000 +0100 ++++ epson-inkjet-printer-escpr2-1.2.42_mod/src/filter.c 2025-05-03 18:42:46.418977873 +0200 @@ -38,6 +38,7 @@ #include "epson-escpr-api.h" #include "epson-escpr-services.h" @@ -48,9 +48,9 @@ diff -ruN a/src/filter.c b/src/filter.c debug_msg("total pages = %d\n", page_num); /* Others */ -diff -ruN a/src/mem.c b/src/mem.c ---- a/src/mem.c 2023-10-17 09:37:18.000000000 +0200 -+++ b/src/mem.c 2025-05-03 18:37:18.940061028 +0200 +diff -ruN epson-inkjet-printer-escpr2-1.2.42/src/mem.c epson-inkjet-printer-escpr2-1.2.42_mod/src/mem.c +--- epson-inkjet-printer-escpr2-1.2.42/src/mem.c 2023-10-17 09:37:18.000000000 +0200 ++++ epson-inkjet-printer-escpr2-1.2.42_mod/src/mem.c 2025-05-03 18:37:18.940061028 +0200 @@ -23,6 +23,7 @@ #include @@ -59,9 +59,9 @@ diff -ruN a/src/mem.c b/src/mem.c void * mem_malloc (unsigned int size, bool_t crit) -diff -ruN a/src/wrapper.c b/src/wrapper.c ---- a/src/wrapper.c 2025-03-12 07:47:23.000000000 +0100 -+++ b/src/wrapper.c 2025-05-03 18:37:18.940134498 +0200 +diff -ruN epson-inkjet-printer-escpr2-1.2.42/src/wrapper.c epson-inkjet-printer-escpr2-1.2.42_mod/src/wrapper.c +--- epson-inkjet-printer-escpr2-1.2.42/src/wrapper.c 2025-03-12 07:47:23.000000000 +0100 ++++ epson-inkjet-printer-escpr2-1.2.42_mod/src/wrapper.c 2025-05-03 18:37:18.940134498 +0200 @@ -33,6 +33,7 @@ /* added 22-04-2004 */ #include diff --git a/srcpkgs/epson-inkjet-printer-escpr2/template b/srcpkgs/epson-inkjet-printer-escpr2/template index da1a5b60d3cd87..14a109aecd1679 100644 --- a/srcpkgs/epson-inkjet-printer-escpr2/template +++ b/srcpkgs/epson-inkjet-printer-escpr2/template @@ -1,7 +1,7 @@ # Template file for 'epson-inkjet-printer-escpr2' pkgname=epson-inkjet-printer-escpr2 version=1.2.42 -revision=1 +revision=2 archs="x86_64 i686 aarch64 armv6hf armv6l armv7hf armv7l" build_style=gnu-configure configure_args="--with-cupsfilterdir=/usr/lib/cups/filter