Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/, media-libs/leptonica/files/
Date: Tue, 18 Aug 2020 22:48:39
Message-Id: 1597790900.e35c6156fd236dc36b1a01cd5f1fe729fc6a4488.chewi@gentoo
1 commit: e35c6156fd236dc36b1a01cd5f1fe729fc6a4488
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 18 22:47:56 2020 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 18 22:48:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35c6156
7
8 media-libs/leptonica: Drop old 1.78.0 and 1.79.0-r1
9
10 Package-Manager: Portage-3.0.3, Repoman-2.3.23
11 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
12
13 media-libs/leptonica/Manifest | 2 -
14 media-libs/leptonica/files/1.78.0-gnuplot.patch | 13 --
15 media-libs/leptonica/files/1.79.0-tests.patch | 299 ------------------------
16 media-libs/leptonica/leptonica-1.78.0.ebuild | 76 ------
17 media-libs/leptonica/leptonica-1.79.0-r1.ebuild | 78 -------
18 5 files changed, 468 deletions(-)
19
20 diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
21 index ee59ba83a97..0d43b2fd2af 100644
22 --- a/media-libs/leptonica/Manifest
23 +++ b/media-libs/leptonica/Manifest
24 @@ -1,4 +1,2 @@
25 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
26 -DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
27 -DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41 SHA512 4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
28 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
29
30 diff --git a/media-libs/leptonica/files/1.78.0-gnuplot.patch b/media-libs/leptonica/files/1.78.0-gnuplot.patch
31 deleted file mode 100644
32 index 758b78258dd..00000000000
33 --- a/media-libs/leptonica/files/1.78.0-gnuplot.patch
34 +++ /dev/null
35 @@ -1,13 +0,0 @@
36 -diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
37 -index cee1f54..f16d980 100755
38 ---- a/prog/reg_wrapper.sh
39 -+++ b/prog/reg_wrapper.sh
40 -@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
41 - TEST_NAME="${TEST_NAME%_reg*}"
42 -
43 - case "${TEST_NAME}" in
44 -- baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
45 -+ baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
46 - GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
47 -
48 - if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
49
50 diff --git a/media-libs/leptonica/files/1.79.0-tests.patch b/media-libs/leptonica/files/1.79.0-tests.patch
51 deleted file mode 100644
52 index eb794240dbd..00000000000
53 --- a/media-libs/leptonica/files/1.79.0-tests.patch
54 +++ /dev/null
55 @@ -1,299 +0,0 @@
56 -From b4cdb9256934c8f35cad558bf7288567211a792f Mon Sep 17 00:00:00 2001
57 -From: James Le Cuirot <chewi@××××××××××××××.uk>
58 -Date: Tue, 24 Mar 2020 20:59:17 +0000
59 -Subject: [PATCH] Fix parallel running of tests by using unique directories
60 -
61 -diff --git a/prog/pdfio2_reg.c b/prog/pdfio2_reg.c
62 -index 3f2090d..19da5a3 100644
63 ---- a/prog/pdfio2_reg.c
64 -+++ b/prog/pdfio2_reg.c
65 -@@ -55,7 +55,7 @@ L_REGPARAMS *rp;
66 - return 1;
67 -
68 - l_pdfSetDateAndVersion(0);
69 -- lept_mkdir("lept/pdf");
70 -+ lept_mkdir("lept/pdf2");
71 -
72 - /* ---------- pdf convert segmented with image regions ---------- */
73 - fprintf(stderr, "\n*** Writing segmented images with image regions\n");
74 -@@ -65,6 +65,12 @@ L_REGPARAMS *rp;
75 - * small bogus regions at the top, but we'll keep them for
76 - * the demonstration. */
77 - pix1 = pixRead("rabi.png");
78 -+ pix2 = pixScaleToGray2(pix1);
79 -+ pixWrite("/tmp/lept/pdf2/rabi8.jpg", pix2, IFF_JFIF_JPEG);
80 -+ pix3 = pixThresholdTo4bpp(pix2, 16, 1);
81 -+ pixWrite("/tmp/lept/pdf2/rabi4.png", pix3, IFF_PNG);
82 -+ pixDestroy(&pix2);
83 -+ pixDestroy(&pix3);
84 - pixSetResolution(pix1, 300, 300);
85 - pixGetDimensions(pix1, &w, &h, NULL);
86 - pix2 = pixGenerateHalftoneMask(pix1, NULL, NULL, NULL);
87 -@@ -77,41 +83,41 @@ L_REGPARAMS *rp;
88 -
89 - /* 1 bpp input */
90 - convertToPdfSegmented("rabi.png", 300, L_G4_ENCODE, 128, boxa1,
91 -- 0, 0.25, NULL, "/tmp/lept/pdf/file00.pdf");
92 -+ 0, 0.25, NULL, "/tmp/lept/pdf2/file00.pdf");
93 - convertToPdfSegmented("rabi.png", 300, L_JPEG_ENCODE, 128, boxa1,
94 -- 0, 0.25, NULL, "/tmp/lept/pdf/file01.pdf");
95 -+ 0, 0.25, NULL, "/tmp/lept/pdf2/file01.pdf");
96 - convertToPdfSegmented("rabi.png", 300, L_FLATE_ENCODE, 128, boxa1,
97 -- 0, 0.25, NULL, "/tmp/lept/pdf/file02.pdf");
98 -+ 0, 0.25, NULL, "/tmp/lept/pdf2/file02.pdf");
99 -
100 - /* 8 bpp input, no cmap */
101 -- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_G4_ENCODE, 128,
102 -- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file03.pdf");
103 -- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
104 -- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file04.pdf");
105 -- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
106 -- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file05.pdf");
107 -+ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_G4_ENCODE, 128,
108 -+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file03.pdf");
109 -+ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
110 -+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file04.pdf");
111 -+ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
112 -+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file05.pdf");
113 -
114 - /* 4 bpp input, cmap */
115 -- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE, 128,
116 -- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file06.pdf");
117 -- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE, 128,
118 -- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file07.pdf");
119 -- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE, 128,
120 -- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file08.pdf");
121 -+ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE, 128,
122 -+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file06.pdf");
123 -+ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE, 128,
124 -+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file07.pdf");
125 -+ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE, 128,
126 -+ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file08.pdf");
127 -
128 - /* 4 bpp input, cmap, data output */
129 - data = NULL;
130 -- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE,
131 -+ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE,
132 - 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
133 -- l_binaryWrite("/tmp/lept/pdf/file09.pdf", "w", data, nbytes);
134 -+ l_binaryWrite("/tmp/lept/pdf2/file09.pdf", "w", data, nbytes);
135 - lept_free(data);
136 -- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE,
137 -+ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE,
138 - 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
139 -- l_binaryWrite("/tmp/lept/pdf/file10.pdf", "w", data, nbytes);
140 -+ l_binaryWrite("/tmp/lept/pdf2/file10.pdf", "w", data, nbytes);
141 - lept_free(data);
142 -- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE,
143 -+ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE,
144 - 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
145 -- l_binaryWrite("/tmp/lept/pdf/file11.pdf", "w", data, nbytes);
146 -+ l_binaryWrite("/tmp/lept/pdf2/file11.pdf", "w", data, nbytes);
147 - lept_free(data);
148 - fprintf(stderr, "Segmented images time: %7.3f\n", stopTimer());
149 -
150 -@@ -125,17 +131,17 @@ L_REGPARAMS *rp;
151 -
152 - pix1 = pixRead("candelabrum.011.jpg");
153 - pix2 = pixScale(pix1, 3.0, 3.0);
154 -- pixWrite("/tmp/lept/pdf/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
155 -- GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf/seg1.jpg");
156 -- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_G4_ENCODE,
157 -+ pixWrite("/tmp/lept/pdf2/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
158 -+ GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf2/seg1.jpg");
159 -+ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_G4_ENCODE,
160 - 100, boxa1, 0, 0.25, NULL,
161 -- "/tmp/lept/pdf/file12.pdf");
162 -- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_JPEG_ENCODE,
163 -+ "/tmp/lept/pdf2/file12.pdf");
164 -+ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_JPEG_ENCODE,
165 - 100, boxa1, 0, 0.25, NULL,
166 -- "/tmp/lept/pdf/file13.pdf");
167 -- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_FLATE_ENCODE,
168 -+ "/tmp/lept/pdf2/file13.pdf");
169 -+ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_FLATE_ENCODE,
170 - 100, boxa1, 0, 0.25, NULL,
171 -- "/tmp/lept/pdf/file14.pdf");
172 -+ "/tmp/lept/pdf2/file14.pdf");
173 -
174 - pixDestroy(&pix1);
175 - pixDestroy(&pix2);
176 -@@ -143,25 +149,25 @@ L_REGPARAMS *rp;
177 -
178 - pix1 = pixRead("lion-page.00016.jpg");
179 - pix2 = pixScale(pix1, 3.0, 3.0);
180 -- pixWrite("/tmp/lept/pdf/lion16.jpg", pix2, IFF_JFIF_JPEG);
181 -+ pixWrite("/tmp/lept/pdf2/lion16.jpg", pix2, IFF_JFIF_JPEG);
182 - pix3 = pixRead("lion-mask.00016.tif");
183 - boxa1 = pixConnComp(pix3, NULL, 8);
184 - boxa2 = boxaTransform(boxa1, 0, 0, 3.0, 3.0);
185 -- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_G4_ENCODE,
186 -- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file15.pdf");
187 -- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_JPEG_ENCODE,
188 -- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file16.pdf");
189 -- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_FLATE_ENCODE,
190 -- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file17.pdf");
191 -+ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_G4_ENCODE,
192 -+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file15.pdf");
193 -+ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_JPEG_ENCODE,
194 -+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file16.pdf");
195 -+ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_FLATE_ENCODE,
196 -+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file17.pdf");
197 -
198 - /* Quantize the non-image part and flate encode.
199 - * This is useful because it results in a smaller file than
200 - * when you flate-encode the un-quantized non-image regions. */
201 - pix4 = pixScale(pix3, 3.0, 3.0); /* higher res mask, for combining */
202 - pix5 = QuantizeNonImageRegion(pix2, pix4, 12);
203 -- pixWrite("/tmp/lept/pdf/lion16-quant.png", pix5, IFF_PNG);
204 -- convertToPdfSegmented("/tmp/lept/pdf/lion16-quant.png", 200, L_FLATE_ENCODE,
205 -- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file18.pdf");
206 -+ pixWrite("/tmp/lept/pdf2/lion16-quant.png", pix5, IFF_PNG);
207 -+ convertToPdfSegmented("/tmp/lept/pdf2/lion16-quant.png", 200, L_FLATE_ENCODE,
208 -+ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file18.pdf");
209 - fprintf(stderr, "Color segmented images time: %7.3f\n", stopTimer());
210 -
211 - pixDestroy(&pix1);
212 -@@ -197,8 +203,8 @@ L_REGPARAMS *rp;
213 -
214 - startTimer();
215 - convertFilesToPdf("/tmp/lept/image", "file", 100, 0.8, 0, 75, "4 file test",
216 -- "/tmp/lept/pdf/file19.pdf");
217 -- fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf/file19.pdf\n"
218 -+ "/tmp/lept/pdf2/file19.pdf");
219 -+ fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf2/file19.pdf\n"
220 - "Multi-page gen time: %7.3f\n", stopTimer());
221 - pixDestroy(&pix1);
222 - pixDestroy(&pix2);
223 -@@ -208,26 +214,26 @@ L_REGPARAMS *rp;
224 - pixDestroy(&pix6);
225 - #endif
226 -
227 -- regTestCheckFile(rp, "/tmp/lept/pdf/file00.pdf");
228 -- regTestCheckFile(rp, "/tmp/lept/pdf/file01.pdf");
229 -- regTestCheckFile(rp, "/tmp/lept/pdf/file02.pdf");
230 -- regTestCheckFile(rp, "/tmp/lept/pdf/file03.pdf");
231 -- regTestCheckFile(rp, "/tmp/lept/pdf/file04.pdf");
232 -- regTestCheckFile(rp, "/tmp/lept/pdf/file05.pdf");
233 -- regTestCheckFile(rp, "/tmp/lept/pdf/file06.pdf");
234 -- regTestCheckFile(rp, "/tmp/lept/pdf/file07.pdf");
235 -- regTestCheckFile(rp, "/tmp/lept/pdf/file08.pdf");
236 -- regTestCheckFile(rp, "/tmp/lept/pdf/file09.pdf");
237 -- regTestCheckFile(rp, "/tmp/lept/pdf/file10.pdf");
238 -- regTestCheckFile(rp, "/tmp/lept/pdf/file11.pdf");
239 -- regTestCheckFile(rp, "/tmp/lept/pdf/file12.pdf");
240 -- regTestCheckFile(rp, "/tmp/lept/pdf/file13.pdf");
241 -- regTestCheckFile(rp, "/tmp/lept/pdf/file14.pdf");
242 -- regTestCheckFile(rp, "/tmp/lept/pdf/file15.pdf");
243 -- regTestCheckFile(rp, "/tmp/lept/pdf/file16.pdf");
244 -- regTestCheckFile(rp, "/tmp/lept/pdf/file17.pdf");
245 -- regTestCheckFile(rp, "/tmp/lept/pdf/file18.pdf");
246 -- regTestCheckFile(rp, "/tmp/lept/pdf/file19.pdf");
247 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file00.pdf");
248 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file01.pdf");
249 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file02.pdf");
250 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file03.pdf");
251 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file04.pdf");
252 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file05.pdf");
253 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file06.pdf");
254 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file07.pdf");
255 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file08.pdf");
256 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file09.pdf");
257 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file10.pdf");
258 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file11.pdf");
259 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file12.pdf");
260 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file13.pdf");
261 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file14.pdf");
262 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file15.pdf");
263 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file16.pdf");
264 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file17.pdf");
265 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file18.pdf");
266 -+ regTestCheckFile(rp, "/tmp/lept/pdf2/file19.pdf");
267 -
268 - #if 1
269 - /* ------------------ Test multipage pdf generation ----------------- */
270 -@@ -235,9 +241,9 @@ L_REGPARAMS *rp;
271 -
272 - /* Generate a multi-page pdf from all these files */
273 - startTimer();
274 -- concatenatePdf("/tmp/lept/pdf", "file", "/tmp/lept/pdf/cat_lept.pdf");
275 -+ concatenatePdf("/tmp/lept/pdf2", "file", "/tmp/lept/pdf2/cat_lept.pdf");
276 - fprintf(stderr,
277 -- "All files have been concatenated: /tmp/lept/pdf/cat_lept.pdf\n"
278 -+ "All files have been concatenated: /tmp/lept/pdf2/cat_lept.pdf\n"
279 - "Concatenation time: %7.3f\n", stopTimer());
280 - #endif
281 -
282 -@@ -249,7 +255,7 @@ L_REGPARAMS *rp;
283 - lept_mkdir("lept/good");
284 - lept_cp("testfile1.pdf", "lept/good", NULL, NULL);
285 - lept_cp("testfile2.pdf", "lept/good", NULL, NULL);
286 -- concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf/good.pdf");
287 -+ concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf2/good.pdf");
288 -
289 - /* Make a bad version with the pdf id removed, so that it is not
290 - * recognized as a pdf */
291 -@@ -273,8 +279,8 @@ L_REGPARAMS *rp;
292 - fprintf(stderr, "\nWe attempt to build from a bad directory\n");
293 - fprintf(stderr, "The next 3 error messages are intentional\n");
294 - lept_cp("testfile1.pdf", "lept/bad", NULL, NULL);
295 -- concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf/bad.pdf");
296 -- filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf/bad.pdf", &same);
297 -+ concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf2/bad.pdf");
298 -+ filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf2/bad.pdf", &same);
299 - if (same)
300 - fprintf(stderr, "Fixed: files are the same\n"
301 - "Attempt succeeded\n");
302 -@@ -290,8 +296,8 @@ L_REGPARAMS *rp;
303 - l_int32 ret;
304 -
305 - fprintf(stderr, "\n*** pdftk writes multipage pdfs from images\n");
306 -- tempfile1 = genPathname("/tmp/lept/pdf", "file*.pdf");
307 -- tempfile2 = genPathname("/tmp/lept/pdf", "cat_pdftk.pdf");
308 -+ tempfile1 = genPathname("/tmp/lept/pdf2", "file*.pdf");
309 -+ tempfile2 = genPathname("/tmp/lept/pdf2", "cat_pdftk.pdf");
310 - snprintf(buffer, sizeof(buffer), "pdftk %s output %s",
311 - tempfile1, tempfile2);
312 - ret = system(buffer); /* pdftk */
313 -diff --git a/prog/webpanimio_reg.c b/prog/webpanimio_reg.c
314 -index 8f61aab..3938e16 100644
315 ---- a/prog/webpanimio_reg.c
316 -+++ b/prog/webpanimio_reg.c
317 -@@ -75,8 +75,8 @@ L_REGPARAMS *rp;
318 - return 0;
319 - #endif /* abort */
320 -
321 -- lept_rmdir("lept/webp");
322 -- lept_mkdir("lept/webp");
323 -+ lept_rmdir("lept/webpanim");
324 -+ lept_mkdir("lept/webpanim");
325 -
326 - niters = 5;
327 - duration = 250; /* ms */
328 -@@ -85,9 +85,9 @@ L_REGPARAMS *rp;
329 - pixa = pixaCreate(6);
330 - pixaAddPix(pixa, pix1, L_COPY);
331 - pixaAddPix(pixa, pix2, L_COPY);
332 -- pixaWriteWebPAnim("/tmp/lept/webp/margeanim.webp", pixa, niters,
333 -+ pixaWriteWebPAnim("/tmp/lept/webpanim/margeanim.webp", pixa, niters,
334 - duration, 80, 0);
335 -- regTestCheckFile(rp, "/tmp/lept/webp/margeanim.webp");
336 -+ regTestCheckFile(rp, "/tmp/lept/webpanim/margeanim.webp");
337 - pixaDestroy(&pixa);
338 - pixDestroy(&pix1);
339 - pixDestroy(&pix2);
340 -diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
341 -index 94a6fa3..804954c 100755
342 ---- a/prog/reg_wrapper.sh
343 -+++ b/prog/reg_wrapper.sh
344 -@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
345 - TEST_NAME="${TEST_NAME%_reg*}"
346 -
347 - case "${TEST_NAME}" in
348 -- baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
349 -+ baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|pixa1|projection|rankbin|rankhisto|wordboxes)
350 - GNUPLOT=$(which gnuplot || which wgnuplot)
351 -
352 - if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
353 ---
354 -2.25.1
355
356 diff --git a/media-libs/leptonica/leptonica-1.78.0.ebuild b/media-libs/leptonica/leptonica-1.78.0.ebuild
357 deleted file mode 100644
358 index 12157b1bdd7..00000000000
359 --- a/media-libs/leptonica/leptonica-1.78.0.ebuild
360 +++ /dev/null
361 @@ -1,76 +0,0 @@
362 -# Copyright 1999-2019 Gentoo Authors
363 -# Distributed under the terms of the GNU General Public License v2
364 -
365 -EAPI=7
366 -
367 -inherit multilib-minimal
368 -
369 -DESCRIPTION="C library for image processing and analysis"
370 -HOMEPAGE="http://www.leptonica.org/"
371 -SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
372 -LICENSE="Apache-2.0"
373 -SLOT="0/5"
374 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
375 -IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
376 -RESTRICT="!test? ( test )"
377 -
378 -# N.B. Tests need some features enabled:
379 -REQUIRED_USE="test? ( jpeg png tiff zlib )"
380 -
381 -RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
382 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
383 - jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
384 - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
385 - sys-libs/zlib:=[${MULTILIB_USEDEP}] )
386 - tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
387 - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
388 - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
389 -
390 -DEPEND="${RDEPEND}
391 - test? ( media-libs/tiff:0[zlib] )"
392 -
393 -PATCHES=(
394 - "${FILESDIR}"/${PV}-gnuplot.patch
395 -)
396 -
397 -ECONF_SOURCE="${S}"
398 -DOCS=( README version-notes )
399 -
400 -src_prepare() {
401 - default
402 -
403 - # unhtmlize docs
404 - local X
405 - for X in ${DOCS[@]}; do
406 - awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
407 - "${X}.html" > "${X}" || die 'awk failed'
408 - rm -f -- "${X}.html"
409 - done
410 -}
411 -
412 -multilib_src_configure() {
413 - econf \
414 - --enable-shared \
415 - $(use_with gif giflib) \
416 - $(use_with jpeg) \
417 - $(use_with jpeg2k libopenjpeg) \
418 - $(use_with png libpng) \
419 - $(use_with tiff libtiff) \
420 - $(use_with webp libwebp) \
421 - $(use_with zlib) \
422 - $(use_enable static-libs static) \
423 - $(multilib_native_use_enable utils programs)
424 -}
425 -
426 -multilib_src_test() {
427 - default
428 -
429 - # ${TMPDIR} is not respected. It used to be but it lead to issues
430 - # and there have been long debates with upstream about it. :(
431 - rm -rf /tmp/lept/ || die
432 -}
433 -
434 -multilib_src_install_all() {
435 - # libtool archives covered by pkg-config.
436 - find "${D}" -name "*.la" -delete || die
437 -}
438
439 diff --git a/media-libs/leptonica/leptonica-1.79.0-r1.ebuild b/media-libs/leptonica/leptonica-1.79.0-r1.ebuild
440 deleted file mode 100644
441 index 52aa41650f9..00000000000
442 --- a/media-libs/leptonica/leptonica-1.79.0-r1.ebuild
443 +++ /dev/null
444 @@ -1,78 +0,0 @@
445 -# Copyright 1999-2020 Gentoo Authors
446 -# Distributed under the terms of the GNU General Public License v2
447 -
448 -EAPI=7
449 -
450 -inherit libtool multilib-minimal
451 -
452 -DESCRIPTION="C library for image processing and analysis"
453 -HOMEPAGE="http://www.leptonica.org/"
454 -SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
455 -LICENSE="Apache-2.0"
456 -SLOT="0/5"
457 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
458 -IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
459 -RESTRICT="!test? ( test )"
460 -
461 -# N.B. Tests need some features enabled:
462 -REQUIRED_USE="test? ( jpeg png tiff zlib )"
463 -
464 -RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
465 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
466 - jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
467 - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
468 - sys-libs/zlib:=[${MULTILIB_USEDEP}] )
469 - tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
470 - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
471 - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
472 -
473 -DEPEND="${RDEPEND}
474 - test? ( media-libs/tiff:0[zlib] )"
475 -
476 -PATCHES=(
477 - "${FILESDIR}"/${PV}-tests.patch
478 -)
479 -
480 -ECONF_SOURCE="${S}"
481 -DOCS=( README version-notes )
482 -
483 -src_prepare() {
484 - default
485 - elibtoolize
486 -
487 - # unhtmlize docs
488 - local X
489 - for X in ${DOCS[@]}; do
490 - awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
491 - "${X}.html" > "${X}" || die 'awk failed'
492 - rm -f -- "${X}.html"
493 - done
494 -}
495 -
496 -multilib_src_configure() {
497 - econf \
498 - --enable-shared \
499 - $(use_with gif giflib) \
500 - $(use_with jpeg) \
501 - $(use_with jpeg2k libopenjpeg) \
502 - $(use_with png libpng) \
503 - $(use_with tiff libtiff) \
504 - $(use_with webp libwebp) \
505 - $(use_with webp libwebpmux) \
506 - $(use_with zlib) \
507 - $(use_enable static-libs static) \
508 - $(multilib_native_use_enable utils programs)
509 -}
510 -
511 -multilib_src_test() {
512 - default
513 -
514 - # ${TMPDIR} is not respected. It used to be but it lead to issues
515 - # and there have been long debates with upstream about it. :(
516 - rm -rf /tmp/lept/ || die
517 -}
518 -
519 -multilib_src_install_all() {
520 - # libtool archives covered by pkg-config.
521 - find "${D}" -name "*.la" -delete || die
522 -}
Report Message
Find on MARC Find on Google Groups