Date: Thu, 23 Oct 2025 18:45:34 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 68a691f050ea - main - graphics/leptonica: Update to 1.86.0 Message-ID: <202510231845.59NIjYgI078617@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=68a691f050ea8c134aa58f3c30a8835c885477f7 commit 68a691f050ea8c134aa58f3c30a8835c885477f7 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2025-10-22 20:29:59 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2025-10-23 18:44:46 +0000 graphics/leptonica: Update to 1.86.0 * Import upstream PR 778 Reference: https://github.com/DanBloomberg/leptonica/pull/778 No release logs, only commit history PR: 289715 Approved by: maintainer timeout, 1+ month --- graphics/leptonica/Makefile | 39 ++++++++++--------- graphics/leptonica/distinfo | 10 ++--- graphics/leptonica/files/patch-openjpeg-2.5 | 59 ----------------------------- graphics/leptonica/pkg-plist | 11 ++++-- 4 files changed, 34 insertions(+), 85 deletions(-) diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index faf9f7e14b84..c5195a5c62ee 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -1,12 +1,11 @@ PORTNAME= leptonica -DISTVERSION= 1.82.0 -PORTREVISION= 2 +DISTVERSION= 1.86.0 CATEGORIES= graphics -MASTER_SITES= https://github.com/DanBloomberg/${PORTNAME}/releases/download/${DISTVERSION}/ \ +MASTER_SITES= https://github.com/user-attachments/files/22412990/ \ http://www.${PORTNAME}.org/source/ -PATCH_SITES= https://github.com/DanBloomberg/leptonica/commit/ -PATCHFILES= b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch:-p1 +PATCH_SITES= https://github.com/DanBloomberg/leptonica/commit/ +PATCHFILES= e0936377f9094b72f7f2ea6bc34311ccc69b2f71.patch:-p1 MAINTAINER= hiroto.kagotani@gmail.com COMMENT= C library for efficient image processing and image analysis operations @@ -15,7 +14,7 @@ WWW= http://www.leptonica.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/leptonica-license.txt -USES= cmake cpe localbase pkgconfig +USES= cmake cpe localbase pathfix pkgconfig USE_LDCONFIG= yes CONFLICTS= leptonlib @@ -29,26 +28,32 @@ OPTIONS_SUB= yes BIN_DESC= Build additional programs BIN_CMAKE_BOOL= BUILD_PROG + GIF_LIB_DEPENDS= libgif.so:graphics/giflib -GIF_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_GIF:BOOL=True +GIF_CMAKE_BOOL= ENABLE_GIF + JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg -JPEG2000_CMAKE_BOOL= OPENJPEG_SUPPORT +JPEG2000_CMAKE_BOOL= ENABLE_OPENJPEG + JPEG_USES= jpeg -JPEG_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG:BOOL=True +JPEG_CMAKE_BOOL= ENABLE_JPEG + PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG:BOOL=True +PNG_CMAKE_BOOL= ENABLE_PNG + TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_TIFF +TIFF_CMAKE_BOOL= ENABLE_TIFF + WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_CMAKE_BOOL= LIBWEBP_SUPPORT +WEBP_CMAKE_BOOL= ENABLE_WEBP post-install: - ${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.0 \ + ${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.6.0.0 \ ${STAGEDIR}${PREFIX}/lib/liblept.so - ${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.0 \ - ${STAGEDIR}${PREFIX}/lib/liblept.so.5 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.0 \ - ${STAGEDIR}${PREFIX}/lib/liblept.so.5.4.0 + ${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.6.0.0 \ + ${STAGEDIR}${PREFIX}/lib/liblept.so.6 + ${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.6.0.0 \ + ${STAGEDIR}${PREFIX}/lib/liblept.so.6.0.0 ${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules ${INSTALL_DATA} ${WRKSRC}/cmake/FindLeptonica.cmake \ ${STAGEDIR}${PREFIX}/share/cmake/Modules/ diff --git a/graphics/leptonica/distinfo b/graphics/leptonica/distinfo index cd3da62ff805..9f9418b07b85 100644 --- a/graphics/leptonica/distinfo +++ b/graphics/leptonica/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1641427253 -SHA256 (leptonica-1.82.0.tar.gz) = 155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6 -SIZE (leptonica-1.82.0.tar.gz) = 14041481 -SHA256 (b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch) = 5a9b7afa4adf0d72338c38ff802f4b312bcee3f06bde697177b905d3c7a60a38 -SIZE (b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch) = 13952 +TIMESTAMP = 1758372665 +SHA256 (leptonica-1.86.0.tar.gz) = 1fa08e40bb37fd45802d5e6e7b43927449a5c47d4608ef99d3bd3f0fa76baedc +SIZE (leptonica-1.86.0.tar.gz) = 14802116 +SHA256 (e0936377f9094b72f7f2ea6bc34311ccc69b2f71.patch) = f411e8f7a7bb7d4996c7e1e7e0f7ca49aae189e1269efd17b466fe9c069e020d +SIZE (e0936377f9094b72f7f2ea6bc34311ccc69b2f71.patch) = 3323 diff --git a/graphics/leptonica/files/patch-openjpeg-2.5 b/graphics/leptonica/files/patch-openjpeg-2.5 deleted file mode 100644 index 4b4e95a9457e..000000000000 --- a/graphics/leptonica/files/patch-openjpeg-2.5 +++ /dev/null @@ -1,59 +0,0 @@ -diff -u CMakeLists.txt.orig CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -141,6 +141,17 @@ - set(HAVE_LIBJP2K 1) - endif() - endif() -+ if(NOT JP2K) -+ find_path(JP2K_INCLUDE_DIR /openjpeg-2.5/openjpeg.h) -+ find_library(JP2K_LIBRARY NAMES openjp2) -+ if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY) -+ set(JP2K 1) -+ set(JP2K_FOUND TRUE) -+ set(JP2K_LIBRARIES ${JP2K_LIBRARY}) -+ set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR}) -+ set(HAVE_LIBJP2K 1) -+ endif() -+ endif() - set(libs_private "${libs_private} -lopenjp2") - endif() - endif() -diff -u cmake/Configure.cmake.orig cmake/Configure.cmake ---- cmake/Configure.cmake.orig -+++ cmake/Configure.cmake -@@ -69,6 +69,7 @@ - openjpeg-2.2/openjpeg.h - openjpeg-2.3/openjpeg.h - openjpeg-2.4/openjpeg.h -+ openjpeg-2.5/openjpeg.h - ) - check_includes(include_files_list) - -@@ -146,7 +147,9 @@ - /* Define to 1 if you have zlib. */ - #cmakedefine HAVE_LIBZ 1 - --#if defined(HAVE_OPENJPEG_2_4_OPENJPEG_H) -+#if defined(HAVE_OPENJPEG_2_5_OPENJPEG_H) -+#define LIBJP2K_HEADER <openjpeg-2.5/openjpeg.h> -+#elif defined(HAVE_OPENJPEG_2_4_OPENJPEG_H) - #define LIBJP2K_HEADER <openjpeg-2.4/openjpeg.h> - #elif defined(HAVE_OPENJPEG_2_3_OPENJPEG_H) - #define LIBJP2K_HEADER <openjpeg-2.3/openjpeg.h> -diff -u config/config.h.in.orig config/config.h.in ---- config/config.h.in.orig -+++ config/config.h.in -@@ -51,6 +51,12 @@ - /* Define to 1 if you have the <openjpeg-2.3/openjpeg.h> header file. */ - #undef HAVE_OPENJPEG_2_3_OPENJPEG_H - -+/* Define to 1 if you have the <openjpeg-2.4/openjpeg.h> header file. */ -+#undef HAVE_OPENJPEG_2_4_OPENJPEG_H -+ -+/* Define to 1 if you have the <openjpeg-2.5/openjpeg.h> header file. */ -+#undef HAVE_OPENJPEG_2_5_OPENJPEG_H -+ - /* Define to 1 if you have the <stdint.h> header file. */ - #undef HAVE_STDINT_H - diff --git a/graphics/leptonica/pkg-plist b/graphics/leptonica/pkg-plist index b4f431a774dc..558d7268cea7 100644 --- a/graphics/leptonica/pkg-plist +++ b/graphics/leptonica/pkg-plist @@ -11,6 +11,7 @@ include/leptonica/allheaders.h include/leptonica/alltypes.h include/leptonica/array.h +include/leptonica/array_internal.h include/leptonica/arrayaccess.h include/leptonica/bbuffer.h include/leptonica/bilateral.h @@ -18,6 +19,7 @@ include/leptonica/bmf.h include/leptonica/bmfdata.h include/leptonica/bmp.h include/leptonica/ccbord.h +include/leptonica/ccbord_internal.h include/leptonica/colorfill.h include/leptonica/dewarp.h include/leptonica/endianness.h @@ -31,6 +33,7 @@ include/leptonica/leptwin.h include/leptonica/list.h include/leptonica/morph.h include/leptonica/pix.h +include/leptonica/pix_internal.h include/leptonica/ptra.h include/leptonica/queue.h include/leptonica/rbtree.h @@ -46,10 +49,10 @@ lib/cmake/leptonica/LeptonicaConfig.cmake lib/cmake/leptonica/LeptonicaTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/leptonica/LeptonicaTargets.cmake lib/liblept.so -lib/liblept.so.5 -lib/liblept.so.5.4.0 +lib/liblept.so.6 +lib/liblept.so.6.0.0 lib/libleptonica.so -lib/libleptonica.so.5 -lib/libleptonica.so.5.4.0 +lib/libleptonica.so.6 +lib/libleptonica.so.6.0.0 libdata/pkgconfig/lept.pc share/cmake/Modules/FindLeptonica.cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510231845.59NIjYgI078617>