[Scummvm-git-logs] scummvm master -> 90bd56e409cafa5663408d3d84d0a0d47881cdcd

sev- noreply at scummvm.org
Mon Nov 20 20:00:23 UTC 2023 

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
93ee688544 GUI: Split out CJK fonts into fonts-cjk directory
0c317c7dc3 DISTS: Generated fonts-cjk.dat, regenerated fonts.dat
0e18527d36 GRAPHICS: Use fonts-cjk.dat for loading path
90bd56e409 BUILD: Added fonts-cjk.dat to selected platforms


Commit: 93ee6885448e4f94394d3657f133fd3e71348e47
    https://github.com/scummvm/scummvm/commit/93ee6885448e4f94394d3657f133fd3e71348e47
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-20T20:59:17+01:00

Commit Message:
GUI: Split out CJK fonts into fonts-cjk directory

Changed paths:
  A gui/themes/fonts-cjk/NotoSansJP-Bold.otf
  A gui/themes/fonts-cjk/NotoSansJP-Regular.otf
  A gui/themes/fonts-cjk/NotoSansKR-Bold.otf
  A gui/themes/fonts-cjk/NotoSansKR-Regular.otf
  A gui/themes/fonts-cjk/NotoSansSC-Bold.otf
  A gui/themes/fonts-cjk/NotoSansSC-Regular.otf
  A gui/themes/fonts-cjk/NotoSansTC-Bold.otf
  A gui/themes/fonts-cjk/NotoSansTC-Regular.otf
  A gui/themes/fonts-cjk/VL-Gothic-Regular.ttf
  A gui/themes/fonts-cjk/version.txt
  R gui/themes/fonts/NotoSansJP-Bold.otf
  R gui/themes/fonts/NotoSansJP-Regular.otf
  R gui/themes/fonts/NotoSansKR-Bold.otf
  R gui/themes/fonts/NotoSansKR-Regular.otf
  R gui/themes/fonts/NotoSansSC-Bold.otf
  R gui/themes/fonts/NotoSansSC-Regular.otf
  R gui/themes/fonts/NotoSansTC-Bold.otf
  R gui/themes/fonts/NotoSansTC-Regular.otf
  R gui/themes/fonts/VL-Gothic-Regular.ttf
    gui/themes/fonts/version.txt


diff --git a/gui/themes/fonts/NotoSansJP-Bold.otf b/gui/themes/fonts-cjk/NotoSansJP-Bold.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansJP-Bold.otf
rename to gui/themes/fonts-cjk/NotoSansJP-Bold.otf
diff --git a/gui/themes/fonts/NotoSansJP-Regular.otf b/gui/themes/fonts-cjk/NotoSansJP-Regular.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansJP-Regular.otf
rename to gui/themes/fonts-cjk/NotoSansJP-Regular.otf
diff --git a/gui/themes/fonts/NotoSansKR-Bold.otf b/gui/themes/fonts-cjk/NotoSansKR-Bold.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansKR-Bold.otf
rename to gui/themes/fonts-cjk/NotoSansKR-Bold.otf
diff --git a/gui/themes/fonts/NotoSansKR-Regular.otf b/gui/themes/fonts-cjk/NotoSansKR-Regular.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansKR-Regular.otf
rename to gui/themes/fonts-cjk/NotoSansKR-Regular.otf
diff --git a/gui/themes/fonts/NotoSansSC-Bold.otf b/gui/themes/fonts-cjk/NotoSansSC-Bold.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansSC-Bold.otf
rename to gui/themes/fonts-cjk/NotoSansSC-Bold.otf
diff --git a/gui/themes/fonts/NotoSansSC-Regular.otf b/gui/themes/fonts-cjk/NotoSansSC-Regular.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansSC-Regular.otf
rename to gui/themes/fonts-cjk/NotoSansSC-Regular.otf
diff --git a/gui/themes/fonts/NotoSansTC-Bold.otf b/gui/themes/fonts-cjk/NotoSansTC-Bold.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansTC-Bold.otf
rename to gui/themes/fonts-cjk/NotoSansTC-Bold.otf
diff --git a/gui/themes/fonts/NotoSansTC-Regular.otf b/gui/themes/fonts-cjk/NotoSansTC-Regular.otf
similarity index 100%
rename from gui/themes/fonts/NotoSansTC-Regular.otf
rename to gui/themes/fonts-cjk/NotoSansTC-Regular.otf
diff --git a/gui/themes/fonts/VL-Gothic-Regular.ttf b/gui/themes/fonts-cjk/VL-Gothic-Regular.ttf
similarity index 100%
rename from gui/themes/fonts/VL-Gothic-Regular.ttf
rename to gui/themes/fonts-cjk/VL-Gothic-Regular.ttf
diff --git a/gui/themes/fonts-cjk/version.txt b/gui/themes/fonts-cjk/version.txt
new file mode 100644
index 00000000000..2e0e38c63a6
--- /dev/null
+++ b/gui/themes/fonts-cjk/version.txt
@@ -0,0 +1 @@
+1.9
diff --git a/gui/themes/fonts/version.txt b/gui/themes/fonts/version.txt
index 6259340971b..2e0e38c63a6 100644
--- a/gui/themes/fonts/version.txt
+++ b/gui/themes/fonts/version.txt
@@ -1 +1 @@
-1.8
+1.9


