diff options
| author | lat9nq <[email protected]> | 2022-09-26 00:29:38 -0400 |
|---|---|---|
| committer | lat9nq <[email protected]> | 2022-09-26 00:35:03 -0400 |
| commit | ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc (patch) | |
| tree | f58e2cd28b179039c1486fde91d666467d0bf3f5 /.ci | |
| parent | 1b1b99fbd5b1c2fbe4a99c90f5bf73b4502e7c9e (diff) | |
| download | yuzu-android-ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc.tar.gz yuzu-android-ad9f97cd8dbdaa95ef11418b699f74e57f37cbbc.zip | |
ci/linux: Drop linuxdeploy usage
Recent versions of Docker appear to cause the Qt linuxdeploy plugin to
throw a boost file copy error.
This switches from linuxdeploy to a script of mine I've been working on
for a while.
Diffstat (limited to '.ci')
| -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 e85dba029..67726ee0f 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 |