Attachment #229806 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/

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
USES=		autoreconf cpe libtool localbase:ldflags pathfix pkgconfig

CONFLICTS=	leptonlib
GH_ACCOUNT=	DanBloomberg

CMAKE_ON=	BUILD_SHARED_LIBS
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=		BIN GIF JPEG JPEG2000 PNG TIFF WEBP
OPTIONS_DEFAULT=	BIN GIF JPEG PNG TIFF WEBP
OPTIONS_SUB=		yes

CMAKE_ON=		BUILD_SHARED_LIBS

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
ZLIB_CONFIGURE_WITH=	zlib

#TESTS?=	generate compare
#.if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
#BUILD_DEPENDS+=	${LOCALBASE}/bin/gnuplot:math/gnuplot
#.endif
#the display portion of the regression tests is interactive,
##and requires the use of xv, xli or xzgv as an image viewer
#.if defined(MAINTAINER_MODE) && !defined(BATCH)
#TESTS+=	display
#.endif

#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 / +3 lines)
1	TIMESTAMP = 1526412216	1	TIMESTAMP = 1638185950
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




--- CMakeLists.txt.orig	2021-08-30 19:31:54 UTC
+++ CMakeLists.txt
@@ -55,6 +55,8 @@ else()
 endif()
 if(UNIX)
     option(SYM_LINK "Create symlink leptonica -> lept on UNIX" OFF)
+    option(LIBWEBP_SUPPORT "Build with WebP support" OFF)
+    option(OPENJPEG_SUPPORT "Build with OpenJPEG support" OFF)
 endif()
 
 set(leptonica_INSTALL_CMAKE_DIR "lib/cmake/leptonica"
@@ -68,59 +70,63 @@ if(NOT SW_BUILD)
     find_package(ZLIB)
     find_package(PkgConfig)
     if (PKG_CONFIG_FOUND)
-        pkg_check_modules(WEBP libwebp QUIET)
-        pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET)
-        pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
-    endif()
-    if(NOT WEBP)
-        find_path(WEBP_INCLUDE_DIR /webp/decode.h)
-        find_library(WEBP_LIBRARY NAMES webp)
-        if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
-            set(WEBP 1)
-            set(WEBP_FOUND TRUE)
-            set(WEBP_LIBRARIES ${WEBP_LIBRARY})
-            set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
+        if(LIBWEBP_SUPPORT)
+            pkg_check_modules(WEBP libwebp QUIET)
+            pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET)
+            if(NOT WEBP)    
+                find_path(WEBP_INCLUDE_DIR /webp/decode.h)
+                find_library(WEBP_LIBRARY NAMES webp)
+                if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
+                    set(WEBP 1)
+                    set(WEBP_FOUND TRUE)
+                    set(WEBP_LIBRARIES ${WEBP_LIBRARY})
+                    set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
+                endif()
+            endif()
+            if(NOT WEBPMUX)
+                find_path(WEBPMUX_INCLUDE_DIR /webp/mux.h)
+                #TODO:  check minimal required version
+                if(NOT WEBPMUX_INCLUDE_DIR)
+                    message(STATUS "Can not find: /webp/mux.h")
+                endif()
+                if(NOT "${WEBPMUX_INCLUDE_DIR}" STREQUAL "${WEBP_INCLUDE_DIR}")
+                    set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIRS} ${WEBPMUX_INCLUDE_DIR})
+                endif()
+                find_library(WEBPMUX_LIBRARY NAMES webpmux)
+                if (WEBPMUX_INCLUDE_DIR AND WEBPMUX_LIBRARY)
+                    set(WEBPMUX 1)
+                    set(HAVE_LIBWEBP_ANIM 1)
+                    set(WEBPMUX_FOUND TRUE)
+                    set(WEBP_LIBRARIES ${WEBP_LIBRARIES} ${WEBPMUX_LIBRARY})
+                endif()
+            endif()
         endif()