Commit: 0c317c7dc34548b5e9f8af247b9e199a952972d2
    https://github.com/scummvm/scummvm/commit/0c317c7dc34548b5e9f8af247b9e199a952972d2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-20T20:59:17+01:00

Commit Message:
DISTS: Generated fonts-cjk.dat, regenerated fonts.dat

Changed paths:
  A dists/engine-data/fonts-cjk.dat
    devtools/module.mk
    dists/engine-data/fonts.dat


diff --git a/devtools/module.mk b/devtools/module.mk
index c351df7cb98..a85b6421497 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -51,6 +51,7 @@ wwwroot:
 # Rule to explicitly rebuild the fonts archive
 fonts.dat:
 	$(srcdir)/devtools/make-fonts-archive.py $(srcdir)/gui/themes/fonts $(srcdir)/dists/engine-data/fonts.dat
+	$(srcdir)/devtools/make-fonts-archive.py $(srcdir)/gui/themes/fonts-cjk $(srcdir)/dists/engine-data/fonts-cjk.dat
 
 #
 # Rules to explicitly rebuild the credits / MD5 tables.
diff --git a/dists/engine-data/fonts-cjk.dat b/dists/engine-data/fonts-cjk.dat
new file mode 100644
index 00000000000..d1a86a348e5
Binary files /dev/null and b/dists/engine-data/fonts-cjk.dat differ
diff --git a/dists/engine-data/fonts.dat b/dists/engine-data/fonts.dat
index 44ab03c8f05..f3a4f30febb 100644
Binary files a/dists/engine-data/fonts.dat and b/dists/engine-data/fonts.dat differ


Commit: 0e18527d36b6825e95b091395d85b75d95601748
    https://github.com/scummvm/scummvm/commit/0e18527d36b6825e95b091395d85b75d95601748
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-20T20:59:17+01:00

Commit Message:
GRAPHICS: Use fonts-cjk.dat for loading path

Changed paths:
    graphics/fonts/ttf.cpp


diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp
index ab09a892e1e..6836f3b5c0e 100644
--- a/graphics/fonts/ttf.cpp
+++ b/graphics/fonts/ttf.cpp
@@ -907,9 +907,29 @@ Font *loadTTFFontFromArchive(const Common::String &filename, int size, TTFSizeMo
 	}
 
 	Common::File f;
+
 	if (!f.open(filename, *archive)) {
 		delete archive;
-		return nullptr;
+
+		// Trying fonts-cjk.dat
+		if (ConfMan.hasKey("extrapath")) {
+			Common::FSDirectory extrapath(ConfMan.get("extrapath"));
+			archiveStream = extrapath.createReadStreamForMember("fonts-cjk.dat");
+		}
+
+		if (!archiveStream) {
+			archiveStream = SearchMan.createReadStreamForMember("fonts-cjk.dat");
+		}
+
+		archive = Common::makeZipArchive(archiveStream);
+		if (!archive) {
+			return nullptr;
+		}
+
+		if (!f.open(filename, *archive)) {
+			delete archive;
+			return nullptr;
+		}
 	}
 
 	Font *font = loadTTFFont(f, size, sizeMode, dpi, renderMode, mapping);


