diff --git a/apps/prismlauncher/Containerfile b/apps/prismlauncher/Containerfile index 147ec0a..bed4169 100644 --- a/apps/prismlauncher/Containerfile +++ b/apps/prismlauncher/Containerfile @@ -1,4 +1,4 @@ -FROM dobu/deps-base-ubuntu-oracular:latest +FROM dobu/deps-base-ubuntu-jammy:latest ARG UPSTREAM_VERSION diff --git a/apps/prismlauncher/README.md b/apps/prismlauncher/README.md deleted file mode 100644 index 7bffce9..0000000 --- a/apps/prismlauncher/README.md +++ /dev/null @@ -1 +0,0 @@ -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 34e1e95..c3b4ed7 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 oracular +deb [signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr jammy diff --git a/dobu-run.sh b/dobu-run.sh index 05c8114..5aca253 100755 --- a/dobu-run.sh +++ b/dobu-run.sh @@ -40,12 +40,6 @@ 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 @@ -96,11 +90,6 @@ 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" @@ -152,6 +141,11 @@ 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"