CVS commit: pkgsrc/graphics/leptonica

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 30 07:53:38 UTC 2023

Modified Files:
        pkgsrc/graphics/leptonica: Makefile PLIST distinfo
Removed Files:
        pkgsrc/graphics/leptonica/patches: patch-src_Makefile.in

Log Message:
leptonica: updated to 1.83.1

Leptonica version 1.83.1
This is a configure-ready release, derived from 1.83.0 on 26 Jan 2023.

Leptonica version 1.83.0
This is a configure-ready release, derived from the master on 20 Dec 2022.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/leptonica/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/leptonica/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/leptonica/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/leptonica/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/leptonica/Makefile
diff -u pkgsrc/graphics/leptonica/Makefile:1.23 pkgsrc/graphics/leptonica/Makefile:1.24
--- pkgsrc/graphics/leptonica/Makefile:1.23     Tue Jan  3 17:36:25 2023
+++ pkgsrc/graphics/leptonica/Makefile  Mon Jan 30 07:53:38 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2023/01/03 17:36:25 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2023/01/30 07:53:38 adam Exp $
 
-DISTNAME=      leptonica-1.82.0
-PKGREVISION=   2
+DISTNAME=      leptonica-1.83.1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=danbloomberg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -11,19 +10,10 @@ HOMEPAGE=   http://www.leptonica.org/
 COMMENT=       Software for image processing and image analysis applications
 LICENSE=       2-clause-bsd
 
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_TOOLS+=            pkg-config
-GNU_CONFIGURE=         yes
-TEST_TARGET=           check
-
-.include "../../mk/bsd.prefs.mk"
-
-# The presence of fmemopen() assumes open_memstream() is also available,
-# which is wrong on platforms other than Linux.
-.if ${OPSYS} != "Linux"
-CONFIGURE_ENV+=                ac_cv_func_fmemopen=no
-.endif
+USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config
+CMAKE_ARGS+=   -DBUILD_PROG=ON
+CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
 
 # Silence console messages
 CPPFLAGS+=             -DNO_CONSOLE_IO=1
@@ -31,6 +21,7 @@ CPPFLAGS+=            -DNO_CONSOLE_IO=1
 # Pass a SunOS that the build relies on
 CPPFLAGS.SunOS+=       -D__SOLARIS__=1
 
+.include "../../devel/cmake/build.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"

Index: pkgsrc/graphics/leptonica/PLIST
diff -u pkgsrc/graphics/leptonica/PLIST:1.7 pkgsrc/graphics/leptonica/PLIST:1.8
--- pkgsrc/graphics/leptonica/PLIST:1.7 Tue Jun 15 10:26:48 2021
+++ pkgsrc/graphics/leptonica/PLIST     Mon Jan 30 07:53:38 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/06/15 10:26:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/01/30 07:53:38 adam Exp $
 bin/convertfilestopdf
 bin/convertfilestops
 bin/convertformat
@@ -12,6 +12,7 @@ bin/xtractprotos
 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
@@ -19,6 +20,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
@@ -32,6 +34,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
@@ -42,7 +45,11 @@ include/leptonica/stack.h
 include/leptonica/stringcode.h
 include/leptonica/sudoku.h
 include/leptonica/watershed.h
-lib/cmake/LeptonicaConfig-version.cmake
-lib/cmake/LeptonicaConfig.cmake
-lib/liblept.la
+lib/cmake/leptonica/LeptonicaConfig-version.cmake
+lib/cmake/leptonica/LeptonicaConfig.cmake
+lib/cmake/leptonica/LeptonicaTargets-release.cmake
+lib/cmake/leptonica/LeptonicaTargets.cmake
+lib/libleptonica.so
+lib/libleptonica.so.6
+lib/libleptonica.so.6.0.0
 lib/pkgconfig/lept.pc

Index: pkgsrc/graphics/leptonica/distinfo
diff -u pkgsrc/graphics/leptonica/distinfo:1.20 pkgsrc/graphics/leptonica/distinfo:1.21
--- pkgsrc/graphics/leptonica/distinfo:1.20     Tue Oct 26 10:46:24 2021
+++ pkgsrc/graphics/leptonica/distinfo  Mon Jan 30 07:53:38 2023
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 10:46:24 nia Exp $
+$NetBSD: distinfo,v 1.21 2023/01/30 07:53:38 adam Exp $
 
-BLAKE2s (leptonica-1.82.0.tar.gz) = dca6fbf45081166d41bb293a653d659b2dc0bd545cad85394112ccf4f61b0f75
-SHA512 (leptonica-1.82.0.tar.gz) = cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
-Size (leptonica-1.82.0.tar.gz) = 14041481 bytes
-SHA1 (patch-src_Makefile.in) = 6a412f514c630c5bea12f6ec228796c6f942acc2
+BLAKE2s (leptonica-1.83.1.tar.gz) = 87967c42fd0729eecfb9ad23bfab3e81878a7910bed6cf6f8f415c3b08ce506c
+SHA512 (leptonica-1.83.1.tar.gz) = 14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553
+Size (leptonica-1.83.1.tar.gz) = 14028566 bytes