summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-18 15:52:06 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-21 10:02:02 -0800
commitadb1af7105a28c6eb39cc12fb24f72afbf413060 (patch)
treeeeb1a706e3d8a9e45e92b2e14336af8cacf2ddc6
parent320466b5408b3f468a8fdb1af305ecf04ceb09f0 (diff)
downloadmeta-openembedded-adb1af7105a28c6eb39cc12fb24f72afbf413060.tar.gz
hplip: Update to 3.22.10
Add a patch to drop 'register' keyword Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch309
-rw-r--r--meta-oe/recipes-extended/hplip/hplip/configure.patch2
-rw-r--r--meta-oe/recipes-extended/hplip/hplip_3.22.10.bb (renamed from meta-oe/recipes-extended/hplip/hplip_3.22.6.bb)4
3 files changed, 312 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch b/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch
new file mode 100644
index 0000000000..237374d74b
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip/0001-Drop-using-register-storage-classifier.patch
@@ -0,0 +1,309 @@
1From c36f0af7ba75c133edc46f052b291188351b6c20 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Jan 2023 15:49:16 -0800
4Subject: [PATCH] Drop using register storage classifier
5
6Its beeing dropped from latest standards beginning C++17
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 ip/xjpg_dct.c | 4 +--
12 ip/xjpg_dct.h | 4 +--
13 prnt/hpcups/Mode9.cpp | 2 +-
14 prnt/hpcups/ModeDeltaPlus.cpp | 4 +--
15 prnt/hpcups/jccolor.c | 46 +++++++++++++++++------------------
16 prnt/hpijs/compression.cpp | 2 +-
17 prnt/hpijs/jccolor.c | 44 ++++++++++++++++-----------------
18 prnt/hpijs/ljfastraster.cpp | 4 +--
19 prnt/hpps/psutil.c | 6 ++---
20 9 files changed, 58 insertions(+), 58 deletions(-)
21
22diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c
23index 63f021b..1986923 100644
24--- a/ip/xjpg_dct.c
25+++ b/ip/xjpg_dct.c
26@@ -103,7 +103,7 @@
27 | for the Winograd DCT. |
28 |____________________________________________________________________________|
29 */
30-void dct_forward (register int *block_p)
31+void dct_forward (int *block_p)
32 {
33 #define CONST_FRAC_BITS 14 /* bits of frac in CONST_1-CONST_5 below */
34
35@@ -257,7 +257,7 @@ void dct_forward (register int *block_p)
36 | and level-shifting, you must clamp these values to 0..255. |
37 |____________________________________________________________________________|
38 */
39-void dct_inverse (register int *block_p)
40+void dct_inverse (int *block_p)
41 {
42 #define CONST_FRAC_BITS 13 /* bits of frac in CONST_1-CONST_5 below */
43
44diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h
45index 7dc90f3..149d66f 100644
46--- a/ip/xjpg_dct.h
47+++ b/ip/xjpg_dct.h
48@@ -43,8 +43,8 @@
49 |____________________________________________________________________________|
50 */
51
52-void dct_forward (register int *block_p);
53+void dct_forward (int *block_p);
54
55-void dct_inverse (register int *block_p);
56+void dct_inverse (int *block_p);
57
58 /* End of File */
59diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp
60index 94ff571..6cc210a 100644
61--- a/prnt/hpcups/Mode9.cpp
62+++ b/prnt/hpcups/Mode9.cpp
63@@ -203,7 +203,7 @@ bool Mode9::Process(RASTERDATA* input)
64 unsigned int offset,byte_count,rem_count;
65 Mode9_comtype command;
66 char* dest= (char*) compressBuf;
67- register char *dptr=dest;
68+ char *dptr=dest;
69
70 while ( size > 0 )
71 {
72diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp
73index 4552f4a..6a5837f 100644
74--- a/prnt/hpcups/ModeDeltaPlus.cpp
75+++ b/prnt/hpcups/ModeDeltaPlus.cpp
76@@ -241,8 +241,8 @@ bool ModeDeltaPlus::compress (BYTE *outmem,
77 const uint32_t inheight,
78 uint32_t horz_ht_dist)
79 {
80- register BYTE *outptr = outmem;
81- register uint32_t col;
82+ BYTE *outptr = outmem;
83+ uint32_t col;
84 const BYTE *seedrow;
85 uint32_t seedrow_count = 0;
86 uint32_t location = 0;
87diff --git a/prnt/hpcups/jccolor.c b/prnt/hpcups/jccolor.c
88index 7cc8906..6794575 100644
89--- a/prnt/hpcups/jccolor.c
90+++ b/prnt/hpcups/jccolor.c
91@@ -73,7 +73,7 @@ typedef my_color_converter * my_cconvert_ptr;
92
93 /* We allocate one big table and divide it up into eight parts, instead of
94 * doing eight alloc_small requests. This lets us use a single table base
95- * address, which can be held in a register in the inner loops on many
96+ * address, which can be held in a in the inner loops on many
97 * machines (more than can hold all eight addresses, anyway).
98 */
99
100@@ -205,11 +205,11 @@ rgb_ycc_convert (j_compress_ptr cinfo,
101 JDIMENSION output_row, int num_rows)
102 {
103 my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
104- register int r, g, b;
105- register INT32 * ctab = cconvert->rgb_ycc_tab;
106- register JSAMPROW inptr;
107- register JSAMPROW outptr0, outptr1, outptr2;
108- register JDIMENSION col;
109+ int r, g, b;
110+ INT32 * ctab = cconvert->rgb_ycc_tab;
111+ JSAMPROW inptr;
112+ JSAMPROW outptr0, outptr1, outptr2;
113+ JDIMENSION col;
114 JDIMENSION num_cols = cinfo->image_width;
115
116 while (--num_rows >= 0) {
117@@ -261,11 +261,11 @@ rgb_gray_convert (j_compress_ptr cinfo,
118 JDIMENSION output_row, int num_rows)
119 {
120 my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
121- register int r, g, b;
122- register INT32 * ctab = cconvert->rgb_ycc_tab;
123- register JSAMPROW inptr;
124- register JSAMPROW outptr;
125- register JDIMENSION col;
126+ int r, g, b;
127+ INT32 * ctab = cconvert->rgb_ycc_tab;
128+ JSAMPROW inptr;
129+ JSAMPROW outptr;
130+ JDIMENSION col;
131 JDIMENSION num_cols = cinfo->image_width;
132
133 while (--num_rows >= 0) {
134@@ -300,11 +300,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo,
135 JDIMENSION output_row, int num_rows)
136 {
137 my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
138- register int r, g, b;
139- register INT32 * ctab = cconvert->rgb_ycc_tab;
140- register JSAMPROW inptr;
141- register JSAMPROW outptr0, outptr1, outptr2, outptr3;
142- register JDIMENSION col;
143+ int r, g, b;
144+ INT32 * ctab = cconvert->rgb_ycc_tab;
145+ JSAMPROW inptr;
146+ JSAMPROW outptr0, outptr1, outptr2, outptr3;
147+ JDIMENSION col;
148 JDIMENSION num_cols = cinfo->image_width;
149
150 while (--num_rows >= 0) {
151@@ -354,9 +354,9 @@ grayscale_convert (j_compress_ptr cinfo,
152 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
153 JDIMENSION output_row, int num_rows)
154 {
155- register JSAMPROW inptr;
156- register JSAMPROW outptr;
157- register JDIMENSION col;
158+ JSAMPROW inptr;
159+ JSAMPROW outptr;
160+ JDIMENSION col;
161 JDIMENSION num_cols = cinfo->image_width;
162 int instride = cinfo->input_components;
163
164@@ -383,10 +383,10 @@ null_convert (j_compress_ptr cinfo,
165 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
166 JDIMENSION output_row, int num_rows)
167 {
168- register JSAMPROW inptr;
169- register JSAMPROW outptr;
170- register JDIMENSION col;
171- register int ci;
172+ JSAMPROW inptr;
173+ JSAMPROW outptr;
174+ JDIMENSION col;
175+ int ci;
176 int nc = cinfo->num_components;
177 JDIMENSION num_cols = cinfo->image_width;
178
179diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp
180index fcac793..10194ca 100644
181--- a/prnt/hpijs/compression.cpp
182+++ b/prnt/hpijs/compression.cpp
183@@ -266,7 +266,7 @@ BOOL Mode9::Process(RASTERDATA* input)
184 unsigned int offset,byte_count,rem_count;
185 Mode9_comtype command;
186 char* dest= (char*) compressBuf;
187- register char *dptr=dest;
188+ char *dptr=dest;
189
190 while ( size > 0 )
191 {
192diff --git a/prnt/hpijs/jccolor.c b/prnt/hpijs/jccolor.c
193index a6b2333..8486b65 100644
194--- a/prnt/hpijs/jccolor.c
195+++ b/prnt/hpijs/jccolor.c
196@@ -206,11 +206,11 @@ rgb_ycc_convert (j_compress_ptr cinfo,
197 JDIMENSION output_row, int num_rows)
198 {
199 my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
200- register int r, g, b;
201- register INT32 * ctab = cconvert->rgb_ycc_tab;
202- register JSAMPROW inptr;
203- register JSAMPROW outptr0, outptr1, outptr2;
204- register JDIMENSION col;
205+ int r, g, b;
206+ INT32 * ctab = cconvert->rgb_ycc_tab;
207+ JSAMPROW inptr;
208+ JSAMPROW outptr0, outptr1, outptr2;
209+ JDIMENSION col;
210 JDIMENSION num_cols = cinfo->image_width;
211
212 while (--num_rows >= 0) {
213@@ -262,11 +262,11 @@ rgb_gray_convert (j_compress_ptr cinfo,
214 JDIMENSION output_row, int num_rows)
215 {
216 my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
217- register int r, g, b;
218- register INT32 * ctab = cconvert->rgb_ycc_tab;
219- register JSAMPROW inptr;
220- register JSAMPROW outptr;
221- register JDIMENSION col;
222+ int r, g, b;
223+ INT32 * ctab = cconvert->rgb_ycc_tab;
224+ JSAMPROW inptr;
225+ JSAMPROW outptr;
226+ JDIMENSION col;
227 JDIMENSION num_cols = cinfo->image_width;
228
229 while (--num_rows >= 0) {
230@@ -301,11 +301,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo,
231 JDIMENSION output_row, int num_rows)
232 {
233 my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
234- register int r, g, b;
235- register INT32 * ctab = cconvert->rgb_ycc_tab;
236- register JSAMPROW inptr;
237- register JSAMPROW outptr0, outptr1, outptr2, outptr3;
238- register JDIMENSION col;
239+ int r, g, b;
240+ INT32 * ctab = cconvert->rgb_ycc_tab;
241+ JSAMPROW inptr;
242+ JSAMPROW outptr0, outptr1, outptr2, outptr3;
243+ JDIMENSION col;
244 JDIMENSION num_cols = cinfo->image_width;
245
246 while (--num_rows >= 0) {
247@@ -355,9 +355,9 @@ grayscale_convert (j_compress_ptr cinfo,
248 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
249 JDIMENSION output_row, int num_rows)
250 {
251- register JSAMPROW inptr;
252- register JSAMPROW outptr;
253- register JDIMENSION col;
254+ JSAMPROW inptr;
255+ JSAMPROW outptr;
256+ JDIMENSION col;
257 JDIMENSION num_cols = cinfo->image_width;
258 int instride = cinfo->input_components;
259
260@@ -384,10 +384,10 @@ null_convert (j_compress_ptr cinfo,
261 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
262 JDIMENSION output_row, int num_rows)
263 {
264- register JSAMPROW inptr;
265- register JSAMPROW outptr;
266- register JDIMENSION col;
267- register int ci;
268+ JSAMPROW inptr;
269+ JSAMPROW outptr;
270+ JDIMENSION col;
271+ int ci;
272 int nc = cinfo->num_components;
273 JDIMENSION num_cols = cinfo->image_width;
274
275diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp
276index 8c7073a..7e82fac 100644
277--- a/prnt/hpijs/ljfastraster.cpp
278+++ b/prnt/hpijs/ljfastraster.cpp
279@@ -919,8 +919,8 @@ BOOL ModeDeltaPlus::Compress (HPUInt8 *outmem,
280 const uint32_t inheight,
281 uint32_t horz_ht_dist)
282 {
283- register HPUInt8 *outptr = outmem;
284- register uint32_t col;
285+ HPUInt8 *outptr = outmem;
286+ uint32_t col;
287 const HPUInt8 *seedrow;
288 uint32_t seedrow_count = 0;
289 uint32_t location = 0;
290diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c
291index 7282dc2..87fba4f 100644
292--- a/prnt/hpps/psutil.c
293+++ b/prnt/hpps/psutil.c
294@@ -148,9 +148,9 @@ static int fcopy(long upto)
295 /* build array of pointers to start/end of pages */
296 void scanpages(void)
297 {
298- register char *comment = buffer+2;
299- register int nesting = 0;
300- register long int record;
301+ char *comment = buffer+2;
302+ int nesting = 0;
303+ long int record;
304
305 if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL)
306 message(FATAL, "out of memory\n");
307--
3082.39.1
309
diff --git a/meta-oe/recipes-extended/hplip/hplip/configure.patch b/meta-oe/recipes-extended/hplip/hplip/configure.patch
index 571d5fe308..a6e61a47ca 100644
--- a/meta-oe/recipes-extended/hplip/hplip/configure.patch
+++ b/meta-oe/recipes-extended/hplip/hplip/configure.patch
@@ -1,7 +1,7 @@
1--- a/configure.in 1--- a/configure.in
2+++ b/configure.in 2+++ b/configure.in
3@@ -30,7 +30,7 @@ 3@@ -30,7 +30,7 @@
4 AC_INIT([HP Linux Imaging and Printing], [3.22.6], [3.22.6], [hplip]) 4 AC_INIT([HP Linux Imaging and Printing], [3.22.10], [3.22.10], [hplip])
5 5
6 #AM_INIT_AUTOMAKE([1.9 foreign]) 6 #AM_INIT_AUTOMAKE([1.9 foreign])
7-AM_INIT_AUTOMAKE 7-AM_INIT_AUTOMAKE
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
index b746006c20..e054553d85 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.22.6.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
@@ -15,8 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
15 file://0004-Define-missing-prototype-for-functions.patch \ 15 file://0004-Define-missing-prototype-for-functions.patch \
16 file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \ 16 file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \
17 file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \ 17 file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \
18" 18 file://0001-Drop-using-register-storage-classifier.patch"
19SRC_URI[sha256sum] = "27ed0d492febb0b47c656234820d3ce573b24ff5b62e3bf4b2c47f82868d6bb4" 19SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624"
20 20
21DEPENDS += "cups python3 libusb" 21DEPENDS += "cups python3 libusb"
22 22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-06 06:00:30 +0000