Commit: 90bd56e409cafa5663408d3d84d0a0d47881cdcd
    https://github.com/scummvm/scummvm/commit/90bd56e409cafa5663408d3d84d0a0d47881cdcd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-20T20:59:17+01:00

Commit Message:
BUILD: Added fonts-cjk.dat to selected platforms

So far, it was added to all modern desktops, Android, iOS and Switch

Changed paths:
    Makefile
    Makefile.common
    backends/platform/android/android.mk
    backends/platform/sdl/switch/switch.mk
    devtools/create_project/xcode.cpp
    dists/engine-data/README
    dists/scummvm.rc
    dists/win32/migration.txt
    ports.mk


diff --git a/Makefile b/Makefile
index 58db5b03a2a..507b408f0aa 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ endif
 
 .PHONY: print-dists print-executables print-version print-distversion
 print-dists:
-	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_PLATFORM) $(srcdir)/doc
+	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_PLATFORM) $(srcdir)/doc
 
 print-executables:
 	@echo $(if $(DIST_EXECUTABLES),$(DIST_EXECUTABLES),$(EXECUTABLE) $(PLUGINS))
diff --git a/Makefile.common b/Makefile.common
index 8d5ed21b695..491a036e3dd 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -502,6 +502,13 @@ ifdef ENABLE_AGI
 DIST_FILES_ENGINEDATA+=$(srcdir)/dists/pred.dic
 endif
 
+# fonts-cjk.dat is used only on systems with plenty of memory
+ifdef USE_FREETYPE2
+DIST_FILES_ENGINEDATA_BIG+=fonts-cjk.dat
+endif
+
+DIST_FILES_ENGINEDATA_BIG:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA_BIG))
+
 # Shaders: install if USE_OPENGL_SHADERS is defined
 DIST_FILES_SHADERS=
 ifneq ($(USE_OPENGL_SHADERS),)
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 00060e9e83c..c8a348b3510 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -27,9 +27,9 @@ $(PATH_BUILD_GRADLE): $(GRADLE_FILES) | $(PATH_BUILD)
 	$(ECHO) "android.enableJetifier=true\n" >> $(PATH_BUILD)/gradle.properties
 	$(ECHO) "sdk.dir=$(realpath $(ANDROID_SDK_ROOT))\n" > $(PATH_BUILD)/local.properties
 
-$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) | $(PATH_BUILD)
+$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) | $(PATH_BUILD)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) $(PATH_BUILD_ASSETS)/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_HELP) $(PATH_BUILD_ASSETS)/
 ifneq ($(DIST_FILES_SHADERS),)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)/shaders
 	$(INSTALL) -c -m 644 $(DIST_FILES_SHADERS) $(PATH_BUILD_ASSETS)/shaders
diff --git a/backends/platform/sdl/switch/switch.mk b/backends/platform/sdl/switch/switch.mk
index 5aa4b052fa5..2dbd47b88d7 100644
--- a/backends/platform/sdl/switch/switch.mk
+++ b/backends/platform/sdl/switch/switch.mk
@@ -10,6 +10,9 @@ switch_release: scummvm.nro
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) ./switch_release/scummvm/data
 endif
+ifdef DIST_FILES_ENGINEDATA_BIG
+	cp $(DIST_FILES_ENGINEDATA_BIG) ./switch_release/scummvm/data
+endif
 ifdef DIST_FILES_NETWORKING
 	cp $(DIST_FILES_NETWORKING) ./switch_release/scummvm/data
 endif
@@ -27,4 +30,3 @@ scummvm_switch.zip: switch_release
 	cd ./switch_release && zip -r ../scummvm_switch.zip . && cd ..
 
 .PHONY: scummvm.nro switch_release scummvm_switch.zip
