fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 conf.d/meson.build |   10 ++++++++--
 meson.build        |    2 ++
 meson.options      |    6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 7081d61ea3caddf94f0602f4b0dba82b61e72085
Merge: fb14dc4 9bc4978
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 2 03:58:52 2025 +0000

    Merge branch 'noinstall' into 'main'
    
    meson: Add 'noinstall' to default-hinting, default-sub-pixel-rendering, bitmap-conf build options
    
    See merge request fontconfig/fontconfig!447

commit 9bc4978e31fc0686a53efb4f6e1f4943473a9e5e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Jul 1 18:35:05 2025 +0900

    meson: Add 'noinstall' to default-hinting, default-sub-pixel-rendering, bitmap-conf build options
    
    noinstall to make config more neutral, particularly for desktops
    
    Changelog: added

diff --git a/conf.d/meson.build b/conf.d/meson.build
index 6da0786..5d15532 100644
--- a/conf.d/meson.build
+++ b/conf.d/meson.build
@@ -49,9 +49,7 @@ preferred_sub_pixel_rendering = get_option('default-sub-pixel-rendering')
 preferred_bitmap = get_option('bitmap-conf')
 
 conf_links = [
-  '10-hinting- at 0@.conf'.format(preferred_hinting),
   '10-scale-bitmap-fonts.conf',
-  '10-sub-pixel- at 0@.conf'.format(preferred_sub_pixel_rendering),
   '10-yes-antialias.conf',
   '11-lcdfilter-default.conf',
   '20-unhint-small-vera.conf',
@@ -72,6 +70,14 @@ conf_links = [
   '90-synthetic.conf',
 ]
 
+if preferred_hinting != 'noinstall'
+  conf_links += '10-hinting- at 0@.conf'.format(preferred_hinting)
+endif
+
+if preferred_sub_pixel_rendering != 'noinstall'
+  conf_links += '10-sub-pixel- at 0@.conf'.format(preferred_sub_pixel_rendering)
+endif
+
 bitmap_conf_options = {
   'yes': 'yes-bitmaps',
   'no': 'no-bitmaps-and-emoji',
diff --git a/meson.build b/meson.build
index 63faa7b..606eb84 100644
--- a/meson.build
+++ b/meson.build
@@ -627,6 +627,8 @@ summary({
 }, section: 'General', bool_yn: true, list_sep: ', ')
 summary({
   'Hinting': preferred_hinting,
+  'Sub Pixel Rendering': preferred_sub_pixel_rendering,
+  'Bitmap': preferred_bitmap,
   'Font directories': fc_fonts_paths,
   'Additional font directories': fc_add_fonts,
 }, section: 'Defaults', bool_yn: true, list_sep: ', ')
diff --git a/meson.options b/meson.options
index 463933b..c3cc62b 100644
--- a/meson.options
+++ b/meson.options
@@ -20,13 +20,13 @@ option('fontations', type: 'feature', value: 'disabled',
   description: 'Use Fontations (https://github.com/googlefonts/fontations) for indexing.')
 
 # Defaults
-option('default-hinting', type: 'combo', choices: ['none', 'slight', 'medium', 'full'], value: 'slight',
+option('default-hinting', type: 'combo', choices: ['noinstall', 'none', 'slight', 'medium', 'full'], value: 'slight',
   description: 'Preferred hinting configuration')
 
-option('default-sub-pixel-rendering', type: 'combo', choices: ['none', 'bgr', 'rgb', 'vbgr', 'vrgb'], value: 'none',
+option('default-sub-pixel-rendering', type: 'combo', choices: ['noinstall', 'none', 'bgr', 'rgb', 'vbgr', 'vrgb'], value: 'none',
   description: 'Preferred sub-pixel rendering configuration')
 
-option('bitmap-conf', type: 'combo', choices: ['yes', 'no', 'no-except-emoji'], value: 'no-except-emoji',
+option('bitmap-conf', type: 'combo', choices: ['noinstall', 'yes', 'no', 'no-except-emoji'], value: 'no-except-emoji',
   description: 'What bitmap font related config file enabled by default: See 70-*bitmaps*.conf')
 
 option('default-fonts-dirs', type: 'array', value: ['yes'],