From d549d68c895a960debacadd8b7d34058de8c32a8 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 9 Mar 2025 18:12:58 -0400
Subject: [PATCH 1/2] Only pass through scaling parameters when needed

---
 dobu-run.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dobu-run.sh b/dobu-run.sh
index 5aca253..05c8114 100755
--- a/dobu-run.sh
+++ b/dobu-run.sh
@@ -40,6 +40,12 @@ if [ "$(get_image_label "$image_name" net.typeblog.dobu.x11_required)" == "true"
   x11_required=true
 fi
 
+scaling_params_required=false
+
+if [ "$(get_image_label "$image_name" net.typeblog.dobu.scaling_params_required)" == "true" ]; then
+  scaling_params_required=true
+fi
+
 if [[ -n $PULSE_SERVER ]]; then # remove prefix
   host_pulse=${PULSE_SERVER#unix:}
 else # default guess
@@ -90,6 +96,11 @@ if $x11_required; then
   extra_args="$extra_args -v ${XORG_SRC}:/tmp/.X11-unix/X0 -e DISPLAY=:0"
 fi
 
+# Same for scaling params
+if $scaling_params_required; then
+  extra_args="$extra_args -e GDK_SCALE=$GDK_SCALE -e QT_SCALE_FACTOR=$QT_SCALE_FACTOR -e QT_SCREEN_SCALE_FACTORS=$QT_SCREEN_SCALE_FACTORS -e QT_AUTO_SCREEN_SCALE_FACTOR=$QT_AUTO_SCREEN_SCALE_FACTOR"
+fi
+
 # Expose Pipewire socket if it exists
 if [ -S "$XDG_RUNTIME_DIR/pipewire-0" ]; then
   extra_args="$extra_args -v $XDG_RUNTIME_DIR/pipewire-0:/xdg_runtime/pipewire-0"
@@ -141,11 +152,6 @@ podman run --rm "${podman_security_args[@]}" --name "$container_name" \
     -e TZ="$(date +%Z)" \
     `# SHM is needed by some browser engines (such as CEF used by Steam)`\
     --shm-size=1G \
-    `# Scaling parameters` \
-    -e GDK_SCALE="$GDK_SCALE" \
-    -e QT_SCALE_FACTOR="$QT_SCALE_FACTOR" \
-    -e QT_SCREEN_SCALE_FACTORS="$QT_SCREEN_SCALE_FACTORS" \
-    -e QT_AUTO_SCREEN_SCALE_FACTOR="$QT_AUTO_SCREEN_SCALE_FACTOR" \
     `# Use podman's init stub inside the container for better control` \
     --init \
     $extra_args "$image_name"

From 5e6c7a35cbb5c6f5a392bcbe7ca31e3097126c74 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 9 Mar 2025 18:31:37 -0400
Subject: [PATCH 2/2] Upgrade prismlauncher to use Ubuntu Oracular

---
 apps/prismlauncher/Containerfile     | 2 +-
 apps/prismlauncher/README.md         | 1 +
 apps/prismlauncher/prebuilt-mpr.list | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 apps/prismlauncher/README.md

diff --git a/apps/prismlauncher/Containerfile b/apps/prismlauncher/Containerfile
index bed4169..147ec0a 100644
--- a/apps/prismlauncher/Containerfile
+++ b/apps/prismlauncher/Containerfile
@@ -1,4 +1,4 @@
-FROM dobu/deps-base-ubuntu-jammy:latest
+FROM dobu/deps-base-ubuntu-oracular:latest
 
 ARG UPSTREAM_VERSION
 
diff --git a/apps/prismlauncher/README.md b/apps/prismlauncher/README.md
new file mode 100644
index 0000000..7bffce9
--- /dev/null
+++ b/apps/prismlauncher/README.md
@@ -0,0 +1 @@
+This image does not have the X11 socket passed through because Minecraft can use native Wayland via the system GLFW option (Workarounds > Native Settings > Use system GLFW) in PrismLauncher.
diff --git a/apps/prismlauncher/prebuilt-mpr.list b/apps/prismlauncher/prebuilt-mpr.list
index c3b4ed7..34e1e95 100644
--- a/apps/prismlauncher/prebuilt-mpr.list
+++ b/apps/prismlauncher/prebuilt-mpr.list
@@ -1 +1 @@
-deb [signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr jammy
+deb [signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr oracular