-
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index add9efdf1ef..c3bcd2db849 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1033,6 +1033,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
 		files.push_back("dists/engine-data/drascula.dat");
 		files.push_back("dists/engine-data/encoding.dat");
 		files.push_back("dists/engine-data/fonts.dat");
+		files.push_back("dists/engine-data/fonts-cjk.dat");
 		files.push_back("dists/engine-data/freescape.dat");
 		files.push_back("dists/engine-data/hadesch_translations.dat");
 		files.push_back("dists/engine-data/hugo.dat");
diff --git a/dists/engine-data/README b/dists/engine-data/README
index 4d3927c5591..56366c668cf 100644
--- a/dists/engine-data/README
+++ b/dists/engine-data/README
@@ -34,6 +34,11 @@ fonts.dat:
 This file contains set of free TTF fonts used by Glk, ZVision, Wintermute engines and
 our GUI.
 
+fonts-cjk.dat:
+This file contains set of free CJK fonts (or other big ones), used in our GUI and
+some engines. This file is intended to be big, thus, not suitable for ports with
+memory constraints.
+
 grim-patch.lab:
 This file contains set of script patches for Grim Fandango game.
 
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 0ac7dccec90..41bfcfaca11 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -51,6 +51,7 @@ wwwroot.zip            FILE    "dists/networking/wwwroot.zip"
 #endif
 #ifdef USE_FREETYPE2
 fonts.dat              FILE    "dists/engine-data/fonts.dat"
+fonts-cjk.dat          FILE    "dists/engine-data/fonts-cjk.dat"
 #endif
 
 #if PLUGIN_ENABLED_STATIC(ACCESS)
diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt
index 530800c25b4..c39fcb77734 100644
--- a/dists/win32/migration.txt
+++ b/dists/win32/migration.txt
@@ -20,6 +20,7 @@ cryomni3d.dat
 drascula.dat
 encoding.dat
 fonts.dat
+fonts-cjk.dat
 freescape.dat
 grim-patch.lab
 gui-icons.dat
diff --git a/ports.mk b/ports.mk
index c76a67edf74..4fd3aa6bf52 100644
--- a/ports.mk
+++ b/ports.mk
@@ -15,7 +15,7 @@ install-data:
 	$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) "$(DESTDIR)$(datadir)/"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/org.scummvm.scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/org.scummvm.scummvm.desktop"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/metainfo"
@@ -66,6 +66,9 @@ dist-generic: $(EXECUTABLE) $(PLUGINS)
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) ./dist-generic/scummvm/data
 endif
+ifdef DIST_FILES_ENGINEDATA_BIG
+	cp $(DIST_FILES_ENGINEDATA_BIG) ./dist-generic/scummvm/data
+endif
 ifdef DIST_FILES_NETWORKING
 	cp $(DIST_FILES_NETWORKING) ./dist-generic/scummvm/data
 endif
@@ -154,6 +157,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/
 endif
+ifdef DIST_FILES_ENGINEDATA_BIG
+	cp $(DIST_FILES_ENGINEDATA_BIG) $(bundle_name)/Contents/Resources/
+endif
 ifdef DIST_FILES_VKEYBD
 	cp $(DIST_FILES_VKEYBD) $(bundle_name)/Contents/Resources/
 endif
@@ -285,6 +291,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
 endif
+ifdef DIST_FILES_ENGINEDATA_BIG
+	cp $(DIST_FILES_ENGINEDATA_BIG) $(bundle_name)/
+endif
 ifdef DIST_FILES_VKEYBD
 	cp $(DIST_FILES_VKEYBD) $(bundle_name)/
 endif
@@ -376,6 +385,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
 endif
+ifdef DIST_FILES_ENGINEDATA_BIG
+	cp $(DIST_FILES_ENGINEDATA_BIG) $(bundle_name)/
+endif
 ifdef DIST_FILES_VKEYBD
 	cp $(DIST_FILES_VKEYBD) $(bundle_name)/
 endif

More information about the Scummvm-git-logs mailing list