appimage: add support for running with --platform argument, to invoke the relevant qpa scripts

Author: jcelerier

cmake/Deployment/Linux/AppImage/AppRun

@@ -1,4 +1,16 @@
 #!/bin/sh
 export LD_LIBRARY_PATH="${APPIMAGE_LIBRARY_PATH}:${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
 "${APPDIR}/usr/bin/linuxcheck" "${APPDIR}/usr/bin/ossia-score"
-exec "${APPDIR}/usr/bin/ossia-score" "$@"
+
+APP_SUFFIX=""
+
+[[ "$@" =~ '--platform=cli' ]] && APP_SUFFIX=-cli
+[[ "$@" =~ '--platform=x11' ]] && APP_SUFFIX=-x11
+[[ "$@" =~ '--platform=wayland' ]] && APP_SUFFIX=-wayland
+[[ "$@" =~ '--platform=eglfs' ]] && APP_SUFFIX=-eglfs
+[[ "$@" =~ '--platform=vkkhrdisplay' ]] && APP_SUFFIX=-vkkhrdisplay
+[[ "$@" =~ '--platform=vulkan' ]] && APP_SUFFIX=-vkkhrdisplay
+[[ "$@" =~ '--platform=vnc' ]] && APP_SUFFIX=-vnc
+[[ "$@" =~ '--platform=help' ]] && echo "Valid options for --ui-mode: cli, x11, wayland, eglfs, vkkhrdisplay, vnc" && exit 1
+
+exec "${APPDIR}/usr/bin/ossia-score${APP_SUFFIX}" "$@"

cmake/Deployment/Linux/AppImage/Recipe.llvm

@@ -61,7 +61,8 @@ cmake --install . --component Devel --prefix "$SDK_DIR/usr"
   find . -name '*.a' -exec rm -rf {} \;
 )
 
-
+# Copy helper scripts
+cp "$SOURCE_DIR/cmake/Deployment/Linux/Raspberry/*" "$APP_DIR/usr/bin/"
 
 # Copy pixmaps
 cp "$APP_DIR/usr/share/applications/ossia-score.desktop" "$APP_DIR/"

cmake/Deployment/Linux/Raspberry/ossia-score-cli

@@ -8,9 +8,6 @@ DIR=$(dirname "$DIR")
 
 source "$DIR/setup-dependencies.sh"
 
-export MESA_GLES_VERSION_OVERRIDE=3.2
-export MESA_GLSL_VERSION_OVERRIDE=320
-export LD_LIBRARY_PATH="$DIR/lib"
 export QT_QPA_PLATFORM=minimal
 
-"$DIR/bin/ossia-score" --no-gui --no-restore $@
+"$DIR/ossia-score" --no-opengl --no-gui --no-restore $@

cmake/Deployment/Linux/Raspberry/ossia-score-eglfs

@@ -2,8 +2,9 @@
 
 # This script will run ossia score directly on DRM & EGLFS,
 # without using X11, Wayland or anything like this.
-# This is the most efficient way to playback scores that use the GPU on a Pi
+# This is almost most efficient way to playback scores that use the GPU on a Pi
 # as the entirety of the GPU is dedicated to the graphics rendering of score.
+# (The most efficient is through the Vulkan vkkhrdisplay backend which gives a small additional edge).
 # Note that the Qt EGLFS back-end is fairly configurable: if multiple screens
 # or special resolution is required, check out the documentation here:
 # https://doc.qt.io/qt-6/embedded-linux.html
@@ -13,9 +14,13 @@ DIR=$(dirname "$DIR")
 
 source "$DIR/setup-dependencies.sh"
 
-export MESA_GLES_VERSION_OVERRIDE=3.2
-export MESA_GLSL_VERSION_OVERRIDE=320
-export LD_LIBRARY_PATH="$DIR/lib"
+if [[ -n MESA_GLES_VERSION_OVERRIDE ]]; then
+  export MESA_GLES_VERSION_OVERRIDE=3.2
+fi
+if [[ -n MESA_GLSL_VERSION_OVERRIDE ]]; then
+  export MESA_GLSL_VERSION_OVERRIDE=3.2
+fi
+
 export QT_QPA_PLATFORM=eglfs
 
-"$DIR/bin/ossia-score" $@ --no-opengl --no-gui
+"$DIR/ossia-score" $@ --no-opengl

cmake/Deployment/Linux/Raspberry/ossia-score-vnc

@@ -9,9 +9,8 @@ DIR=$(dirname "$DIR")
 
 source "$DIR/setup-dependencies.sh"
 
-export MESA_GLES_VERSION_OVERRIDE=3.2
-export MESA_GLSL_VERSION_OVERRIDE=320
-export LD_LIBRARY_PATH="$DIR/lib"
+# GL does not work in VNC so let's not bother too much with it
+export SCORE_DISABLE_SHADER_PREVIEW=1
 export QT_QPA_PLATFORM="vnc:size=1280x720"
 
-"$DIR/bin/ossia-score" $@
+"$DIR/ossia-score" $@ --no-opengl

cmake/Deployment/Linux/Raspberry/ossia-score-wayland

@@ -6,9 +6,13 @@ DIR=$(dirname "$DIR")
 
 source "$DIR/setup-dependencies.sh"
 
-export MESA_GLES_VERSION_OVERRIDE=3.2
-export MESA_GLSL_VERSION_OVERRIDE=320
-export LD_LIBRARY_PATH="$DIR/lib"
+if [[ -n MESA_GLES_VERSION_OVERRIDE ]]; then
+  export MESA_GLES_VERSION_OVERRIDE=3.2
+fi
+if [[ -n MESA_GLSL_VERSION_OVERRIDE ]]; then
+  export MESA_GLSL_VERSION_OVERRIDE=3.2
+fi
+
 export QT_QPA_PLATFORM=wayland
 
-"$DIR/bin/ossia-score" $@
+"$DIR/ossia-score" $@

cmake/Deployment/Linux/Raspberry/ossia-score-x11

@@ -6,9 +6,13 @@ DIR=$(dirname "$DIR")
 
 source "$DIR/setup-dependencies.sh"
 
-export MESA_GLES_VERSION_OVERRIDE=3.2
-export MESA_GLSL_VERSION_OVERRIDE=320
-export LD_LIBRARY_PATH="$DIR/lib"
+if [[ -n MESA_GLES_VERSION_OVERRIDE ]]; then
+  export MESA_GLES_VERSION_OVERRIDE=3.2
+fi
+if [[ -n MESA_GLSL_VERSION_OVERRIDE ]]; then
+  export MESA_GLSL_VERSION_OVERRIDE=3.2
+fi
+
 export QT_QPA_PLATFORM=xcb
 
-"$DIR/bin/ossia-score" $@
+"$DIR/ossia-score" $@