hdkv/yuzu
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge pull request #22 from qurious-pixel/patch-5

Browse Source 
GCC-11 Fixes
This commit is contained in:
MGThePro 2021-07-11 01:25:39 +02:00 committed by GitHub
commit 2c7191ed4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/AppRun vendored
View File

@ -1,17 +1,14 @@
#!/bin/bash #!/bin/bash
export QT_QPA_PLATFORMTHEME=gtk3
mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps mkdir -p $HOME/.local/share/icons/hicolor/scalable/apps && cp $APPDIR/yuzu.svg $HOME/.local/share/icons/hicolor/scalable/apps
GITVER=`wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "releases/tag" | grep -o 'EA-[[:digit:]]*'` GITVER=`wget -qO- https://api.github.com/repos/pineappleEA/pineapple-src/releases/latest | grep "releases/tag" | grep -o 'EA-[[:digit:]]*'`
APPVER=`cat $APPDIR/version.txt` APPVER=`cat $APPDIR/version.txt`
if [[ -z "$GITVER" ]]; then if [[ -z "$GITVER" ]]; then
$APPDIR/usr/bin/yuzu $APPDIR/AppRun-patched
elif [ "$GITVER" = "$APPVER" ]; then elif [ "$GITVER" = "$APPVER" ]; then
$APPDIR/usr/bin/yuzu $APPDIR/AppRun-patched
else else
$APPDIR/update.sh $APPDIR/update.sh
fi fi

28
.github/workflows/appimage.sh vendored
View File

@ -4,14 +4,8 @@ BUILDBIN=/yuzu/build/bin
BINFILE=yuzu-x86_64.AppImage BINFILE=yuzu-x86_64.AppImage
LOG_FILE=$HOME/curl.log LOG_FILE=$HOME/curl.log
BRANCH=`echo ${GITHUB_REF##*/}` BRANCH=`echo ${GITHUB_REF##*/}`
export CC=${GCC_BINARY}
# QT 5.14.2 export CXX=${GXX_BINARY}
# source /opt/qt514/bin/qt514-env.sh
QT_BASE_DIR=/opt/qt514
export QTDIR=$QT_BASE_DIR
export PATH=$QT_BASE_DIR/bin:$PATH
export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
cd /tmp cd /tmp
curl -sLO "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" curl -sLO "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
@ -25,7 +19,6 @@ cp -P "$BUILDBIN"/yuzu $HOME/squashfs-root/usr/bin/
curl -sL https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/dist/yuzu.svg -o ./squashfs-root/yuzu.svg curl -sL https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/dist/yuzu.svg -o ./squashfs-root/yuzu.svg
curl -sL https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/dist/yuzu.desktop -o ./squashfs-root/yuzu.desktop curl -sL https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/dist/yuzu.desktop -o ./squashfs-root/yuzu.desktop
sed -i -e 's#Exec=yuzu %f#Exec=env QT_QPA_PLATFORMTHEME=gtk3 yuzu %f#g' ./squashfs-root/yuzu.desktop
curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-x86_64 -o ./squashfs-root/runtime curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-x86_64 -o ./squashfs-root/runtime
mkdir -p squashfs-root/usr/share/applications && cp ./squashfs-root/yuzu.desktop ./squashfs-root/usr/share/applications mkdir -p squashfs-root/usr/share/applications && cp ./squashfs-root/yuzu.desktop ./squashfs-root/usr/share/applications
mkdir -p squashfs-root/usr/share/icons && cp ./squashfs-root/yuzu.svg ./squashfs-root/usr/share/icons mkdir -p squashfs-root/usr/share/icons && cp ./squashfs-root/yuzu.svg ./squashfs-root/usr/share/icons
@ -34,7 +27,6 @@ mkdir -p squashfs-root/usr/share/pixmaps && cp ./squashfs-root/yuzu.svg ./squash
curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/update.sh" -o $HOME/squashfs-root/update.sh curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/update.sh" -o $HOME/squashfs-root/update.sh
chmod a+x ./squashfs-root/runtime chmod a+x ./squashfs-root/runtime
chmod a+x ./squashfs-root/update.sh chmod a+x ./squashfs-root/update.sh
#cp /tmp/libssl.so.47 /tmp/libcrypto.so.45 /usr/lib/x86_64-linux-gnu/
version=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) version=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17)
echo EA-$version > $HOME/squashfs-root/version.txt echo EA-$version > $HOME/squashfs-root/version.txt
@ -46,20 +38,24 @@ unset QTDIR
mkdir $HOME/artifacts/ mkdir $HOME/artifacts/
mkdir -p /yuzu/artifacts/version mkdir -p /yuzu/artifacts/version
# Version AppImage # Version AppImage
curl -sL https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64 -o $HOME/squashfs-root/AppRun mkdir -p squashfs-root/usr/optional/{libstdc++,libgcc_s}
cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./squashfs-root/usr/optional/libstdc++/
cp /lib/libgcc_s.so.1 ./squashfs-root/usr/optional/libgcc_s/
curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/AppRun-patched-x86_64 -o ./squashfs-root/AppRun
chmod a+x ./squashfs-root/AppRun chmod a+x ./squashfs-root/AppRun
# /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -appimage -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs curl -sSfL https://github.com/RPCS3/AppImageKit-checkrt/releases/download/continuous2/exec-x86_64.so -o ./squashfs-root/usr/optional/exec.so
printf "#include <sstream>\n#include <exception>\n#include <memory_resource>\nint main(){auto x = std::stringbuf();x.get_allocator();std::make_exception_ptr(0);std::pmr::get_default_resource();}" \
| $CXX -x c++ -std=c++2a -o ./squashfs-root/usr/optional/checker -
# Build AppDir
/tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs /tmp/squashfs-root/AppRun $HOME/squashfs-root/usr/bin/yuzu -unsupported-allow-new-glibc -no-copy-copyright-files -no-translations -bundle-non-qt-libs
export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH export PATH=$(readlink -f /tmp/squashfs-root/usr/bin/):$PATH
mkdir $HOME/squashfs-root/usr/plugins/platformthemes/ mkdir $HOME/squashfs-root/usr/plugins/platformthemes/
cp /opt/qt514/plugins/platformthemes/libqgtk3.so $HOME/squashfs-root/usr/plugins/platformthemes/ cp /opt/qt515/plugins/platformthemes/libqgtk3.so $HOME/squashfs-root/usr/plugins/platformthemes/
mkdir $HOME/squashfs-root/dist/
cp /yuzu/dist/yuzu.ico $HOME/squashfs-root/dist/
/tmp/squashfs-root/usr/bin/appimagetool $HOME/squashfs-root /tmp/squashfs-root/usr/bin/appimagetool $HOME/squashfs-root
mv ./yuzu-x86_64.AppImage /yuzu/artifacts/version/Yuzu-EA-$version.AppImage mv ./yuzu-x86_64.AppImage /yuzu/artifacts/version/Yuzu-EA-$version.AppImage
# Continuous AppImage # Continuous AppImage
rm $HOME/squashfs-root/AppRun mv $HOME/squashfs-root/AppRun ./squashfs-root/AppRun-patched
curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/AppRun" -o $HOME/squashfs-root/AppRun curl -sL "https://raw.githubusercontent.com/$GITHUB_REPOSITORY/$BRANCH/.github/workflows/AppRun" -o $HOME/squashfs-root/AppRun
chmod a+x ./squashfs-root/AppRun chmod a+x ./squashfs-root/AppRun
mv /tmp/update/AppImageUpdate $HOME/squashfs-root/usr/bin/ mv /tmp/update/AppImageUpdate $HOME/squashfs-root/usr/bin/

