From 35bf20065ebe07889455bcc5a4473ec844c6bcbc Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Wed, 5 Apr 2023 11:58:04 +0200
Subject: [PATCH] AppRun: use get_loader() from preload.sh

---
 data/scripts/Linux-AppImage/AppRun | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/data/scripts/Linux-AppImage/AppRun b/data/scripts/Linux-AppImage/AppRun
index b8dc30b9f..2e05ea680 100755
--- a/data/scripts/Linux-AppImage/AppRun
+++ b/data/scripts/Linux-AppImage/AppRun
@@ -101,25 +101,13 @@ handle_updates() {
         printf "\n"
 }
 
-get_dynamic_loader() {
-        LOADER_LIST='/lib64/ld-linux-*so* /lib/ld-linux-*so* /lib*/ld-linux-*so*'
-        for LOADER in $LOADER_LIST; do
-                for n in $LOADER; do
-                        if [ -x "$n" ]; then
-                                echo "$n"
-                                return
-                        fi
-                done
-        done
-}
-
 ## Tries to find system libva. If found it is preloaded (+libva-drm+libva-x11)
 ## @retval 0 if preloaded; 1 otherwise
 set_libva_ld_preload() {
         if [ ! -f "$AI_LIB_PATH/ultragrid/ultragrid_vcompress_libavcodec.so" ]; then
                 return 0
         fi
-        LOADER=$(get_dynamic_loader)
+        LOADER=$(get_loader)
         if [ ! -x "$LOADER" ]; then
                 return 1
         fi
@@ -215,10 +203,10 @@ get_custom_firejail_rules() {
         fi
 }
 
-setup_vaapi
-setup_wayland
 # shellcheck source=/dev/null
 . "$DIR/scripts/preload.sh"
+setup_vaapi
+setup_wayland
 # ultragrid_aplay_jack.so is not used because it loads JACK with dlopen,
 # while portaudio is linked directly to JACK library
 set_ld_preload ultragrid_aplay_portaudio.so libjack