Attachment #230746 for bug #260079




# Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com>

PORTNAME=	leptonica
DISTVERSION=	1.82.0
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	https://github.com/DanBloomberg/${PORTNAME}/releases/download/${DISTVERSION}/ \
		http://www.${PORTNAME}.org/source/

PATCH_SITES=	https://github.com/DanBloomberg/leptonica/commit/
PATCHFILES=	b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch:-p1

MAINTAINER=	hiroto.kagotani@gmail.com
COMMENT=	C library for efficient image processing and image analysis operations

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/leptonica-license.txt

USES=		cmake cpe localbase pkgconfig
USE_LDCONFIG=	yes

CONFLICTS=	leptonlib

CMAKE_ON=	BUILD_SHARED_LIBS
GH_ACCOUNT=	DanBloomberg

OPTIONS_DEFINE=		BIN GIF JPEG JPEG2000 PNG TIFF WEBP
OPTIONS_DEFAULT=	BIN GIF JPEG PNG TIFF WEBP
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=		BIN GIF JPEG JPEG2000 PNG TIFF WEBP ZLIB
OPTIONS_DEFAULT=	BIN GIF JPEG PNG TIFF WEBP ZLIB
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
JPEG_USES=		jpeg
JPEG_CONFIGURE_WITH=	jpeg
JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
JPEG2000_CMAKE_BOOL=	OPENJPEG_SUPPORT
JPEG_USES=		jpeg
JPEG_CMAKE_OFF=		CMAKE_DISABLE_FIND_PACKAGE_JPEG:BOOL=True
PNG_LIB_DEPENDS=	libpng.so:graphics/png
PNG_CMAKE_OFF=		CMAKE_DISABLE_FIND_PACKAGE_PNG:BOOL=True
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
TIFF_CMAKE_OFF=		CMAKE_DISABLE_FIND_PACKAGE_TIFF
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
WEBP_CMAKE_BOOL=	LIBWEBP_SUPPORT

post-install:
	${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.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
	${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules
	${INSTALL_DATA} ${WRKSRC}/cmake/FindLeptonica.cmake \
		${STAGEDIR}${PREFIX}/share/cmake/Modules/

do-test:
.for c in ${TESTS}
	@cd ${WRKSRC}/prog; ${SETENV} \
	LD_LIBRARY_PATH="${WRKSRC}/src/.libs:${LOCALBASE}/lib" \
	${WRKSRC}/prog/alltests_reg ${c}
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/leptonica/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1526412216	1	TIMESTAMP = 1641427253
2	SHA256 (DanBloomberg-leptonica-1.76.0_GH0.tar.gz) = ff98ffef6103cda0e400676f81113a8157569ac0f453c6e03a1a27b305ba25a7	2	SHA256 (leptonica-1.82.0.tar.gz) = 155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6
3	SIZE (DanBloomberg-leptonica-1.76.0_GH0.tar.gz) = 11557709	3	SIZE (leptonica-1.82.0.tar.gz) = 14041481
		4	SHA256 (b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch) = 5a9b7afa4adf0d72338c38ff802f4b312bcee3f06bde697177b905d3c7a60a38
		5	SIZE (b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch) = 13952




--- cmake/FindLeptonica.cmake.orig	2021-11-28 11:06:50 UTC
+++ cmake/FindLeptonica.cmake
@@ -0,0 +1,52 @@
+#
+# Find Leptonica
+#
+# Exported variables:
+#    Leptonica_FOUND
+#    Leptonica_INCLUDE_DIRS
+#    Leptonica_LIBRARIES
+#
+#    Leptonica_VERSION
+#    Leptonica_MAJOR_VERSION
+#    Leptonica_MINOR_VERSION
+#
+
+find_path(Leptonica_INCLUDE_DIR leptonica/allheaders.h
+    HINTS
+    /usr/include
+    /usr/local/include
+    /opt/include
+    /opt/local/include
+    ${Leptonica_DIR}/include
+)
+if(NOT "${Leptonica_INCLUDE_DIR}" EQUAL "Leptonica_INCLUDE_DIR-NOTFOUND")
+    set(Leptonica_INCLUDE_DIRS ${Leptonica_INCLUDE_DIR}/leptonica)
+    file(STRINGS ${Leptonica_INCLUDE_DIRS}/allheaders.h Leptonica_MAJOR_VERSION REGEX "LIBLEPT_MAJOR_VERSION")
+    file(STRINGS ${Leptonica_INCLUDE_DIRS}/allheaders.h Leptonica_MINOR_VERSION REGEX "LIBLEPT_MINOR_VERSION")
+    string(REGEX MATCH "[0-9]+" Leptonica_MAJOR_VERSION ${Leptonica_MAJOR_VERSION})
+    string(REGEX MATCH "[0-9]+" Leptonica_MINOR_VERSION ${Leptonica_MINOR_VERSION})
+    set(Leptonica_VERSION ${Leptonica_MAJOR_VERSION}.${Leptonica_MINOR_VERSION})
+endif()
+
+find_library(Leptonica_LIBRARY NAMES lept liblept
+    HINTS
+    /usr/lib
+    /usr/local/lib
+    /opt/lib
+    /opt/local/lib
+    ${Leptonica_DIR}/lib
+)
+set(Leptonica_LIBRARIES ${Leptonica_LIBRARY})
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(Leptonica
+    REQUIRED_VARS
+        Leptonica_INCLUDE_DIRS
+        Leptonica_LIBRARIES
+    VERSION_VAR Leptonica_VERSION
+    FAIL_MESSAGE "Try to set Leptonica_DIR or Leptonica_ROOT"
+)
+
+mark_as_advanced(Leptonica_INCLUDE_DIRS Leptonica_LIBRARIES)
+

Removed Link Here

(-)a/graphics/leptonica/files/patch-src-Makefile.am (-9 lines)
1	--- src/Makefile.am.orig 2018-05-02 22:12:19 UTC
2	+++ src/Makefile.am
3	@@ -1,5 +1,5 @@
4	AM_CFLAGS = $(DEBUG_FLAGS)
5	-AM_CPPFLAGS = $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) $(LIBJP2K_CFLAGS)
6	+AM_CPPFLAGS = $(LIBJP2K_CFLAGS) $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS)
7
8	lib_LTLIBRARIES = liblept.la
9	liblept_la_LIBADD = $(LIBM) $(ZLIB_LIBS) $(LIBPNG_LIBS) $(JPEG_LIBS) $(GIFLIB_LIBS) $(LIBTIFF_LIBS) $(LIBWEBP_LIBS) $(LIBJP2K_LIBS) $(GDI_LIBS)