3
.github/workflows/docker.sh vendored
View File

@ -1,12 +1,11 @@
#!/bin/bash -ex #!/bin/bash -ex
BRANCH=`echo ${GITHUB_REF##*/}` BRANCH=`echo ${GITHUB_REF##*/}`
build_date=$(date +%F -r .)
ver=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17) ver=$(cat /yuzu/README.md | grep -o 'early-access [[:digit:]]*' | cut -c 14-17)
title="yuzu Early Access $ver" title="yuzu Early Access $ver"
ln -s /home/yuzu/.conan /root
yuzupatch=( $(ls -d patches/* ) ) yuzupatch=( $(ls -d patches/* ) )
for i in "${yuzupatch[@]}"; do patch -p1 < "$i"; done for i in "${yuzupatch[@]}"; do patch -p1 < "$i"; done

6
.github/workflows/update.sh vendored
View File

@ -1,15 +1,13 @@
#!/bin/bash #!/bin/bash
export QT_QPA_PLATFORMTHEME=gtk3
zenity --question --timeout=10 --title="yuzu updater" --text="New update available. Update now?" --icon-name=yuzu --window-icon=yuzu.svg --height=80 --width=400 zenity --question --timeout=10 --title="yuzu updater" --text="New update available. Update now?" --icon-name=yuzu --window-icon=yuzu.svg --height=80 --width=400
answer=$? answer=$?
if [ "$answer" -eq 0 ]; then if [ "$answer" -eq 0 ]; then
$APPDIR/usr/bin/AppImageUpdate $PWD/yuzu-x86_64.AppImage && $PWD/yuzu-x86_64.AppImage $APPDIR/usr/bin/AppImageUpdate $PWD/yuzu-x86_64.AppImage && $PWD/yuzu-x86_64.AppImage
elif [ "$answer" -eq 1 ]; then elif [ "$answer" -eq 1 ]; then
$APPDIR/usr/bin/yuzu $APPDIR/AppRun-patched
elif [ "$answer" -eq 5 ]; then elif [ "$answer" -eq 5 ]; then
$APPDIR/usr/bin/yuzu $APPDIR/AppRun-patched
fi fi
exit 0 exit 0