conf.d/Makefile.am | 2 ++
conf.d/meson.build | 13 +++++++++++++
configure.ac | 24 ++++++++++++++++++++++++
meson_options.txt | 3 +++
4 files changed, 42 insertions(+)
New commits:
commit 78e0166200d40eed30dc175473e9a525e8cf80af
Merge: af4dad4 15cf5fb
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri May 30 06:44:39 2025 +0000
Merge branch 'issues/474' into 'main'
Add bitmap-conf build option to choose default bitmap conf
Closes #474
See merge request fontconfig/fontconfig!416
commit 15cf5fb89701fd662231bc541e84696559fd26e0
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri May 30 14:59:48 2025 +0900
Add bitmap-conf build option to choose default bitmap conf
To allow users to choose one of 70-yes-bitmaps.conf,
70-no-bitmaps-and-emoji.conf, or 70-no-bitmaps-except-emoji.conf
for default installation.
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/474
Changelog: added
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index e9b3ddc..6a27cf6 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -52,6 +52,8 @@ CONF_LINKS = \
80-delicious.conf \
90-synthetic.conf
+CONF_LINKS += 70-$(PREFERRED_BITMAP).conf
+
EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
CLEANFILES = $(DOC_FILES)
diff --git a/conf.d/meson.build b/conf.d/meson.build
index 66699fd..6da0786 100644
--- a/conf.d/meson.build
+++ b/conf.d/meson.build
@@ -46,6 +46,7 @@ conf_files = [
preferred_hinting = get_option('default-hinting')
preferred_sub_pixel_rendering = get_option('default-sub-pixel-rendering')
+preferred_bitmap = get_option('bitmap-conf')
conf_links = [
'10-hinting-@0@.conf'.format(preferred_hinting),
@@ -71,6 +72,18 @@ conf_links = [
'90-synthetic.conf',
]
+bitmap_conf_options = {
+ 'yes': 'yes-bitmaps',
+ 'no': 'no-bitmaps-and-emoji',
+ 'no-except-emoji': 'no-bitmaps-except-emoji'
+}
+
+foreach opt, configfile : bitmap_conf_options
+ if opt == preferred_bitmap
+ conf_links += '70-@0@.conf'.format(configfile)
+ endif
+endforeach
+
install_data(conf_files,
install_dir: fc_templatedir,
install_tag: 'runtime')
diff --git a/configure.ac b/configure.ac
index eb7b712..215537f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,6 +483,30 @@ none|slight|medium|full)
;;
esac
+#
+# default bitmap config
+#
+
+AC_ARG_WITH(bitmap-conf,
+ [AS_HELP_STRING([--with-bitmap-conf=NAME],[Enable your preferred bitmap related configuration (yes/no/no-except-emoji) [default=no-except-emoji]])],
+ preferred_bitmap="$withval", preferred_bitmap=no-except-emoji)
+
+case "$preferred_bitmap" in
+yes)
+ PREFERRED_BITMAP="yes-bitmaps"
+ ;;
+no)
+ PREFERRED_BITMAP="no-bitmaps-and-emoji"
+ ;;
+no-except-emoji)
+ PREFERRED_BITMAP="no-bitmaps-except-emoji"
+ ;;
+*)
+ AC_MSG_ERROR([Invalid bitmap config. please choose one of yes, no, or no-except-emoji])
+ ;;
+esac
+AC_SUBST(PREFERRED_BITMAP)
+
#
# Set default font directory
#
diff --git a/meson_options.txt b/meson_options.txt
index d148621..463933b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -26,6 +26,9 @@ option('default-hinting', type: 'combo', choices: ['none', 'slight', 'medium', '
option('default-sub-pixel-rendering', type: 'combo', choices: ['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',
+ description: 'What bitmap font related config file enabled by default: See 70-*bitmaps*.conf')
+
option('default-fonts-dirs', type: 'array', value: ['yes'],
description: 'Use fonts from DIR1,DIR2,... when config is busted (set to "yes" for generic system-specific defaults)')
