umu-static-bundler: misc touchups

- update umu-launcher
- compile with debug output allowed (why not) (PYB_DEBUG=1 umu-run)
- add unique version identifier
- update python
- decrease severity of cleaner warning

umu-static-bundler/build.sh

@@ -25,13 +25,13 @@ source "${PROJECT_ROOT}/lib/git-utils.sh"
 
 # Source versions
 readonly PYTHON_VERSION="3.13.1"
-readonly STATIC_PYTHON_URL="https://github.com/indygreg/python-build-standalone/releases/download/20241206/cpython-${PYTHON_VERSION}+20241206-x86_64-unknown-linux-musl-install_only_stripped.tar.gz"
+readonly STATIC_PYTHON_URL="https://github.com/indygreg/python-build-standalone/releases/download/20250115/cpython-${PYTHON_VERSION}+20250115-x86_64-unknown-linux-musl-install_only_stripped.tar.gz"
 readonly LIBARCHIVE_VERSION="3.7.7"
 readonly LIBARCHIVE_URL="https://github.com/libarchive/libarchive/releases/download/v${LIBARCHIVE_VERSION}/libarchive-${LIBARCHIVE_VERSION}.tar.gz"
 readonly ZSTD_VERSION="1.5.6"
 readonly ZSTD_URL="https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.zst"
 readonly UMU_LAUNCHER_URL="https://github.com/Open-Wine-Components/umu-launcher.git"
-readonly UMU_LAUNCHER_VERSION="e9cb4d764013d4c8c3d1166f59581da8f56a3d83"
+readonly UMU_LAUNCHER_VERSION="7a71163b79e56222fe3f3097d1e71208a91a1a3b"
 
 parse_args() {
     local clean_build=false

umu-static-bundler/builder/python/cleaner.py

@@ -149,7 +149,7 @@ def analyze_imports(self) -> Tuple[Set[str], Dict[str, int]]:
                 runtime_imports.update(analyzer.runtime_imports)
                 file_stats['analyzed'] += 1
             except (SyntaxError, FileNotFoundError) as e:
-                self.logger.warning(f"Error analyzing {path}: {e}")
+                self.logger.warning(f"Warning: analyzing {path} raised {e}")
                 file_stats['errors'] += 1
 
         return runtime_imports, file_stats

umu-static-bundler/patches/umu/0002-umu-add-unique-version-specifier.patch

@@ -0,0 +1,21 @@
+From 8cc801f5d007535261a69648c91d0ca9718294f0 Mon Sep 17 00:00:00 2001
+From: William Horvath <[email protected]>
+Date: Fri, 31 Jan 2025 11:41:21 -0800
+Subject: [PATCH] umu: add unique version specifier
+
+---
+ umu/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/umu/__init__.py b/umu/__init__.py
+index e99a85c..7e05b9e 100644
+--- a/umu/__init__.py
++++ b/umu/__init__.py
+@@ -1,3 +1,3 @@
+-__version__ = "1.1.4"  # noqa: D104
++__version__ = "1.1.4.99"  # noqa: D104
+ __runtime_versions__ = (("sniper", "steamrt3"), ("soldier", "steamrt2"))
+ __runtime_version__ = __runtime_versions__[0]
+-- 
+2.48.1
+

umu-static-bundler/wrapper/include/logging.h

@@ -25,7 +25,7 @@ int log_get_colors(void);
  * - DEBUG defined at compile-time AND
  * - PYB_DEBUG=1 environment variable set at runtime
  */
-#ifdef DEBUG
+#ifndef NDEBUG
 #define log_debug(...) _log_debug(__VA_ARGS__)
 void _log_debug(const char *fmt, ...);
 #else

umu-static-bundler/wrapper/src/logging.c

@@ -100,7 +100,7 @@ static void write_log(log_level_t level, const char *fmt, va_list args) {
 }
 
 /* Public logging functions */
-#ifdef DEBUG
+#ifndef NDEBUG
 void _log_debug(const char *fmt, ...) {
   /* Skip if debug not enabled at runtime */
   if (!log_config.debug_enabled) {

umu-static-bundler/wrapper/src/main.c

@@ -6,7 +6,7 @@ int main(int argc, char *argv[]) {
   struct wrapper_config config;
   wrp_status_t status;
 
-#ifdef DEBUG
+#ifndef NDEBUG
   log_init(LOG_DEBUG, 1); /* Enable debug output in debug builds */
 #else
   log_init(LOG_INFO, 1); /* Default to info level for release */