diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-09-28 20:10:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 20:10:47 -0400 |
| commit | 2e3aad41aa9444c07fdf7df7a121dba3a18509a4 (patch) | |
| tree | 840968d7b6d676e0b3263011bd7abf9f12036f8d | |
| parent | 9015a512c275e8d7979715632bf5ae67fe3adf2f (diff) | |
| parent | ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc (diff) | |
Merge pull request #8993 from lat9nq/drop-linuxdeploy
ci/linux: Drop linuxdeploy usage
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index e85dba0291..67726ee0fb 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -33,16 +33,14 @@ DESTDIR="$PWD/AppDir" ninja install rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester # Download tools needed to build an AppImage -wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-x86_64.AppImage -wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/linuxdeploy-plugin-qt-x86_64.AppImage +wget -nc https://raw.githubusercontent.com/lat9nq/deploy/main/linux/deploy-linux.sh wget -nc https://raw.githubusercontent.com/yuzu-emu/AppImageKit-checkrt/old/AppRun.sh wget -nc https://github.com/yuzu-emu/ext-linux-bin/raw/main/appimage/exec-x86_64.so # Set executable bit chmod 755 \ + deploy-linux.sh \ AppRun.sh \ exec-x86_64.so \ - linuxdeploy-x86_64.AppImage \ - linuxdeploy-plugin-qt-x86_64.AppImage # Workaround for https://github.com/AppImage/AppImageKit/issues/828 export APPIMAGE_EXTRACT_AND_RUN=1 @@ -52,7 +50,7 @@ mkdir -p AppDir/usr/optional/libstdc++ mkdir -p AppDir/usr/optional/libgcc_s # Deploy yuzu's needed dependencies -./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt +DEPLOY_QT=1 ./deploy-linux.sh AppDir/usr/bin/yuzu AppDir # Workaround for libQt5MultimediaGstTools indirectly requiring libwayland-client and breaking Vulkan usage on end-user systems find AppDir -type f -regex '.*libwayland-client\.so.*' -delete -print |