-    endif()
-    if(NOT WEBPMUX)
-        find_path(WEBPMUX_INCLUDE_DIR /webp/mux.h)
-        #TODO:  check minimal required version
-        if(NOT WEBPMUX_INCLUDE_DIR)
-            message(STATUS "Can not find: /webp/mux.h")
+        if(OPENJPEG_SUPPORT)
+            pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
+            if(NOT JP2K)
+                find_path(JP2K_INCLUDE_DIR /openjpeg-2.3/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()
+            if(NOT JP2K)
+                find_path(JP2K_INCLUDE_DIR /openjpeg-2.4/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()
         endif()
-        if(NOT "${WEBPMUX_INCLUDE_DIR}" STREQUAL "${WEBP_INCLUDE_DIR}")
-            set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIRS} ${WEBPMUX_INCLUDE_DIR})
-        endif()
-        find_library(WEBPMUX_LIBRARY NAMES webpmux)
-        if (WEBPMUX_INCLUDE_DIR AND WEBPMUX_LIBRARY)
-            set(WEBPMUX 1)
-            set(HAVE_LIBWEBP_ANIM 1)
-            set(WEBPMUX_FOUND TRUE)
-            set(WEBP_LIBRARIES ${WEBP_LIBRARIES} ${WEBPMUX_LIBRARY})
-        endif()
     endif()