%%BIN%%bin/converttopdf
%%BIN%%bin/converttops
%%BIN%%bin/fileinfo
%%BIN%%bin/imagetops
%%BIN%%bin/xtractprotos
include/leptonica/allheaders.h
include/leptonica/alltypes.h

include/leptonica/bmfdata.h
include/leptonica/bmp.h
include/leptonica/ccbord.h
include/leptonica/colorfill.h
include/leptonica/dewarp.h
include/leptonica/endianness.h
include/leptonica/environ.h
include/leptonica/gplot.h
include/leptonica/hashmap.h
include/leptonica/heap.h
include/leptonica/imageio.h
include/leptonica/jbclass.h

include/leptonica/stringcode.h
include/leptonica/sudoku.h
include/leptonica/watershed.h
lib/cmake/leptonica/LeptonicaConfig-version.cmake
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/libleptonica.so
lib/libleptonica.so.5
lib/libleptonica.so.5.4.0
libdata/pkgconfig/lept.pc
share/cmake/Modules/FindLeptonica.cmake

Return to bug 260079

Lines 1-9 Link Here

(-)b/graphics/leptonica/Makefile (-38 / +32 lines)
1	# Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com>	1	# Created by: Hiroto Kagotani <hiroto.kagotani@gmail.com>
2		2
3	PORTNAME= leptonica	3	PORTNAME= leptonica
4	PORTVERSION= 1.76.0	4	DISTVERSION= 1.82.0
5	PORTREVISION= 1
6	CATEGORIES= graphics	5	CATEGORIES= graphics
		6	MASTER_SITES= https://github.com/DanBloomberg/${PORTNAME}/releases/download/${DISTVERSION}/ \
		7	http://www.${PORTNAME}.org/source/
		8
		9	PATCH_SITES= https://github.com/DanBloomberg/leptonica/commit/
		10	PATCHFILES= b282ed9482e335439ccc429d4cd1dba517ba0c4d.patch:-p1
7		11
8	MAINTAINER= hiroto.kagotani@gmail.com	12	MAINTAINER= hiroto.kagotani@gmail.com
9	COMMENT= C library for efficient image processing and image analysis operations	13	COMMENT= C library for efficient image processing and image analysis operations
Lines 11-62 COMMENT= C library for efficient image processing and image analysis operations Link Here
11	LICENSE= BSD2CLAUSE	15	LICENSE= BSD2CLAUSE
12	LICENSE_FILE= ${WRKSRC}/leptonica-license.txt	16	LICENSE_FILE= ${WRKSRC}/leptonica-license.txt
13		17
14	CONFLICTS= leptonlib	18	USES= cmake cpe localbase pkgconfig
		19	USE_LDCONFIG= yes
