Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/jbig2enc/files/
Date: Tue, 14 Mar 2023 23:01:55
Message-Id: 1678834845.8d3b82346f410f7cd3f4a574e1b5bb5ad11580a5.conikost@gentoo
1 commit: 8d3b82346f410f7cd3f4a574e1b5bb5ad11580a5
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Fri Mar 10 06:48:57 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 14 23:00:45 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3b8234
7
8 media-libs/jbig2enc: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/30038
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../files/jbig2enc-0.28-leptonica-1.70.patch | 52 ----------------------
15 1 file changed, 52 deletions(-)
16
17 diff --git a/media-libs/jbig2enc/files/jbig2enc-0.28-leptonica-1.70.patch b/media-libs/jbig2enc/files/jbig2enc-0.28-leptonica-1.70.patch
18 deleted file mode 100644
19 index e2ed771d2045..000000000000
20 --- a/media-libs/jbig2enc/files/jbig2enc-0.28-leptonica-1.70.patch
21 +++ /dev/null
22 @@ -1,52 +0,0 @@
23 -From 53ce5fe7e73d7ed95c9e12b52dd4984723f865fa Mon Sep 17 00:00:00 2001
24 -From: =?UTF-8?q?Zdenko=20Podobn=C3=BD?= <zdenop@×××××.com>
25 -Date: Sun, 6 Apr 2014 21:25:27 +0200
26 -Subject: [PATCH] fix build with leptonica 1.70
27 -
28 -Merged upstream
29 -
30 ----
31 - configure.ac | 1 +
32 - src/jbig2.cc | 13 +++++++++----
33 - 2 files changed, 10 insertions(+), 4 deletions(-)
34 -
35 -diff --git a/configure.ac b/configure.ac
36 -index fe37c22..753a607 100644
37 ---- a/configure.ac
38 -+++ b/configure.ac
39 -@@ -55,6 +55,7 @@ AC_CHECK_LIB([lept], [findFileFormatStream], [], [
40 - echo "Error! Leptonica not detected."
41 - exit -1
42 - ])
43 -+AC_CHECK_FUNCS(expandBinaryPower2Low,,)
44 - # test for function - it should detect leptonica dependecies
45 -
46 - # Check for possible dependancies of leptonica.
47 -diff --git a/src/jbig2.cc b/src/jbig2.cc
48 -index e10f042..515c1ef 100644
49 ---- a/src/jbig2.cc
50 -+++ b/src/jbig2.cc
51 -@@ -130,11 +130,16 @@ segment_image(PIX *pixb, PIX *piximg) {
52 - // input color image, so we have to do it this way...
53 - // is there a better way?
54 - // PIX *pixd = pixExpandBinary(pixd4, 4);
55 -- PIX *pixd = pixCreate(piximg->w, piximg->h, 1);
56 -- pixCopyResolution(pixd, piximg);
57 -- if (verbose) pixInfo(pixd, "mask image: ");
58 -- expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl,
59 -+ PIX *pixd;
60 -+#ifdef HAVE_EXPANDBINARYPOWER2LOW
61 -+ pixd = pixCreate(piximg->w, piximg->h, 1);
62 -+ pixCopyResolution(pixd, piximg);
63 -+ expandBinaryPower2Low(pixd->data, pixd->w, pixd->h, pixd->wpl,
64 - pixd4->data, pixd4->w, pixd4->h, pixd4->wpl, 4);
65 -+#else
66 -+ pixd = pixExpandBinaryPower2(pixd4, 4);
67 -+#endif
68 -+ if (verbose) pixInfo(pixd, "mask image: ");
69 -
70 - pixDestroy(&pixd4);
71 - pixDestroy(&pixsf4);
72 ---
73 -2.0.3
74 -