fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson.build |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ad0ce15aabe4912a92894f1b81745b06eb4042dd
Merge: 3b4641a 3bbaea1
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 3 06:07:56 2024 +0000

    Merge branch 'android_default_dirs' into 'main'
    
    meson: added default font dirs for android
    
    See merge request fontconfig/fontconfig!325

commit 3bbaea1ec8d7535f294446841dddbb0e0f9ba3e7
Author: Florian "sp1rit"​ <sp1rit at disroot.org>
Date:   Tue Jul 2 14:07:42 2024 +0200

    meson: added default font dirs for android
    
    Android fonts are stored in "/system/fonts/" and sometimes
    "/product/fonts/", depening on the vendor.
    
    Newer versions also provide a "/data/fonts/" directory, but it behaves
    differently to the older ones (at least on my device it has two
    subdirectories "config" and "files", both of which are empty; so I
    haven't added support to it)
    
    See https://source.android.com/docs/core/fonts/custom-font-fallback
    
    Signed-off-by: Florian "sp1rit"​ <sp1rit at disroot.org>

diff --git a/meson.build b/meson.build
index 44ed8cb..6a58a93 100644
--- a/meson.build
+++ b/meson.build
@@ -316,6 +316,8 @@ if default_fonts_dirs == ['yes']
     fc_fonts_paths = ['WINDOWSFONTDIR', 'WINDOWSUSERFONTDIR']
   elif host_machine.system() == 'darwin'
     fc_fonts_paths = ['/System/Library/Fonts', '/Library/Fonts', '~/Library/Fonts', '/System/Library/Assets/com_apple_MobileAsset_Font3', '/System/Library/Assets/com_apple_MobileAsset_Font4']
+  elif host_machine.system() == 'android'
+    fc_fonts_paths = ['/system/fonts/', '/product/fonts/']
   else
     fc_fonts_paths = ['/usr/share/fonts', '/usr/local/share/fonts']
   endif