gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-16 14:29:05 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/leptonica: Drop old 1.85.0

Browse Source 
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
2026-07-04 14:14:03 +01:00
parent 1fa2e32f68
commit c6aaaf4ca8
3 changed files with 0 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-libs/leptonica/Manifest
View File

@@ -1,2 +1 @@
DIST leptonica-1.85.0.tar.gz 14757419 BLAKE2B db26f30121f8fa7807068d3e55c1cc3ed2f8a7a6f8bb8cc46a240257d11842000b63a4b08542c87a90bc446ccb53a1fe36823661416ec120da8e9b199ddb8def SHA512 ad097f8238bb88f044511bedb6debfb8a1492a4636348b21ce103034d3878ae1097e7ca8de9c39ef01f34589526d7e8aee68fb1b83aae5ffc0026c04360b882c
DIST leptonica-1.87.0.tar.gz 14802808 BLAKE2B ac9f698d7160a2821e57d20ea401a47458d5693d9613e1c26311cec43974c58c47d4e4322e538bc276af262736e6fc84702a0d88bea41e23ed6a459e1d74be47 SHA512 b689b1cfe4d5b884e7ede9d949149410117bbfbb85a1790c0516919f27e8746783c8a04cac9300c761d2736184fb4b2337ab6c3a2653fa9f69f82ba19b493a2d

167
media-libs/leptonica/files/leptonica-1.85.0-concurrent-tests.patch
View File