15		20
16	USES= autoreconf cpe libtool localbase:ldflags pathfix pkgconfig	21	CONFLICTS= leptonlib
17		22
18	USE_GITHUB= yes	23	CMAKE_ON= BUILD_SHARED_LIBS
19	GH_ACCOUNT= DanBloomberg
20		24
21	GNU_CONFIGURE= yes	25	OPTIONS_DEFINE= BIN GIF JPEG JPEG2000 PNG TIFF WEBP
22	USE_LDCONFIG= yes	26	OPTIONS_DEFAULT= BIN GIF JPEG PNG TIFF WEBP
23	INSTALL_TARGET= install-strip
24
25	OPTIONS_DEFINE= BIN GIF JPEG JPEG2000 PNG TIFF WEBP ZLIB
26	OPTIONS_DEFAULT= BIN GIF JPEG PNG TIFF WEBP ZLIB
27	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
28		28
29	BIN_DESC= Build additional programs	29	BIN_DESC= Build additional programs
30	BIN_CONFIGURE_ENABLE= programs	30
		31	BIN_CMAKE_BOOL= BUILD_PROG
31	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	32	GIF_LIB_DEPENDS= libgif.so:graphics/giflib
32	GIF_CONFIGURE_WITH= giflib	33	GIF_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_GIF:BOOL=True
33	JPEG_USES= jpeg
34	JPEG_CONFIGURE_WITH= jpeg
35	JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg	34	JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
36	JPEG2000_CONFIGURE_WITH=libopenjpeg	35	JPEG2000_CMAKE_BOOL= OPENJPEG_SUPPORT
		36	JPEG_USES= jpeg
		37	JPEG_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG:BOOL=True
