Cherry-pick a couple of Meson improvements to 8.13 (#2968)

* add a summary table at the end of configure Copied from the old autotools summary. Sample clipped from "meson setup": ``` Program python3 found: YES (/usr/bin/python3) Configuring variables.sh using configuration Message: *Build options enable debug ......................: true enable deprecated .................: true enable modules ....................: true enable gtk-doc ....................: true enable doxygen ....................: false enable introspection ..............: true enable RAD load/save ..............: true enable Analyze7 load/save .........: true enable PPM load/save ..............: true enable GIF load ...................: true *Optional external packages use fftw for FFTs .................: true accelerate loops with ORC .........: true ICC profile support with lcms .....: true zlib ..............................: true text rendering with pangocairo ....: true font file support with fontcongfig : true EXIF metadata support with libexif : true *External image format libraries JPEG load/save with libjpeg .......: true JXL load/save with libjxl .........: false JPEG2000 load/save with openjpeg ..: true PNG load/save with libspng ........: false PNG load/save with libpng .........: true selected quantisation package .....: imagequant TIFF load/save with libtiff .......: true image pyramid save with libgsf ....: true HEIC/AVIF load/save with libheif ..: true WebP load/save with libwebp .......: true PDF load with PDFium ..............: false PDF load with poppler-glib ........: true SVG load with librsvg .............: true EXR load/save with openexr ........: true OpenSlide load ....................: true Matlab load with libmatio .........: true NIfTI load/save with niftiio ......: true FITS load/save with cfitsio .......: true GIF save with cgif ................: true selected Magick package ...........: MagickCore Magick load/save ..................: true Build targets in project: 53 ... ``` * Meson: improve summary table (#2943) * Meson: improve summary table * Fix typo * Remove redundant whitespace * Fix libpng fall-back when build with `-Dspng=disabled` (#2955) * Meson: simplify dynamic module handling (#2956) * Deduplicate `--vips-config` with the build summary (#2957) * Deduplicate `--vips-config` with the build summary * Ensure output is identical Helps parses. * Fix summary when build with `-Dnifti=disabled` (#2963) * Update ChangeLog Co-authored-by: John Cupitt <jcupitt@gmail.com>
2022-07-31 11:09:00 +02:00 · 2022-07-31 11:09:00 +02:00 · a6fa62605c
commit a6fa62605c
parent b808cba14a
5 changed files with 109 additions and 64 deletions
--- a/2
+++ b/2
@ -1,5 +1,7 @@
 24/7/22 started 8.13.1
 - fix im7 feature detection in meson
+- add a summary table at the end of configure in meson
+- fix libpng fallback when spng is disabled in meson

 21/11/21 started 8.13
 - configure fails for requested but unmet dependencies [remicollet]
--- a/libvips/foreign/meson.build
+++ b/libvips/foreign/meson.build
@ -82,7 +82,7 @@ magick_module_headers = files(
    'magick.h',
 )

-if not modules_enabled or get_option('magick-module').disabled()
+if not magick_module
    foreign_sources += magick_module_sources
    foreign_headers += magick_module_headers
 endif
@ -92,7 +92,7 @@ jpeg_xl_module_sources = files(
    'jxlsave.c',
 )

-if not modules_enabled or get_option('jpeg-xl-module').disabled()
+if not libjxl_module
    foreign_sources += jpeg_xl_module_sources
 endif

@ -101,7 +101,7 @@ heif_module_sources = files(
    'heifsave.c',
 )

-if not modules_enabled or get_option('heif-module').disabled()
+if not libheif_module
    foreign_sources += heif_module_sources
 endif

@ -109,7 +109,7 @@ poppler_module_sources = files(
    'popplerload.c',
 )

-if not modules_enabled or get_option('poppler-module').disabled()
+if not libpoppler_module
    foreign_sources += poppler_module_sources
 endif

@ -117,7 +117,7 @@ openslide_module_sources = files(
    'openslideload.c',
 )

-if not modules_enabled or get_option('openslide-module').disabled()
+if not openslide_module
    foreign_sources += openslide_module_sources
 endif

--- a/libvips/include/vips/meson.build
+++ b/libvips/include/vips/meson.build
@ -84,48 +84,20 @@ enumtypes = gnome.mkenums(
 )

 vips_verbose_config = []
-vips_verbose_config += 'enable debug: @0@'.format(get_option('debug'))
-vips_verbose_config += 'enable deprecated library components: @0@'.format(get_option('deprecated'))
-vips_verbose_config += 'enable modules: @0@'.format(modules_enabled)
-vips_verbose_config += 'use fftw3 for FFT: @0@'.format(fftw_dep.found())
-vips_verbose_config += 'accelerate loops with orc: @0@'.format(orc_dep.found())
-vips_verbose_config += 'ICC profile support with lcms: @0@'.format(lcms_dep.found())
-vips_verbose_config += 'zlib: @0@'.format(zlib_dep.found())
-vips_verbose_config += 'text rendering with pangocairo: @0@'.format(pangocairo_dep.found())
-vips_verbose_config += 'font file support with fontconfig: @0@'.format(fontconfig_dep.found())
-vips_verbose_config += 'RAD load/save: @0@'.format(get_option('radiance'))
-vips_verbose_config += 'Analyze7 load/save: @0@'.format(get_option('analyze'))
-vips_verbose_config += 'PPM load/save: @0@'.format(get_option('ppm'))
-vips_verbose_config += 'GIF load: @0@'.format(get_option('nsgif'))
-vips_verbose_config += 'GIF save with cgif: @0@'.format(cgif_dep.found())
-vips_verbose_config += 'EXIF metadata support with libexif: @0@'.format(libexif_dep.found())
-vips_verbose_config += 'JPEG load/save with libjpeg: @0@'.format(libjpeg_dep.found())
-vips_verbose_config += 'JXL load/save with libjxl: @0@ (dynamic module: @1@)'.format(libjxl_dep.found(), modules_enabled and not get_option('jpeg-xl-module').disabled())
-vips_verbose_config +='JPEG2000 load/save with libopenjp2: @0@'.format(libopenjp2_dep.found())
-vips_verbose_config += 'PNG load with libspng: @0@'.format(spng_dep.found())
-vips_verbose_config += 'PNG load/save with libpng: @0@'.format(png_dep.found())
-vips_verbose_config += 'selected quantisation package: @0@'.format(quantisation_package.found() ? quantisation_package.name() : 'none')
-vips_verbose_config += 'TIFF load/save with libtiff: @0@'.format(libtiff_dep.found())
-vips_verbose_config += 'image pyramid save: @0@'.format(gsf_dep.found())
-vips_verbose_config += 'HEIC/AVIF load/save with libheif: @0@ (dynamic module: @1@)'.format(libheif_dep.found(), modules_enabled and not get_option('heif-module').disabled())
-vips_verbose_config += 'WebP load/save with libwebp: @0@'.format(libwebp_dep.found())
-vips_verbose_config += 'PDF load with PDFium: @0@'.format(pdfium_dep.found())
-vips_verbose_config += 'PDF load with poppler-glib: @0@ (dynamic module: @1@)'.format(libpoppler_dep.found(), modules_enabled and not get_option('poppler-module').disabled())
-vips_verbose_config += 'SVG load with librsvg-2.0: @0@'.format(librsvg_dep.found())
-vips_verbose_config += 'EXR load with OpenEXR: @0@'.format(openexr_dep.found())
-vips_verbose_config += 'OpenSlide load: @0@ (dynamic module: @1@)'.format(openslide_dep.found(), modules_enabled and not get_option('openslide-module').disabled())
-vips_verbose_config += 'Matlab load with matio: @0@'.format(matio_dep.found())
-vips_verbose_config += 'NIfTI load/save with niftiio: @0@'.format(libnifti_dep.found())
-vips_verbose_config += 'FITS load/save with cfitsio: @0@'.format(cfitsio_dep.found())
-vips_verbose_config += 'Magick package: @0@ (dynamic module: @1@)'.format(magick_dep.found(), modules_enabled and not get_option('magick-module').disabled())
-if magick_dep.found()
-    magick_version_str = 'magick' + magick_dep.version().split('.')[0]
-else
-    magick_version_str = 'none'
-endif
-vips_verbose_config += 'Magick API version: @0@'.format(magick_version_str)
-vips_verbose_config += 'load with libMagickCore: @0@'.format(magick_dep.found() and 'load' in get_option('magick-features'))
-vips_verbose_config += 'save with libMagickCore: @0@'.format(magick_dep.found() and 'save' in get_option('magick-features'))
+foreach _, section : build_summary
+    foreach key, arr : section
+        if key.contains('gtk-doc') or \
+           key.contains('doxygen') or \
+           key.contains('introspection')
+           continue
+        endif
+
+        vips_verbose_config += '@0@: @1@@2@@3@@4@'.format(key, arr[0],
+            arr.length() > 1 ? arr[1] : '',
+            arr.length() > 2 ? arr[2] : '',
+            arr.length() > 3 ? arr[3] : '')
+    endforeach
+endforeach

 version_data = configuration_data()
 version_data.set('VIPS_VERSION', meson.project_version())
--- a/libvips/meson.build
+++ b/libvips/meson.build
@ -79,7 +79,7 @@ if ['darwin', 'ios'].contains(host_os)
  module_suffix = 'so'
 endif

-if magick_dep.found() and not get_option('magick-module').disabled()
+if magick_module
    shared_module('vips-magick',
        'module/magick.c',
        magick_module_sources,
@ -92,7 +92,7 @@ if magick_dep.found() and not get_option('magick-module').disabled()
    )
 endif

-if libjxl_dep.found() and not get_option('jpeg-xl-module').disabled()
+if libjxl_module
    shared_module('vips-jxl',
        'module/jxl.c',
        jpeg_xl_module_sources,
@ -104,7 +104,7 @@ if libjxl_dep.found() and not get_option('jpeg-xl-module').disabled()
    )
 endif

-if libheif_dep.found() and not get_option('heif-module').disabled()
+if libheif_module
    shared_module('vips-heif',
        'module/heif.c',
        heif_module_sources,
@ -116,7 +116,7 @@ if libheif_dep.found() and not get_option('heif-module').disabled()
    )
 endif

-if libpoppler_dep.found() and not get_option('poppler-module').disabled()
+if libpoppler_module
    shared_module('vips-poppler',
        'module/poppler.c',
        poppler_module_sources,
@ -128,7 +128,7 @@ if libpoppler_dep.found() and not get_option('poppler-module').disabled()
    )
 endif

-if openslide_dep.found() and not get_option('openslide-module').disabled()
+if openslide_module
    shared_module('vips-openslide',
        'module/openslide.c',
        openslide_module_sources,
--- a/meson.build
+++ b/meson.build
@ -168,8 +168,11 @@ if not magick_dep.found()
    # very old versions called it "ImageMagick"
    magick_dep = dependency('ImageMagick', required: get_option('magick'))
 endif
-if not get_option('magick').disabled() and magick_dep.found()
-    if modules_enabled and not get_option('magick-module').disabled()
+magick_found = not get_option('magick').disabled() and magick_dep.found()
+magick_module = false
+if magick_found
+    magick_module = modules_enabled and not get_option('magick-module').disabled()
+    if magick_module
        cfg_var.set('MAGICK_MODULE', '1')
    else
        libvips_deps += magick_dep
@ -301,14 +304,15 @@ spng_dep = dependency('spng', version: '>=0.7', required: false)
 if not spng_dep.found()
    spng_dep = dependency('libspng', version: '>=0.7', required: get_option('spng'))
 endif
-if not get_option('spng').disabled() and spng_dep.found()
+spng_found = not get_option('spng').disabled() and spng_dep.found()
+if spng_found
    libvips_deps += spng_dep
    cfg_var.set('HAVE_SPNG', '1')
 endif

 # only if libspng not found
 png_dep = disabler()
-if not spng_dep.found()
+if not spng_found
    png_dep = dependency('libpng', version: '>=1.2.9', required: get_option('png'))
    if png_dep.found()
        libvips_deps += png_dep
@ -340,7 +344,8 @@ endif
 # text rendering with fontconfig requires pangoft2
 pangoft2_dep = dependency('pangoft2', version: '>=1.32.6', required: get_option('fontconfig'))
 fontconfig_dep = dependency('fontconfig', required: get_option('fontconfig'))
-if pangoft2_dep.found() and fontconfig_dep.found() and pangocairo_dep.found()
+fontconfig_found = pangoft2_dep.found() and fontconfig_dep.found() and pangocairo_dep.found()
+if fontconfig_found
    libvips_deps += pangoft2_dep
    libvips_deps += fontconfig_dep
    cfg_var.set('HAVE_FONTCONFIG', '1')
@ -359,15 +364,18 @@ endif
 # 2.40.3 so we get the UNLIMITED open flag
 librsvg_dep = dependency('librsvg-2.0', version: '>=2.40.3', required: get_option('rsvg'))
 cairo_dep = dependency('cairo', version: '>=1.2', required: get_option('rsvg'))
-if librsvg_dep.found() and cairo_dep.found()
+librsvg_found = librsvg_dep.found() and cairo_dep.found()
+if librsvg_found
    libvips_deps += librsvg_dep
    libvips_deps += cairo_dep
    cfg_var.set('HAVE_RSVG', '1')
 endif

 openslide_dep = dependency('openslide', version: '>=3.3.0', required: get_option('openslide'))
+openslide_module = false
 if openslide_dep.found()
-    if modules_enabled and not get_option('openslide-module').disabled()
+    openslide_module = modules_enabled and not get_option('openslide-module').disabled()
+    if openslide_module
        cfg_var.set('OPENSLIDE_MODULE', '1')
    else
        libvips_deps += openslide_dep
@ -430,8 +438,10 @@ endif


 libheif_dep = dependency('libheif', version: '>=0.4.11', required: get_option('heif'))
+libheif_module = false
 if libheif_dep.found()
-    if modules_enabled and not get_option('heif-module').disabled()
+    libheif_module = modules_enabled and not get_option('heif-module').disabled()
+    if libheif_module
        cfg_var.set('HEIF_MODULE', '1')
    else
        libvips_deps += libheif_dep
@ -460,8 +470,11 @@ endif

 libjxl_dep = dependency('libjxl', version: '>=0.5', required: get_option('jpeg-xl'))
 libjxl_threads_dep = dependency('libjxl_threads', version: '>=0.5', required: get_option('jpeg-xl'))
-if libjxl_dep.found() and libjxl_threads_dep.found()
-    if modules_enabled and not get_option('jpeg-xl-module').disabled()
+libjxl_found = libjxl_dep.found() and libjxl_threads_dep.found()
+libjxl_module = false
+if libjxl_found
+    libjxl_module = modules_enabled and not get_option('jpeg-xl-module').disabled()
+    if libjxl_module
        cfg_var.set('LIBJXL_MODULE', '1')
    else
        libvips_deps += libjxl_dep
@ -474,13 +487,17 @@ if libjxl_dep.found() and libjxl_threads_dep.found()
 endif

 libpoppler_dep = dependency('poppler-glib', version: '>=0.16.0', required: get_option('poppler'))
+libpoppler_found = false
+libpoppler_module = false
 if not cairo_dep.found()
    cairo_dep = dependency('cairo', version: '>=1.2', required: get_option('poppler'))
 endif
 if libpoppler_dep.found() and cairo_dep.found() and pdfium_dep.found()
    message('PDFium has been found, ignoring Poppler support')
 elif libpoppler_dep.found() and cairo_dep.found()
-    if modules_enabled and not get_option('poppler-module').disabled()
+    libpoppler_found = true
+    libpoppler_module = modules_enabled and not get_option('poppler-module').disabled()
+    if libpoppler_module
        cfg_var.set('POPPLER_MODULE', '1')
    else
        libvips_deps += libpoppler_dep
@ -524,7 +541,8 @@ if nifti_prefix_dir != '' and not libnifti_dep.found()
    znz_lib = cc.find_library('znz', has_headers: ['znzlib.h'], header_include_directories: nifti_inc, required: get_option('nifti'))
    libnifti_dep = declare_dependency(dependencies: [nifti_lib, znz_lib], include_directories: nifti_inc)
 endif
-if not get_option('nifti').disabled() and libnifti_dep.found()
+libnifti_found = not get_option('nifti').disabled() and libnifti_dep.found()
+if libnifti_found
    libvips_deps += libnifti_dep
    cfg_var.set('HAVE_NIFTI', '1')
 endif
@ -607,6 +625,59 @@ config_dep = declare_dependency(

 libvips_deps += config_dep

+build_summary = {
+  'Build options':
+    {'enable debug': [get_option('debug')],
+     'enable deprecated': [get_option('deprecated')],
+     'enable modules': [modules_enabled],
+     'enable gtk-doc': [get_option('gtk_doc')],
+     'enable doxygen': [get_option('doxygen')],
+     'enable introspection': [get_option('introspection')],
+     'enable RAD load/save': [get_option('radiance')],
+     'enable Analyze7 load/save': [get_option('analyze')],
+     'enable PPM load/save': [get_option('ppm')],
+     'enable GIF load': [get_option('nsgif')],
+    },
+  'Optional external packages':
+    {'use fftw for FFTs': [fftw_dep.found()],
+     'accelerate loops with ORC': [orc_dep.found()],
+     'ICC profile support with lcms': [lcms_dep.found()],
+     'zlib': [zlib_dep.found()],
+     'text rendering with pangocairo': [pangocairo_dep.found()],
+     'font file support with fontconfig': [fontconfig_found],
+     'EXIF metadata support with libexif': [libexif_dep.found()],
+    },
+  'External image format libraries':
+    {'JPEG load/save with libjpeg': [libjpeg_dep.found()],
+     'JXL load/save with libjxl': [libjxl_found, ' (dynamic module: ', libjxl_module, ')'],
+     'JPEG2000 load/save with OpenJPEG': [libopenjp2_dep.found()],
+     'PNG load/save with libspng': [spng_found],
+     'PNG load/save with libpng': [png_dep.found()],
+     'selected quantisation package': [quantisation_package.found() ? quantisation_package.name() : 'none'],
+     'TIFF load/save with libtiff': [libtiff_dep.found()],
+     'image pyramid save with libgsf': [gsf_dep.found()],
+     'HEIC/AVIF load/save with libheif': [libheif_dep.found(), ' (dynamic module: ', libheif_module, ')'],
+     'WebP load/save with libwebp': [libwebp_dep.found()],
+     'PDF load with PDFium': [pdfium_dep.found()],
+     'PDF load with poppler-glib': [libpoppler_found, ' (dynamic module: ', libpoppler_module, ')'],
+     'SVG load with librsvg': [librsvg_found],
+     'EXR load with OpenEXR': [openexr_dep.found()],
+     'OpenSlide load': [openslide_dep.found(), ' (dynamic module: ', openslide_module, ')'],
+     'Matlab load with libmatio': [matio_dep.found()],
+     'NIfTI load/save with niftiio': [libnifti_found],
+     'FITS load/save with cfitsio': [cfitsio_dep.found()],
+     'GIF save with cgif': [cgif_dep.found()],
+     'selected Magick package': [magick_found ? magick_dep.name() : 'none', ' (dynamic module: ', magick_module, ')'],
+     'Magick API version': [magick_found ? 'magick' + magick_dep.version().split('.')[0] : 'none'],
+     'Magick load': [magick_found and 'load' in get_option('magick-features')],
+     'Magick save': [magick_found and 'save' in get_option('magick-features')],
+    },
+}
+
+foreach section_title, section : build_summary
+    summary(section, bool_yn: true, list_sep: '', section: section_title)
+endforeach
+
 subdir('libvips')
 if get_option('gtk_doc')
    subdir('doc')