-    if(NOT JP2K)
-        find_path(JP2K_INCLUDE_DIR /openjpeg-2.3/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()
-    if(NOT JP2K)
-        find_path(JP2K_INCLUDE_DIR /openjpeg-2.4/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()
 else() # SW_BUILD=ON
     find_package(SW REQUIRED)
     sw_add_package(
@@ -264,7 +270,7 @@ endif()
 add_subdirectory(src)
 
 get_target_property(leptonica_NAME leptonica NAME)
-get_target_property(leptonica_VERSION leptonica VERSION)
+set(leptonica_VERSION ${VERSION_PLAIN})
 get_target_property(leptonica_OUTPUT_NAME leptonica OUTPUT_NAME)
 
 configure_file(lept.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lept.pc @ONLY)

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)




--- src/CMakeLists.txt.orig	2021-11-29 23:37:03 UTC
+++ src/CMakeLists.txt
@@ -14,10 +14,10 @@ if (MSVC)
     set_source_files_properties(${src} PROPERTIES LANGUAGE CXX)
 endif()
 
-string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+#string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 
 add_library                     (leptonica ${src} ${hdr})
-set_target_properties           (leptonica PROPERTIES VERSION   ${VERSION_PLAIN})
+#set_target_properties           (leptonica PROPERTIES VERSION   ${VERSION_PLAIN})
 set_target_properties           (leptonica PROPERTIES SOVERSION 5.4.0)
 if (WIN32)
 set_target_properties           (leptonica PROPERTIES OUTPUT_NAME       leptonica-${VERSION_PLAIN})

Lines 17-26 include/leptonica/bmf.h Link Here

(-)b/graphics/leptonica/pkg-plist (-4 / +8 lines)
17	include/leptonica/bmfdata.h	17	include/leptonica/bmfdata.h
18	include/leptonica/bmp.h	18	include/leptonica/bmp.h
19	include/leptonica/ccbord.h	19	include/leptonica/ccbord.h
		20	include/leptonica/colorfill.h
20	include/leptonica/dewarp.h	21	include/leptonica/dewarp.h
21	include/leptonica/endianness.h	22	include/leptonica/endianness.h
22	include/leptonica/environ.h	23	include/leptonica/environ.h
23	include/leptonica/gplot.h	24	include/leptonica/gplot.h
		25	include/leptonica/hashmap.h
24	include/leptonica/heap.h	26	include/leptonica/heap.h
25	include/leptonica/imageio.h	27	include/leptonica/imageio.h
26	include/leptonica/jbclass.h	28	include/leptonica/jbclass.h
Lines 38-45 include/leptonica/stack.h Link Here
38	include/leptonica/stringcode.h	40	include/leptonica/stringcode.h
39	include/leptonica/sudoku.h	41	include/leptonica/sudoku.h
40	include/leptonica/watershed.h	42	include/leptonica/watershed.h
41	lib/liblept.a	43	lib/cmake/leptonica/LeptonicaConfig-version.cmake
42	lib/liblept.so	44	lib/cmake/leptonica/LeptonicaConfig.cmake
43	lib/liblept.so.5	45	lib/cmake/leptonica/LeptonicaTargets-%%CMAKE_BUILD_TYPE%%.cmake
44	lib/liblept.so.5.0.3	46	lib/cmake/leptonica/LeptonicaTargets.cmake
		47	lib/libleptonica.so
		48	lib/libleptonica.so.5.4.0
45	libdata/pkgconfig/lept.pc	49	libdata/pkgconfig/lept.pc

Return to bug 260079

Lines 1-9 Link Here

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

Added Link Here

(-)b/graphics/leptonica/files/patch-CMakeLists.txt (+134 lines)
1	--- CMakeLists.txt.orig 2021-08-30 19:31:54 UTC
2	+++ CMakeLists.txt
3	@@ -55,6 +55,8 @@ else()
4	endif()
5	if(UNIX)
6	option(SYM_LINK "Create symlink leptonica -> lept on UNIX" OFF)
7	+ option(LIBWEBP_SUPPORT "Build with WebP support" OFF)
8	+ option(OPENJPEG_SUPPORT "Build with OpenJPEG support" OFF)
9	endif()
10
11	set(leptonica_INSTALL_CMAKE_DIR "lib/cmake/leptonica"
12	@@ -68,59 +70,63 @@ if(NOT SW_BUILD)
13	find_package(ZLIB)
14	find_package(PkgConfig)
15	if (PKG_CONFIG_FOUND)
16	- pkg_check_modules(WEBP libwebp QUIET)
17	- pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET)
18	- pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
19	- endif()
20	- if(NOT WEBP)
21	- find_path(WEBP_INCLUDE_DIR /webp/decode.h)
22	- find_library(WEBP_LIBRARY NAMES webp)
23	- if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
24	- set(WEBP 1)
25	- set(WEBP_FOUND TRUE)
26	- set(WEBP_LIBRARIES ${WEBP_LIBRARY})
27	- set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
28	+ if(LIBWEBP_SUPPORT)
29	+ pkg_check_modules(WEBP libwebp QUIET)
30	+ pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET)
31	+ if(NOT WEBP)
32	+ find_path(WEBP_INCLUDE_DIR /webp/decode.h)
33	+ find_library(WEBP_LIBRARY NAMES webp)
34	+ if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
35	+ set(WEBP 1)
36	+ set(WEBP_FOUND TRUE)
37	+ set(WEBP_LIBRARIES ${WEBP_LIBRARY})
38	+ set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
39	+ endif()
40	+ endif()
41	+ if(NOT WEBPMUX)
42	+ find_path(WEBPMUX_INCLUDE_DIR /webp/mux.h)
43	+ #TODO: check minimal required version
44	+ if(NOT WEBPMUX_INCLUDE_DIR)
45	+ message(STATUS "Can not find: /webp/mux.h")
46	+ endif()
47	+ if(NOT "${WEBPMUX_INCLUDE_DIR}" STREQUAL "${WEBP_INCLUDE_DIR}")
48	+ set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIRS} ${WEBPMUX_INCLUDE_DIR})
49	+ endif()
50	+ find_library(WEBPMUX_LIBRARY NAMES webpmux)
51	+ if (WEBPMUX_INCLUDE_DIR AND WEBPMUX_LIBRARY)
52	+ set(WEBPMUX 1)
53	+ set(HAVE_LIBWEBP_ANIM 1)
54	+ set(WEBPMUX_FOUND TRUE)
55	+ set(WEBP_LIBRARIES ${WEBP_LIBRARIES} ${WEBPMUX_LIBRARY})
56	+ endif()
57	+ endif()
58	endif()
59	- endif()
60	- if(NOT WEBPMUX)
61	- find_path(WEBPMUX_INCLUDE_DIR /webp/mux.h)
62	- #TODO: check minimal required version
63	- if(NOT WEBPMUX_INCLUDE_DIR)
64	- message(STATUS "Can not find: /webp/mux.h")
65	+ if(OPENJPEG_SUPPORT)
66	+ pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
67	+ if(NOT JP2K)
68	+ find_path(JP2K_INCLUDE_DIR /openjpeg-2.3/openjpeg.h)
69	+ find_library(JP2K_LIBRARY NAMES openjp2)
70	+ if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY)
71	+ set(JP2K 1)
72	+ set(JP2K_FOUND TRUE)
73	+ set(JP2K_LIBRARIES ${JP2K_LIBRARY})
74	+ set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR})
75	+ set(HAVE_LIBJP2K 1)
76	+ endif()
77	+ endif()
78	+ if(NOT JP2K)
79	+ find_path(JP2K_INCLUDE_DIR /openjpeg-2.4/openjpeg.h)
80	+ find_library(JP2K_LIBRARY NAMES openjp2)
81	+ if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY)
82	+ set(JP2K 1)
83	+ set(JP2K_FOUND TRUE)
84	+ set(JP2K_LIBRARIES ${JP2K_LIBRARY})
85	+ set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR})
86	+ set(HAVE_LIBJP2K 1)
87	+ endif()
88	+ endif()
89	endif()
90	- if(NOT "${WEBPMUX_INCLUDE_DIR}" STREQUAL "${WEBP_INCLUDE_DIR}")
91	- set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIRS} ${WEBPMUX_INCLUDE_DIR})
92	- endif()
93	- find_library(WEBPMUX_LIBRARY NAMES webpmux)
94	- if (WEBPMUX_INCLUDE_DIR AND WEBPMUX_LIBRARY)
95	- set(WEBPMUX 1)
96	- set(HAVE_LIBWEBP_ANIM 1)
97	- set(WEBPMUX_FOUND TRUE)
98	- set(WEBP_LIBRARIES ${WEBP_LIBRARIES} ${WEBPMUX_LIBRARY})
99	- endif()
100	endif()
101	- if(NOT JP2K)
102	- find_path(JP2K_INCLUDE_DIR /openjpeg-2.3/openjpeg.h)
103	- find_library(JP2K_LIBRARY NAMES openjp2)
104	- if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY)
105	- set(JP2K 1)
106	- set(JP2K_FOUND TRUE)
107	- set(JP2K_LIBRARIES ${JP2K_LIBRARY})
108	- set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR})
109	- set(HAVE_LIBJP2K 1)
110	- endif()
111	- endif()
112	- if(NOT JP2K)
113	- find_path(JP2K_INCLUDE_DIR /openjpeg-2.4/openjpeg.h)
114	- find_library(JP2K_LIBRARY NAMES openjp2)
115	- if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY)
116	- set(JP2K 1)
117	- set(JP2K_FOUND TRUE)
118	- set(JP2K_LIBRARIES ${JP2K_LIBRARY})
119	- set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR})
120	- set(HAVE_LIBJP2K 1)
121	- endif()
122	- endif()
123	else() # SW_BUILD=ON
124	find_package(SW REQUIRED)
125	sw_add_package(
126	@@ -264,7 +270,7 @@ endif()
127	add_subdirectory(src)
128
129	get_target_property(leptonica_NAME leptonica NAME)
130	-get_target_property(leptonica_VERSION leptonica VERSION)
131	+set(leptonica_VERSION ${VERSION_PLAIN})
132	get_target_property(leptonica_OUTPUT_NAME leptonica OUTPUT_NAME)
133
134	configure_file(lept.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lept.pc @ONLY)

Added Link Here

(-)b/graphics/leptonica/files/patch-src_CMakeLists.txt (+15 lines)
1	--- src/CMakeLists.txt.orig 2021-11-29 23:37:03 UTC
2	+++ src/CMakeLists.txt
3	@@ -14,10 +14,10 @@ if (MSVC)
4	set_source_files_properties(${src} PROPERTIES LANGUAGE CXX)
5	endif()
6
7	-string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
8	+#string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
9
10	add_library (leptonica ${src} ${hdr})
11	-set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN})
12	+#set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN})
13	set_target_properties (leptonica PROPERTIES SOVERSION 5.4.0)
14	if (WIN32)
15	set_target_properties (leptonica PROPERTIES OUTPUT_NAME leptonica-${VERSION_PLAIN})