37	PNG_LIB_DEPENDS= libpng.so:graphics/png	38	PNG_LIB_DEPENDS= libpng.so:graphics/png
38	PNG_CONFIGURE_WITH= libpng	39	PNG_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG:BOOL=True
39	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff	40	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
40	TIFF_CONFIGURE_WITH= libtiff	41	TIFF_CMAKE_OFF= CMAKE_DISABLE_FIND_PACKAGE_TIFF
41	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp	42	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
42	WEBP_CONFIGURE_WITH= libwebp	43	WEBP_CMAKE_BOOL= LIBWEBP_SUPPORT
43	ZLIB_CONFIGURE_WITH= zlib	44
44		45	post-install:
45	TESTS?= generate compare	46	${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.0 \
46	.if defined(MAINTAINER_MODE) \|\| defined(PACKAGE_BUILDING)	47	${STAGEDIR}${PREFIX}/lib/liblept.so
47	BUILD_DEPENDS+= ${LOCALBASE}/bin/gnuplot:math/gnuplot	48	${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.0 \
48	.endif	49	${STAGEDIR}${PREFIX}/lib/liblept.so.5
49	#the display portion of the regression tests is interactive,	50	${RLN} ${STAGEDIR}${PREFIX}/lib/libleptonica.so.5.4.0 \
50	#and requires the use of xv, xli or xzgv as an image viewer	51	${STAGEDIR}${PREFIX}/lib/liblept.so.5.4.0
51	.if defined(MAINTAINER_MODE) && !defined(BATCH)	52	${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules
52	TESTS+= display	53	${INSTALL_DATA} ${WRKSRC}/cmake/FindLeptonica.cmake \
53	.endif	54	${STAGEDIR}${PREFIX}/share/cmake/Modules/
54
55	do-test:
56	.for c in ${TESTS}
57	@cd ${WRKSRC}/prog; ${SETENV} \
58	LD_LIBRARY_PATH="${WRKSRC}/src/.libs:${LOCALBASE}/lib" \
59	${WRKSRC}/prog/alltests_reg ${c}
60	.endfor
61		55
62	.include <bsd.port.mk>	56	.include <bsd.port.mk>

Added Link Here

(-)b/graphics/leptonica/files/patch-cmake-findlib (+55 lines)
1	--- cmake/FindLeptonica.cmake.orig 2021-11-28 11:06:50 UTC
2	+++ cmake/FindLeptonica.cmake
3	@@ -0,0 +1,52 @@
4	+#
5	+# Find Leptonica
6	+#
7	+# Exported variables:
8	+# Leptonica_FOUND
9	+# Leptonica_INCLUDE_DIRS
10	+# Leptonica_LIBRARIES
11	+#
12	+# Leptonica_VERSION
13	+# Leptonica_MAJOR_VERSION
14	+# Leptonica_MINOR_VERSION
15	+#
16	+
17	+find_path(Leptonica_INCLUDE_DIR leptonica/allheaders.h
18	+ HINTS
19	+ /usr/include
20	+ /usr/local/include
21	+ /opt/include
22	+ /opt/local/include
23	+ ${Leptonica_DIR}/include
24	+)
25	+if(NOT "${Leptonica_INCLUDE_DIR}" EQUAL "Leptonica_INCLUDE_DIR-NOTFOUND")
26	+ set(Leptonica_INCLUDE_DIRS ${Leptonica_INCLUDE_DIR}/leptonica)
27	+ file(STRINGS ${Leptonica_INCLUDE_DIRS}/allheaders.h Leptonica_MAJOR_VERSION REGEX "LIBLEPT_MAJOR_VERSION")
28	+ file(STRINGS ${Leptonica_INCLUDE_DIRS}/allheaders.h Leptonica_MINOR_VERSION REGEX "LIBLEPT_MINOR_VERSION")
29	+ string(REGEX MATCH "[0-9]+" Leptonica_MAJOR_VERSION ${Leptonica_MAJOR_VERSION})
30	+ string(REGEX MATCH "[0-9]+" Leptonica_MINOR_VERSION ${Leptonica_MINOR_VERSION})
31	+ set(Leptonica_VERSION ${Leptonica_MAJOR_VERSION}.${Leptonica_MINOR_VERSION})
32	+endif()
33	+
34	+find_library(Leptonica_LIBRARY NAMES lept liblept
35	+ HINTS
36	+ /usr/lib
37	+ /usr/local/lib
38	+ /opt/lib
39	+ /opt/local/lib
40	+ ${Leptonica_DIR}/lib
41	+)
42	+set(Leptonica_LIBRARIES ${Leptonica_LIBRARY})
43	+
44	+include(FindPackageHandleStandardArgs)
45	+
46	+find_package_handle_standard_args(Leptonica
47	+ REQUIRED_VARS
48	+ Leptonica_INCLUDE_DIRS
49	+ Leptonica_LIBRARIES
50	+ VERSION_VAR Leptonica_VERSION
51	+ FAIL_MESSAGE "Try to set Leptonica_DIR or Leptonica_ROOT"
52	+)
53	+
54	+mark_as_advanced(Leptonica_INCLUDE_DIRS Leptonica_LIBRARIES)
55	+

Lines 6-11 Link Here

(-)b/graphics/leptonica/pkg-plist (-2 / +12 lines)
6	%%BIN%%bin/converttopdf	6	%%BIN%%bin/converttopdf
7	%%BIN%%bin/converttops	7	%%BIN%%bin/converttops
8	%%BIN%%bin/fileinfo	8	%%BIN%%bin/fileinfo
		9	%%BIN%%bin/imagetops
9	%%BIN%%bin/xtractprotos	10	%%BIN%%bin/xtractprotos
10	include/leptonica/allheaders.h	11	include/leptonica/allheaders.h
11	include/leptonica/alltypes.h	12	include/leptonica/alltypes.h
Lines 17-26 include/leptonica/bmf.h Link Here
17	include/leptonica/bmfdata.h	18	include/leptonica/bmfdata.h
18	include/leptonica/bmp.h	19	include/leptonica/bmp.h
19	include/leptonica/ccbord.h	20	include/leptonica/ccbord.h
		21	include/leptonica/colorfill.h
20	include/leptonica/dewarp.h	22	include/leptonica/dewarp.h
21	include/leptonica/endianness.h	23	include/leptonica/endianness.h
22	include/leptonica/environ.h	24	include/leptonica/environ.h
23	include/leptonica/gplot.h	25	include/leptonica/gplot.h
		26	include/leptonica/hashmap.h
24	include/leptonica/heap.h	27	include/leptonica/heap.h
25	include/leptonica/imageio.h	28	include/leptonica/imageio.h
26	include/leptonica/jbclass.h	29	include/leptonica/jbclass.h
Lines 38-45 include/leptonica/stack.h Link Here
38	include/leptonica/stringcode.h	41	include/leptonica/stringcode.h
39	include/leptonica/sudoku.h	42	include/leptonica/sudoku.h
40	include/leptonica/watershed.h	43	include/leptonica/watershed.h
41	lib/liblept.a	44	lib/cmake/leptonica/LeptonicaConfig-version.cmake
		45	lib/cmake/leptonica/LeptonicaConfig.cmake
		46	lib/cmake/leptonica/LeptonicaTargets-%%CMAKE_BUILD_TYPE%%.cmake
		47	lib/cmake/leptonica/LeptonicaTargets.cmake
42	lib/liblept.so	48	lib/liblept.so
43	lib/liblept.so.5	49	lib/liblept.so.5
44	lib/liblept.so.5.0.3	50	lib/liblept.so.5.4.0
		51	lib/libleptonica.so
		52	lib/libleptonica.so.5
		53	lib/libleptonica.so.5.4.0
45	libdata/pkgconfig/lept.pc	54	libdata/pkgconfig/lept.pc
		55	share/cmake/Modules/FindLeptonica.cmake