asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #69592 from bruvzg/fix_no_fc

Browse source 
[Linux/BSD] Fix build without fontconfig.
This commit is contained in:
Rémi Verschelde 2022-12-05 07:41:56 +01:00 committed by GitHub
commit 63578e208c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/linuxbsd/os_linuxbsd.cpp
View file

@ -616,6 +616,7 @@ Vector<String> OS_LinuxBSD::get_system_fonts() const {
#endif #endif
} }
#ifdef FONTCONFIG_ENABLED
int OS_LinuxBSD::_weight_to_fc(int p_weight) const { int OS_LinuxBSD::_weight_to_fc(int p_weight) const {
if (p_weight < 150) { if (p_weight < 150) {
return FC_WEIGHT_THIN; return FC_WEIGHT_THIN;
@ -665,6 +666,7 @@ int OS_LinuxBSD::_stretch_to_fc(int p_stretch) const {
return FC_WIDTH_ULTRAEXPANDED; return FC_WIDTH_ULTRAEXPANDED;
} }
} }
#endif // FONTCONFIG_ENABLED
Vector<String> OS_LinuxBSD::get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale, const String &p_script, int p_weight, int p_stretch, bool p_italic) const { Vector<String> OS_LinuxBSD::get_system_font_path_for_text(const String &p_font_name, const String &p_text, const String &p_locale, const String &p_script, int p_weight, int p_stretch, bool p_italic) const {
#ifdef FONTCONFIG_ENABLED #ifdef FONTCONFIG_ENABLED

6
platform/linuxbsd/os_linuxbsd.h
View file

@ -51,6 +51,9 @@ class OS_LinuxBSD : public OS_Unix {
bool font_config_initialized = false; bool font_config_initialized = false;
FcConfig *config = nullptr; FcConfig *config = nullptr;
FcObjectSet *object_set = nullptr; FcObjectSet *object_set = nullptr;
int _weight_to_fc(int p_weight) const;
int _stretch_to_fc(int p_stretch) const;
#endif #endif
#ifdef JOYDEV_ENABLED #ifdef JOYDEV_ENABLED
@ -73,9 +76,6 @@ class OS_LinuxBSD : public OS_Unix {
MainLoop *main_loop = nullptr; MainLoop *main_loop = nullptr;
int _weight_to_fc(int p_weight) const;
int _stretch_to_fc(int p_stretch) const;
String get_systemd_os_release_info_value(const String &key) const; String get_systemd_os_release_info_value(const String &key) const;
Vector<String> lspci_device_filter(Vector<String> vendor_device_id_mapping, String class_suffix, String check_column, String whitelist) const; Vector<String> lspci_device_filter(Vector<String> vendor_device_id_mapping, String class_suffix, String check_column, String whitelist) const;