[Scummvm-git-logs] scummvm master -> a6a5b8ab4272d9a1551eacbfd2a0ff7a3bebe0e8

[mikrosk]

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

Summary:
a6a5b8ab42 BACKENDS: ATARI: Handle themes in installation script


Commit: a6a5b8ab4272d9a1551eacbfd2a0ff7a3bebe0e8
    https://github.com/scummvm/scummvm/commit/a6a5b8ab4272d9a1551eacbfd2a0ff7a3bebe0e8
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2023-05-11T00:03:44+02:00

Commit Message:
BACKENDS: ATARI: Handle themes in installation script

- "fat" version uses repacked (zip -0) archives; also separate "data"
  and "themes" folders
- "slim" version doesn't use any external themes (for speed reasons)

Changed paths:
    backends/graphics/atari/atari-graphics.cpp
    backends/platform/atari/build-release.sh
    backends/platform/atari/build-release030.sh
    backends/platform/atari/readme.txt


diff --git a/backends/graphics/atari/atari-graphics.cpp b/backends/graphics/atari/atari-graphics.cpp
index 1907963226e..be38c21b06f 100644
--- a/backends/graphics/atari/atari-graphics.cpp
+++ b/backends/graphics/atari/atari-graphics.cpp
@@ -57,11 +57,10 @@ AtariGraphicsManager::AtariGraphicsManager() {
 	if (!ConfMan.hasKey("gui_theme"))
 		ConfMan.set("gui_theme", "builtin");
 
-	// make "data" the default theme path (defining DATA_PATH as "data"
-	// is forbidden, it must be an absolute path, see bug #14174)
-	ConfMan.registerDefault("themepath", "data");
+	// make "themes" the default theme path
+	ConfMan.registerDefault("themepath", "themes");
 	if (!ConfMan.hasKey("themepath"))
-		ConfMan.set("themepath", "data");
+		ConfMan.set("themepath", "themes");
 
 	ConfMan.flushToDisk();
 
diff --git a/backends/platform/atari/build-release.sh b/backends/platform/atari/build-release.sh
index bdccd9ba66f..d67c57014bc 100755
--- a/backends/platform/atari/build-release.sh
+++ b/backends/platform/atari/build-release.sh
@@ -33,3 +33,17 @@ fi
 make -j 16
 rm -rf dist-generic
 make dist-generic
+
+# move themes into 'themes' folder (with compression level zero for faster depacking)
+mkdir -p dist-generic/scummvm/themes
+cd dist-generic/scummvm/themes
+(
+for f in ../data/*.zip
+do
+	unzip -d tmp "$f" && cd tmp && zip -0 ../$(basename "$f") * && cd .. && rm -r tmp && rm "$f"
+done
+)
+cd -
+
+# readme.txt
+cp ../backends/platform/atari/readme.txt dist-generic/scummvm
diff --git a/backends/platform/atari/build-release030.sh b/backends/platform/atari/build-release030.sh
index bc082f17915..90744f31879 100755
--- a/backends/platform/atari/build-release030.sh
+++ b/backends/platform/atari/build-release030.sh
@@ -34,3 +34,9 @@ fi
 make -j 16
 rm -rf dist-generic
 make dist-generic
+
+# remove themes
+rm -f dist-generic/scummvm/data/*.zip
+
+# readme.txt
+cp ../backends/platform/atari/readme.txt dist-generic/scummvm
diff --git a/backends/platform/atari/readme.txt b/backends/platform/atari/readme.txt
index b5ff12760b3..aac310ed96c 100644
--- a/backends/platform/atari/readme.txt
+++ b/backends/platform/atari/readme.txt
@@ -279,9 +279,8 @@ Slow GUI
 Themes handling is quite slow - each theme must be depacked, each one contains
 quite a few XML files to parse and quite a few images to load/convert. That's
 the reason why the built-in one is used as default, it dramatically speeds up
-loading time. A compromise solution is to depack the theme in an equally named
-directory (i.e. avoiding the depacking phase) but you need a filesystem with
-long name support for that to work.
+loading time. To speed things up in other cases, the "fat" version is
+distributed with repackaged theme files with compression level zero.
 
 
 Known issues