diff --git a/releases.json b/releases.json index d3746440e1..b559bc62f1 100644 --- a/releases.json +++ b/releases.json @@ -2004,6 +2004,7 @@ "lept" ], "versions": [ + "1.87.0-1", "1.84.1-2", "1.84.1-1", "1.84.0-1", diff --git a/subprojects/leptonica.wrap b/subprojects/leptonica.wrap index 323efb5571..1b2257ed6b 100644 --- a/subprojects/leptonica.wrap +++ b/subprojects/leptonica.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory = leptonica-1.84.1 -source_url = https://github.com/DanBloomberg/leptonica/releases/download/1.84.1/leptonica-1.84.1.tar.gz -source_filename = leptonica-1.84.1.tar.gz -source_hash = 2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6 +directory = leptonica-1.87.0 +source_url = https://github.com/DanBloomberg/leptonica/releases/download/1.87.0/leptonica-1.87.0.tar.gz +source_filename = leptonica-1.87.0.tar.gz +source_hash = c73363397f96eb1295602bf44d708a994ad42046c791bf03ea0505d829bdb6a7 patch_directory = leptonica [provide] diff --git a/subprojects/packagefiles/leptonica/meson.build b/subprojects/packagefiles/leptonica/meson.build index c582d8da3a..99f06d090f 100644 --- a/subprojects/packagefiles/leptonica/meson.build +++ b/subprojects/packagefiles/leptonica/meson.build @@ -1,7 +1,8 @@ project( 'leptonica', 'c', - version: '1.84.1', + license: 'BSD-2-Clause', + version: '1.87.0', meson_version: '>=0.59.0', ) @@ -19,10 +20,10 @@ cdata = configuration_data() foreach _feat, _spec : { 'libjp2k': ['libopenjp2', '>=2.1.0'], 'libjpeg': ['libjpeg'], - 'libpng' : ['libpng'], + 'libpng': ['libpng'], 'libtiff': ['libtiff-4'], 'libwebp': ['libwebp'], - 'libz' : ['zlib'], + 'libz': ['zlib'], } _dep = dependency( _spec[0], diff --git a/subprojects/packagefiles/leptonica/meson_options.txt b/subprojects/packagefiles/leptonica/meson_options.txt index ee25895318..1470ba56b9 100644 --- a/subprojects/packagefiles/leptonica/meson_options.txt +++ b/subprojects/packagefiles/leptonica/meson_options.txt @@ -1,30 +1,30 @@ option( - 'libgif' , + 'libgif', type: 'feature', value: 'auto', ) option( - 'libjp2k' , + 'libjp2k', type: 'feature', value: 'auto', ) option( - 'libjpeg' , + 'libjpeg', type: 'feature', value: 'auto', ) option( - 'libpng' , + 'libpng', type: 'feature', value: 'auto', ) option( - 'libtiff' , + 'libtiff', type: 'feature', value: 'auto', ) option( - 'libwebp' , + 'libwebp', type: 'feature', value: 'auto', ) @@ -34,17 +34,17 @@ option( value: 'auto', ) option( - 'libz' , + 'libz', type: 'feature', value: 'auto', ) option( - 'progs' , + 'progs', type: 'feature', value: 'auto', ) option( - 'tests' , + 'tests', type: 'feature', value: 'auto', ) diff --git a/subprojects/packagefiles/leptonica/prog/meson.build b/subprojects/packagefiles/leptonica/prog/meson.build index 08cb4413ca..f3a5f8fe50 100644 --- a/subprojects/packagefiles/leptonica/prog/meson.build +++ b/subprojects/packagefiles/leptonica/prog/meson.build @@ -10,7 +10,7 @@ if get_option('progs').allowed() ['arabic_lines'], ['arithtest'], ['autogentest1'], - ['autogentest2' , false, 'autogen.137.c'], + ['autogentest2', false, 'autogen.137.c'], ['barcodetest'], ['binarize_set'], ['binarizefiles'], @@ -26,14 +26,14 @@ if get_option('progs').allowed() ['comparetest'], ['compresspdf'], ['contrasttest'], - ['convertfilestopdf' , true], - ['convertfilestops' , true], - ['convertformat' , true], - ['convertsegfilestopdf' , true], - ['convertsegfilestops' , true], + ['convertfilestopdf', true], + ['convertfilestops', true], + ['convertformat', true], + ['convertsegfilestopdf', true], + ['convertsegfilestops', true], ['converttogray'], - ['converttopdf' , true], - ['converttops' , true], + ['converttopdf', true], + ['converttops', true], ['cornertest'], ['corrupttest'], ['croppdf'], @@ -53,7 +53,7 @@ if get_option('progs').allowed() ['dwalineargen'], ['fcombautogen'], ['fhmtautogen'], - ['fileinfo' , true], + ['fileinfo', true], ['find_colorregions'], ['findbinding'], ['findpattern1'], @@ -68,7 +68,7 @@ if get_option('progs').allowed() ['histoduptest'], ['histotest'], ['htmlviewer'], - ['imagetops' , true], + ['imagetops', true], ['jbcorrelation'], ['jbrankhaus'], ['jbwords'], @@ -85,6 +85,7 @@ if get_option('progs').allowed() ['maptest'], ['messagetest'], ['misctest1'], + ['misctest2'], ['modifyhuesat'], ['morphtest1'], ['numaranktest'], @@ -144,7 +145,7 @@ if get_option('progs').allowed() ['warpertest'], ['wordsinorder'], ['writemtiff'], - ['xtractprotos' , true], + ['xtractprotos', true], ['yuvtest'], ] _name = _spec[0] @@ -178,175 +179,176 @@ if get_option('tests').require( ) foreach _spec : [ - ['alltests_reg' , '' , true], - ['adaptmap_reg' , 'libjpeg libpng'], - ['adaptnorm_reg' , 'libjpeg'], - ['affine_reg' , 'libjpeg libtiff'], - ['alphaops_reg' , 'libjpeg libpng libtiff'], - ['alphaxform_reg' , 'libjpeg'], - ['baseline_reg' , 'gnuplot libjpeg libpng'], - ['bilateral1_reg' , 'libjpeg libpng' , true], - ['bilateral2_reg' , 'libjpeg'], - ['bilinear_reg' , 'libjpeg libtiff'], - ['binarize_reg' , 'libjpeg'], - ['binmorph1_reg' , 'libtiff'], - ['binmorph2_reg' , 'libtiff' , true], - ['binmorph3_reg' , 'libtiff'], - ['binmorph4_reg' , 'libtiff' , true], - ['binmorph5_reg' , 'libtiff' , true], - ['binmorph6_reg' , 'libtiff'], - ['blackwhite_reg' , 'libpng'], - ['blend1_reg' , 'libjpeg libpng'], - ['blend2_reg' , 'libjpeg libpng'], - ['blend3_reg' , 'libjpeg libpng libtiff'], - ['blend4_reg' , 'libjpeg libpng libtiff'], - ['blend5_reg' , 'libjpeg libpng'], - ['boxa1_reg' , 'gnuplot'], - ['boxa2_reg' , 'gnuplot libpng'], - ['boxa3_reg' , 'gnuplot libpng libtiff'], - ['boxa4_reg' , 'gnuplot libjpeg libpng libtiff'], - ['bytea_reg' , 'libjpeg'], - ['ccbord_reg' , 'libpng libtiff libz'], - ['ccthin1_reg' , 'libtiff libz'], - ['ccthin2_reg' , 'libpng libtiff libz'], - ['checkerboard_reg' , 'libtiff'], - ['circle_reg' , 'libpng'], - ['cmapquant_reg' , 'libjpeg'], - ['colorcontent_reg' , 'libjpeg libz'], - ['colorfill_reg' , 'libjpeg'], - ['coloring_reg' , 'libpng'], - ['colorize_reg' , 'libjpeg'], - ['colormask_reg' , 'gnuplot libpng'], - ['colormorph_reg' , 'libjpeg'], - ['colorquant_reg' , 'libjpeg'], - ['colorseg_reg' , 'libjpeg'], - ['colorspace_reg' , 'libjpeg gnuplot libpng'], - ['compare_reg' , 'libjpeg libpng libtiff libz'], - ['compfilter_reg' , 'libtiff'], - ['conncomp_reg' , 'libpng libtiff'], - ['conversion_reg' , 'libjpeg libpng libtiff'], - ['convolve_reg' , 'libjpeg libpng libtiff'], - ['crop_reg' , 'gnuplot libjpeg libpng'], - ['dewarp_reg' , 'libjpeg'], - ['distance_reg' , 'libtiff'], - ['dither_reg' , 'libjpeg'], - ['dna_reg' , 'gnuplot libpng'], + ['alltests_reg', '', true], + ['adaptmap_reg', 'libjpeg libpng'], + ['adaptnorm_reg', 'libjpeg'], + ['affine_reg', 'libjpeg libtiff'], + ['alphaops_reg', 'libjpeg libpng libtiff'], + ['alphaxform_reg', 'libjpeg'], + ['baseline_reg', 'gnuplot libjpeg libpng'], + ['bilateral1_reg', 'libjpeg libpng', true], + ['bilateral2_reg', 'libjpeg'], + ['bilinear_reg', 'libjpeg libtiff'], + ['binarize_reg', 'libjpeg'], + ['binmorph1_reg', 'libtiff'], + ['binmorph2_reg', 'libtiff', true], + ['binmorph3_reg', 'libtiff'], + ['binmorph4_reg', 'libtiff', true], + ['binmorph5_reg', 'libtiff', true], + ['binmorph6_reg', 'libtiff'], + ['blackwhite_reg', 'libpng'], + ['blend1_reg', 'libjpeg libpng'], + ['blend2_reg', 'libjpeg libpng'], + ['blend3_reg', 'libjpeg libpng libtiff'], + ['blend4_reg', 'libjpeg libpng libtiff'], + ['blend5_reg', 'libjpeg libpng'], + ['boxa1_reg', 'gnuplot'], + ['boxa2_reg', 'gnuplot libpng'], + ['boxa3_reg', 'gnuplot libpng libtiff'], + ['boxa4_reg', 'gnuplot libjpeg libpng libtiff'], + ['bytea_reg', 'libjpeg'], + ['ccbord_reg', 'libpng libtiff libz'], + ['ccthin1_reg', 'libtiff libz'], + ['ccthin2_reg', 'libpng libtiff libz'], + ['checkerboard_reg', 'libtiff'], + ['circle_reg', 'libpng'], + ['cmapquant_reg', 'libjpeg'], + ['colorcontent_reg', 'libjpeg libz'], + ['colorfill_reg', 'libjpeg'], + ['coloring_reg', 'libpng'], + ['colorize_reg', 'libjpeg'], + ['colormask_reg', 'gnuplot libpng'], + ['colormorph_reg', 'libjpeg'], + ['colorquant_reg', 'libjpeg'], + ['colorseg_reg', 'libjpeg'], + ['colorspace_reg', 'libjpeg gnuplot libpng'], + ['compare_reg', 'libjpeg libpng libtiff libz'], + ['compfilter_reg', 'libtiff'], + ['conncomp_reg', 'libpng libtiff'], + ['conversion_reg', 'libjpeg libpng libtiff'], + ['convolve_reg', 'libjpeg libpng libtiff'], + ['crop_reg', 'gnuplot libjpeg libpng'], + ['dewarp_reg', 'libjpeg'], + ['distance_reg', 'libtiff'], + ['dither_reg', 'libjpeg'], + ['dna_reg', 'gnuplot libpng'], [ - 'dwamorph1_reg' , - 'libtiff' , + 'dwamorph1_reg', + 'libtiff', false, 'dwalinear.3.c dwalinearlow.3.c', ], [ - 'dwamorph2_reg' , - 'gnuplot libpng libtiff' , + 'dwamorph2_reg', + 'gnuplot libpng libtiff', true, 'dwalinear.3.c dwalinearlow.3.c', ], - ['edge_reg' , 'libjpeg'], - ['encoding_reg' , 'libjpeg libpng libz'], - ['enhance_reg' , 'gnuplot libjpeg libpng'], - ['equal_reg' , 'libpng libjpeg libtiff'], - ['expand_reg' , 'libjpeg libpng'], - ['extrema_reg' , 'gnuplot libpng'], - ['falsecolor_reg' , ''], - ['fhmtauto_reg' , 'libtiff'], - ['files_reg' , '' , true], - ['findcorners_reg' , 'libtiff'], - ['findpattern_reg' , 'libpng'], - ['flipdetect_reg' , 'libtiff'], - ['fmorphauto_reg' , '' , true], - ['fpix1_reg' , 'gnuplot libjpeg libpng'], - ['fpix2_reg' , 'libjpeg'], - ['genfonts_reg' , 'libpng libtiff'], - ['gifio_reg' , 'libgif'], - ['grayfill_reg' , ''], - ['graymorph1_reg' , 'libjpeg'], - ['graymorph2_reg' , 'libjpeg'], - ['grayquant_reg' , 'libjpeg libtiff'], - ['hardlight_reg' , 'libjpeg'], - ['hash_reg' , 'gnuplot libjpeg'], - ['heap_reg' , ''], - ['insert_reg' , 'libpng libtiff'], - ['ioformats_reg' , 'libjpeg libpng libtiff'], - ['iomisc_reg' , 'libjpeg libpng libtiff'], - ['italic_reg' , 'gnuplot libpng libz'], - ['jbclass_reg' , 'libtiff'], - ['jp2kio_reg' , 'libjp2k'], - ['jpegio_reg' , 'libjpeg libpng'], - ['kernel_reg' , 'gnuplot libjpeg libpng libtiff'], - ['label_reg' , 'libtiff'], - ['lineremoval_reg' , 'libpng'], - ['locminmax_reg' , 'libjpeg'], - ['logicops_reg' , 'libjpeg libpng'], - ['lowaccess_reg' , 'libtiff'], - ['lowsat_reg' , 'libjpeg'], - ['maze_reg' , 'libjpeg'], - ['morphseq_reg' , 'libjpeg libpng libtiff libz' , true], - ['mtiff_reg' , 'libpng libtiff'], - ['multitype_reg' , 'libtiff'], - ['nearline_reg' , 'gnuplot libpng libtiff'], - ['newspaper_reg' , 'libtiff'], - ['numa1_reg' , 'gnuplot libjpeg libpng'], - ['numa2_reg' , 'gnuplot libjpeg libpng'], - ['numa3_reg' , 'gnuplot libjpeg libpng'], - ['overlap_reg' , ''], - ['pageseg_reg' , 'libjpeg libpng libtiff libz'], - ['paint_reg' , 'libjpeg libpng libtiff'], - ['paintmask_reg' , 'libjpeg libpng libtiff'], - ['partition_reg' , 'libjpeg libtiff'], - ['pdfio1_reg' , 'libjpeg libpng libtiff libz'], - ['pdfio2_reg' , 'libjpeg libpng libz'], - ['pdfseg_reg' , 'libjpeg libpng'], - ['pixa1_reg' , 'gnuplot libpng'], - ['pixa2_reg' , 'libjpeg libtiff'], - ['pixadisp_reg' , 'libjpeg libtiff'], - ['pixalloc_reg' , 'libjpeg libtiff' , true], - ['pixcomp_reg' , 'libjpeg libpng libtiff'], - ['pixmem_reg' , 'libjpeg libpng libtiff'], - ['pixserial_reg' , 'libjpeg libpng libtiff'], - ['pixtile_reg' , 'libjpeg' , true], - ['pngio_reg' , 'libjpeg libpng libtiff'], - ['pnmio_reg' , 'libjpeg libpng libtiff'], - ['projection_reg' , 'gnuplot libjpeg libpng libtiff'], - ['projective_reg' , 'libjpeg libtiff'], - ['psio_reg' , 'libjpeg libpng libtiff libz'], - ['psioseg_reg' , 'libtiff'], - ['pta_reg' , 'libtiff'], - ['ptra1_reg' , 'libtiff'], - ['ptra2_reg' , 'libpng libtiff'], - ['quadtree_reg' , 'libpng'], - ['rank_reg' , 'gnuplot libjpeg'], - ['rankbin_reg' , 'gnuplot libjpeg libpng libtiff'], - ['rankhisto_reg' , 'gnuplot libjpeg libpng'], - ['rasterop_reg' , 'libtiff'], - ['rasteropip_reg' , 'libjpeg'], - ['rectangle_reg' , 'libpng libtiff'], - ['rotate1_reg' , 'libjpeg libpng'], - ['rotate2_reg' , 'libjpeg libpng'], - ['rotateorth_reg' , 'libjpeg libpng'], - ['scale_reg' , 'libjpeg libpng libtiff'], - ['seedspread_reg' , ''], - ['selio_reg' , ''], - ['shear1_reg' , 'libjpeg libpng'], - ['shear2_reg' , ''], - ['skew_reg' , 'libtiff'], - ['smallpix_reg' , ''], - ['smoothedge_reg' , 'libpng' , true], - ['speckle_reg' , 'libjpeg'], - ['splitcomp_reg' , ''], - ['string_reg' , ''], - ['subpixel_reg' , 'libjpeg libpng'], - ['texturefill_reg' , 'libjpeg'], - ['threshnorm_reg' , 'libjpeg'], - ['translate_reg' , 'libpng'], - ['warper_reg' , 'libtiff'], - ['watershed_reg' , 'libpng'], - ['webpanimio_reg' , 'libwebp_anim'], - ['webpio_reg' , 'libwebp'], - ['wordboxes_reg' , 'gnuplot libjpeg libpng libtiff'], - ['writetext_reg' , 'libjpeg libpng'], - ['xformbox_reg' , 'libtiff'], + ['edge_reg', 'libjpeg'], + ['encoding_reg', 'libjpeg libpng libz'], + ['enhance_reg', 'gnuplot libjpeg libpng'], + ['equal_reg', 'libpng libjpeg libtiff'], + ['expand_reg', 'libjpeg libpng'], + ['extrema_reg', 'gnuplot libpng'], + ['falsecolor_reg', ''], + ['fhmtauto_reg', 'libtiff'], + ['files_reg', '', true], + ['findcorners_reg', 'libtiff'], + ['findpattern1_reg', 'libpng'], + ['findpattern2_reg', 'libpng'], + ['flipdetect_reg', 'libtiff'], + ['fmorphauto_reg', '', true], + ['fpix1_reg', 'gnuplot libjpeg libpng'], + ['fpix2_reg', 'libjpeg'], + ['genfonts_reg', 'libpng libtiff'], + ['gifio_reg', 'libgif'], + ['grayfill_reg', ''], + ['graymorph1_reg', 'libjpeg'], + ['graymorph2_reg', 'libjpeg'], + ['grayquant_reg', 'libjpeg libtiff'], + ['hardlight_reg', 'libjpeg'], + ['hash_reg', 'gnuplot libjpeg'], + ['heap_reg', ''], + ['insert_reg', 'libpng libtiff'], + ['ioformats_reg', 'libjpeg libpng libtiff'], + ['iomisc_reg', 'libjpeg libpng libtiff'], + ['italic_reg', 'gnuplot libpng libz'], + ['jbclass_reg', 'libtiff'], + ['jp2kio_reg', 'libjp2k'], + ['jpegio_reg', 'libjpeg libpng'], + ['kernel_reg', 'gnuplot libjpeg libpng libtiff'], + ['label_reg', 'libtiff'], + ['lineremoval_reg', 'libpng'], + ['locminmax_reg', 'libjpeg'], + ['logicops_reg', 'libjpeg libpng'], + ['lowaccess_reg', 'libtiff'], + ['lowsat_reg', 'libjpeg'], + ['maze_reg', 'libjpeg'], + ['morphseq_reg', 'libjpeg libpng libtiff libz', true], + ['mtiff_reg', 'libpng libtiff'], + ['multitype_reg', 'libtiff'], + ['nearline_reg', 'gnuplot libpng libtiff'], + ['newspaper_reg', 'libtiff'], + ['numa1_reg', 'gnuplot libjpeg libpng'], + ['numa2_reg', 'gnuplot libjpeg libpng'], + ['numa3_reg', 'gnuplot libjpeg libpng'], + ['overlap_reg', ''], + ['pageseg_reg', 'libjpeg libpng libtiff libz'], + ['paint_reg', 'libjpeg libpng libtiff'], + ['paintmask_reg', 'libjpeg libpng libtiff'], + ['partition_reg', 'libjpeg libtiff'], + ['pdfio1_reg', 'libjpeg libpng libtiff libz'], + ['pdfio2_reg', 'libjpeg libpng libz'], + ['pdfseg_reg', 'libjpeg libpng'], + ['pixa1_reg', 'gnuplot libpng'], + ['pixa2_reg', 'libjpeg libtiff'], + ['pixadisp_reg', 'libjpeg libtiff'], + ['pixalloc_reg', 'libjpeg libtiff', true], + ['pixcomp_reg', 'libjpeg libpng libtiff'], + ['pixmem_reg', 'libjpeg libpng libtiff'], + ['pixserial_reg', 'libjpeg libpng libtiff'], + ['pixtile_reg', 'libjpeg', true], + ['pngio_reg', 'libjpeg libpng libtiff'], + ['pnmio_reg', 'libjpeg libpng libtiff'], + ['projection_reg', 'gnuplot libjpeg libpng libtiff'], + ['projective_reg', 'libjpeg libtiff'], + ['psio_reg', 'libjpeg libpng libtiff libz'], + ['psioseg_reg', 'libtiff'], + ['pta_reg', 'libtiff'], + ['ptra1_reg', 'libtiff'], + ['ptra2_reg', 'libpng libtiff'], + ['quadtree_reg', 'libpng'], + ['rank_reg', 'gnuplot libjpeg'], + ['rankbin_reg', 'gnuplot libjpeg libpng libtiff'], + ['rankhisto_reg', 'gnuplot libjpeg libpng'], + ['rasterop_reg', 'libtiff'], + ['rasteropip_reg', 'libjpeg'], + ['rectangle_reg', 'libpng libtiff'], + ['rotate1_reg', 'libjpeg libpng'], + ['rotate2_reg', 'libjpeg libpng'], + ['rotateorth_reg', 'libjpeg libpng'], + ['scale_reg', 'libjpeg libpng libtiff'], + ['seedspread_reg', ''], + ['selio_reg', ''], + ['shear1_reg', 'libjpeg libpng'], + ['shear2_reg', ''], + ['skew_reg', 'libtiff'], + ['smallpix_reg', ''], + ['smoothedge_reg', 'libpng', true], + ['speckle_reg', 'libjpeg'], + ['splitcomp_reg', ''], + ['string_reg', ''], + ['subpixel_reg', 'libjpeg libpng'], + ['texturefill_reg', 'libjpeg'], + ['threshnorm_reg', 'libjpeg'], + ['translate_reg', 'libpng'], + ['warper_reg', 'libtiff'], + ['watershed_reg', 'libpng'], + ['webpanimio_reg', 'libwebp_anim'], + ['webpio_reg', 'libwebp'], + ['wordboxes_reg', 'gnuplot libjpeg libpng libtiff'], + ['writetext_reg', 'libjpeg libpng'], + ['xformbox_reg', 'libtiff'], ] _name = _spec[0] _features = _spec[1] diff --git a/subprojects/packagefiles/leptonica/src/meson.build b/subprojects/packagefiles/leptonica/src/meson.build index 5df43e2bf6..c068f8615a 100644 --- a/subprojects/packagefiles/leptonica/src/meson.build +++ b/subprojects/packagefiles/leptonica/src/meson.build @@ -154,6 +154,7 @@ lept_lib = library( 'recogident.c', 'recogtrain.c', 'regutils.c', + 'renderpdf.c', 'rop.c', 'roplow.c', 'rotate.c',