@@ -1,167 +0,0 @@
From 0e0e453248f07a1ecec77f06a84521141919a048 Mon Sep 17 00:00:00 2001
From: danblooomberg <dan.bloomberg@gmail.com>
Date: Sun, 16 Mar 2025 12:30:21 -0700
Subject: [PATCH] Fix Issue #768: Replace calls to ioFormatTest() in pngio_reg
* James Le Cuirot found a problem when ioformats_reg and pngio_reg
run in parallel because they both call ioFormatTest() and can
overwrite each other's output.
* Add a file-writing function in pngio_reg to do this properly, so
only ioformats_reg calls ioFormatTest().
---
prog/pngio_reg.c | 114 +++++++++++++++++++++++++++++++----------------
1 file changed, 75 insertions(+), 39 deletions(-)
diff --git a/prog/pngio_reg.c b/prog/pngio_reg.c
index ccc359666..583274b89 100644
--- a/prog/pngio_reg.c
+++ b/prog/pngio_reg.c
@@ -68,6 +68,7 @@
#define FILE_TRANS_CMAP_4BPP "trans-4bpp-cmap.png"
#define FILE_TRANS_CMAP_8BPP "trans-8bpp-cmap.png"
+static l_int32 test_file_png(const char *fname, const char *dirout);
static l_int32 test_mem_png(const char *fname);
static l_int32 get_header_data(const char *filename);
static l_int32 test_1bpp_trans(L_REGPARAMS *rp);
@@ -85,6 +86,7 @@ LEPT_DLL extern const char *ImageFileFormatExtensions[];
int main(int argc,
char **argv)
{
+const char dirout[] = "/tmp/lept/pngio/";
l_int32 success, failure;
L_REGPARAMS *rp;
@@ -95,51 +97,52 @@ L_REGPARAMS *rp;
if (regTestSetup(argc, argv, &rp))
return 1;
-
- /* --------- Part 1: Test lossless r/w to file ---------*/
-
failure = FALSE;
+
+ /* ------------ Part 1: Test lossless r/w to file ------------ */
success = TRUE;
+ lept_rmdir("lept/pngio"); /* remove previous output files */
+ lept_mkdir("lept/pngio");
lept_stderr("Test bmp 1 bpp file:\n");
- if (ioFormatTest(FILE_1BPP)) success = FALSE;
- lept_stderr("\nTest 2 bpp file:\n");
- if (ioFormatTest(FILE_2BPP)) success = FALSE;
- lept_stderr("\nTest 2 bpp file with cmap:\n");
- if (ioFormatTest(FILE_2BPP_C)) success = FALSE;
- lept_stderr("\nTest 4 bpp file:\n");
- if (ioFormatTest(FILE_4BPP)) success = FALSE;
- lept_stderr("\nTest 4 bpp file with cmap:\n");
- if (ioFormatTest(FILE_4BPP_C)) success = FALSE;
- lept_stderr("\nTest 8 bpp grayscale file with cmap:\n");
- if (ioFormatTest(FILE_8BPP)) success = FALSE;
- lept_stderr("\nTest 8 bpp color file with cmap:\n");
- if (ioFormatTest(FILE_8BPP_C)) success = FALSE;
- lept_stderr("\nTest 16 bpp file:\n");
- if (ioFormatTest(FILE_16BPP)) success = FALSE;
- lept_stderr("\nTest 32 bpp RGB file:\n");
- if (ioFormatTest(FILE_32BPP)) success = FALSE;
- lept_stderr("\nTest 32 bpp RGBA file:\n");
- if (ioFormatTest(FILE_32BPP_ALPHA)) success = FALSE;
- lept_stderr("\nTest spp = 1, cmap with alpha file:\n");
- if (ioFormatTest(FILE_CMAP_ALPHA)) success = FALSE;
- lept_stderr("\nTest spp = 1, cmap with alpha (small alpha array):\n");
- if (ioFormatTest(FILE_CMAP_ALPHA2)) success = FALSE;
- lept_stderr("\nTest spp = 1, fully transparent with alpha file:\n");
- if (ioFormatTest(FILE_TRANS_ALPHA)) success = FALSE;
- lept_stderr("\nTest spp = 2, gray with alpha file:\n");
- if (ioFormatTest(FILE_GRAY_ALPHA)) success = FALSE;
- lept_stderr("\nTest spp = 2, cmap with alpha file:\n");
- if (ioFormatTest(FILE_TRANS_CMAP_2BPP)) success = FALSE;
- lept_stderr("\nTest spp = 4, cmap with alpha file:\n");
- if (ioFormatTest(FILE_TRANS_CMAP_4BPP)) success = FALSE;
- lept_stderr("\nTest spp = 8, cmap with alpha file:\n");
- if (ioFormatTest(FILE_TRANS_CMAP_8BPP)) success = FALSE;
+ if (test_file_png(FILE_1BPP, dirout)) success = FALSE;
+ lept_stderr("Test 2 bpp file:\n");
+ if (test_file_png(FILE_2BPP, dirout)) success = FALSE;
+ lept_stderr("Test 2 bpp file with cmap:\n");
+ if (test_file_png(FILE_2BPP_C, dirout)) success = FALSE;
+ lept_stderr("Test 4 bpp file:\n");
+ if (test_file_png(FILE_4BPP, dirout)) success = FALSE;
+ lept_stderr("Test 4 bpp file with cmap:\n");
+ if (test_file_png(FILE_4BPP_C, dirout)) success = FALSE;
+ lept_stderr("Test 8 bpp grayscale file with cmap:\n");
+ if (test_file_png(FILE_8BPP, dirout)) success = FALSE;
+ lept_stderr("Test 8 bpp color file with cmap:\n");
+ if (test_file_png(FILE_8BPP_C, dirout)) success = FALSE;
+ lept_stderr("Test 16 bpp file:\n");
+ if (test_file_png(FILE_16BPP, dirout)) success = FALSE;
+ lept_stderr("Test 32 bpp RGB file:\n");
+ if (test_file_png(FILE_32BPP, dirout)) success = FALSE;
+ lept_stderr("Test 32 bpp RGBA file:\n");
+ if (test_file_png(FILE_32BPP_ALPHA, dirout)) success = FALSE;
+ lept_stderr("Test spp = 1, cmap with alpha file:\n");
+ if (test_file_png(FILE_CMAP_ALPHA, dirout)) success = FALSE;
+ lept_stderr("Test spp = 1, cmap with alpha (small alpha array):\n");
+ if (test_file_png(FILE_CMAP_ALPHA2, dirout)) success = FALSE;
+ lept_stderr("Test spp = 1, fully transparent with alpha file:\n");
+ if (test_file_png(FILE_TRANS_ALPHA, dirout)) success = FALSE;
+ lept_stderr("Test spp = 2, gray with alpha file:\n");
+ if (test_file_png(FILE_GRAY_ALPHA, dirout)) success = FALSE;
+ lept_stderr("Test spp = 2, cmap with alpha file:\n");
+ if (test_file_png(FILE_TRANS_CMAP_2BPP, dirout)) success = FALSE;
+ lept_stderr("Test spp = 4, cmap with alpha file:\n");
+ if (test_file_png(FILE_TRANS_CMAP_4BPP, dirout)) success = FALSE;
+ lept_stderr("Test spp = 8, cmap with alpha file:\n");
+ if (test_file_png(FILE_TRANS_CMAP_8BPP, dirout)) success = FALSE;
if (success) {
lept_stderr(
- "\n ********** Success on lossless r/w to file *********\n\n");
+ "\n ****** Success on lossless r/w to file *****\n");
} else {
lept_stderr(
- "\n ******* Failure on at least one r/w to file ******\n\n");
+ "\n ******* Failure on at least one r/w to file ******\n");
}
if (!success) failure = TRUE;
@@ -230,7 +233,40 @@ L_REGPARAMS *rp;
}
- /* Returns 1 on error */
+ /* File r/w test. Returns 1 on error */
+static l_int32
+test_file_png(const char *fname,
+ const char *dirout)
+{
+char fileout[128];
+l_int32 same;
+PIX *pixs;
+PIX *pixd = NULL;
+
+ if ((pixs = pixRead(fname)) == NULL) {
+ lept_stderr("Failure to read %s\n", fname);
+ return 1;
+ }
+ stringCopy(fileout, dirout, 20);
+ stringCat(fileout, 128, fname);
+ if (pixWrite(fileout, pixs, IFF_PNG)) {
+ lept_stderr("Write fail for png\n");
+ return 1;
+ }
+ if ((pixd = pixRead(fileout)) == NULL) {
+ lept_stderr("Read fail for png\n");
+ return 1;
+ }
+
+ pixEqual(pixs, pixd, &same);
+ if (!same)
+ lept_stderr("Write/read fail for file %s\n", fname);
+ pixDestroy(&pixs);
+ pixDestroy(&pixd);
+ return (!same);
+}
+
+ /* Memory r/w test. Returns 1 on error */
static l_int32
test_mem_png(const char *fname)
{

84
media-libs/leptonica/leptonica-1.85.0.ebuild
View File

@@ -1,84 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit libtool multilib-minimal
DESCRIPTION="C library for image processing and analysis"
HOMEPAGE="http://www.leptonica.org/"
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/6"
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
# N.B. Tests need some features enabled:
REQUIRED_USE="
tiff? ( jpeg )
test? ( jpeg png tiff zlib )
"
RESTRICT="!test? ( test )"
RDEPEND="
gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
png? (
media-libs/libpng:0=[${MULTILIB_USEDEP}]
virtual/zlib:=[${MULTILIB_USEDEP}]
)
tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
zlib? ( virtual/zlib:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
test? ( media-libs/tiff[jpeg,zlib] )"
DOCS=( README version-notes )
PATCHES=(
"${FILESDIR}"/${P}-concurrent-tests.patch
)
src_prepare() {
default
elibtoolize
# unhtmlize docs
local X
for X in ${DOCS[@]}; do
awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
"${X}.html" > "${X}" || die 'awk failed'
rm -f -- "${X}.html"
done
}
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
--enable-shared \
$(use_with gif giflib) \
$(use_with jpeg) \
$(use_with jpeg2k libopenjpeg) \
$(use_with png libpng) \
$(use_with tiff libtiff) \
$(use_with webp libwebp) \
$(use_with webp libwebpmux) \
$(use_with zlib) \
$(use_enable static-libs static) \
$(multilib_native_use_enable utils programs)
}
multilib_src_test() {
default
# ${TMPDIR} is not respected. It used to be but it lead to issues
# and there have been long debates with upstream about it. :(
rm -rf /tmp/lept/ || die
}
multilib_src_install_all() {
einstalldocs
# libtool archives covered by pkg-config
find "${ED}" -name '*.la' -delete || die
}