Compare commits

...

10 commits
dev ... main

Author SHA1 Message Date
3b4ac4e0a7
update 2024-03-17 2024-03-17 01:29:46 -03:00
84282e7919
Update 2024-03-10 21:52:10 -03:00
e6a2a386f1 testing. 2024-03-10 05:36:21 +00:00
f0e83624c0
chore: make persistent ccache cache 2024-03-09 21:23:49 -03:00
9756a68e96
fix: enable discord presence 2024-03-09 21:18:00 -03:00
26eb75eb63
fix: attempt to fix RapidJSON compilation. 2024-03-09 18:04:16 -03:00
c5369077fd
fix: Use -DSUYU variables, enable DiscordRPC and add RapidJSON. 2024-03-09 17:36:22 -03:00
195acb2e6a
Fix: Rename yuzu executable in suyu-launcher.sh 2024-03-09 15:59:32 -03:00
067f20ca68 Merge branch 'fix-flatpakref' into 'main'
fix: update flatpakref branch

See merge request suyu-emu/linux-package-sources/flatpak!1
2024-03-09 06:35:44 +00:00
Daniel Foster
5423e31231
fix: update flatpakref branch
Branch was set to dev, which is not the branch the flatpak is published on.
2024-03-08 19:50:47 +10:00
9 changed files with 57 additions and 23 deletions

View file

@ -19,6 +19,7 @@ stages:
- build
- deploy
# This will check for updates using external data checker and send PRs to the repo
update-sources:
stage: setup
@ -52,7 +53,13 @@ flatpak:
variables:
# Stable Flathub repo
RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
cache:
paths:
- ccache/
before_script:
- mkdir -p ccache
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache
# Sets up the stable Flathub repository for dependencies
- flatpak remote-add --user --if-not-exists flathub ${RUNTIME_REPO}
script:

View file

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View file

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 126 KiB

View file

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 144 KiB

View file

@ -1,7 +1,7 @@
[Flatpak Ref]
Title=org.suyu_emu.suyu Flatpak
Name=org.suyu_emu.suyu
Branch=dev
Branch=master
Url=https://suyu-emu.gitlab.io/linux-package-sources/flatpak
SuggestRemoteName=suyu-flatpak
Homepage=https://suyu.dev

View file

@ -259,6 +259,34 @@
}
]
},
{
"name": "rapidjson",
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_BUILD_TYPE=None",
"-DRAPIDJSON_HAS_STDSTRING=ON",
"-DRAPIDJSON_BUILD_CXX11=ON",
"-DRAPIDJSON_BUILD_DOC=OFF",
"-DRAPIDJSON_BUILD_EXAMPLES=OFF",
"-DRAPIDJSON_BUILD_TESTS=OFF"
],
"sources": [
{
"type": "archive",
"url": "https://github.com/Tencent/rapidjson/archive/v1.1.0/rapidjson-1.1.0.tar.gz",
"sha256": "bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e",
"x-checker-data": {
"type": "anitya",
"stable-only": true,
"versions": {
"=": "1.1.0"
},
"project-id": 7422,
"url-template": "https://github.com/Tencent/rapidjson/archive/v$version.tar.gz"
}
}
]
},
{
"name": "suyu",
"buildsystem": "cmake-ninja",
@ -267,18 +295,15 @@
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
"-DENABLE_QT_TRANSLATION=ON",
"-DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON",
"-DSUYU_ENABLE_COMPATIBILITY_REPORTING=ON",
"-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF",
"-DYUZU_USE_QT_WEB_ENGINE=ON",
"-DYUZU_USE_BUNDLED_FFMPEG=ON",
"-DSUYU_USE_QT_WEB_ENGINE=ON",
"-DSUYU_USE_BUNDLED_FFMPEG=ON",
"-DBUILD_TAG=dev",
"-DUSE_DISCORD_PRESENCE=ON",
"-DBUILD_REPOSITORY=suyu-emu/suyu"
],
"build-options": {
"env": {
"TITLEBARFORMATIDLE": "suyu | {}-flatpak",
"TITLEBARFORMATRUNNING": "suyu | {}-flatpak | {}"
},
"arch": {
"aarch64": {
"config-opts": [

View file

@ -20,7 +20,7 @@
</keywords>
<url type="homepage">https://suyu.dev/</url>
<url type="bugtracker">https://gitlab.com/suyu-emu/suyu/-/issues</url>
<!-- <url type="faq">https://yuzu-emu.org/wiki/faq/</url> -->
<url type="faq">https://gitlab.com/suyu-emu/suyu/-/wikis/FAQ</url>
<!-- <url type="help">https://yuzu-emu.org/wiki/home/</url> -->
<!-- <url type="donation">https://yuzu-emu.org/donate/</url> -->
<!-- <url type="translate">https://www.transifex.com/yuzu-emulator/yuzu/</url> -->
@ -29,8 +29,8 @@
<!-- <url type="contribute">https://github.com/yuzu-emu/yuzu/wiki/Contributing#contributing</url> -->
<launchable type="desktop-id">org.suyu_emu.suyu.desktop</launchable>
<provides>
<binary>yuzu</binary>
<binary>yuzu-cmd</binary>
<binary>suyu</binary>
<binary>suyu-cmd</binary>
</provides>
<requires>
<memory>8192</memory>
@ -39,16 +39,19 @@
<memory>16384</memory>
</recommends>
<project_license>GPL-3.0-or-later</project_license>
<developer_name>yuzu Emulator Team</developer_name>
<developer_name>suyu Emulator Team</developer_name>
<content_rating type="oars-1.0"/>
<screenshots>
<screenshot type="default"><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</image></screenshot>
<screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</image></screenshot>
<screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</image></screenshot>
<screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</image></screenshot>
<screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</image></screenshot>
</screenshots>
<!-- <screenshots> -->
<!-- <screenshot type="default"><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</image></screenshot> -->
<!-- <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</image></screenshot> -->
<!-- <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</image></screenshot> -->
<!-- <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</image></screenshot> -->
<!-- <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</image></screenshot> -->
<!-- </screenshots> -->
<releases>
<release version="dev-0-3" date="2024-03-09"/>
<release version="dev-0-2" date="2024-03-09"/>
<release version="dev-0-1" date="2024-03-09"/>
<release version="mainline-0-1734" date="2024-03-04"/>
<release version="mainline-0-1733" date="2024-03-03"/>
<release version="mainline-0-1732" date="2024-03-02"/>

View file

@ -1 +0,0 @@
<svg id="svg815" version="1.1" width="682.67" height="682.67" xmlns="http://www.w3.org/2000/svg"><defs id="defs7"><clipPath id="clip-path"><path id="rect4" fill="none" d="M-43-46.67h699.6v777.33H-43z"/></clipPath><style id="style2">.cls-2{clip-path:url(#clip-path)}</style></defs><g id="g823" transform="translate(34)"><g id="right"><g class="cls-2" clip-path="url(#clip-path)" id="g14"><g id="g827"><g id="g833"><path id="path835" d="M340.81 138v544.08c150.26 0 272.06-121.81 272.06-272.06S491.07 138 340.81 138M394 197.55a219.06 219.06 0 010 424.94V197.55" fill="#ff3c28"/></g></g></g></g><g id="left"><g class="cls-2" clip-path="url(#clip-path)" id="g20"><g id="g839"><g id="g845"><path id="path847" d="M272.79 1.92C122.53 1.92.73 123.73.73 274c0 150.27 121.8 272.07 272.06 272.07zm-53.14 59.59v425A219 219 0 01118 119.18a217.51 217.51 0 01101.65-57.67" fill="#0ab9e6"/></g></g></g></g></g></svg>

Before

Width:  |  Height:  |  Size: 899 B

View file

@ -3,11 +3,11 @@
report_error() {
read -r -d '|' MESSAGE <<EOF
Unfortunately, suyu seems to have crashed.
We kindly ask you to submit a bug report to <a href="https://github.com/flathub/org.yuzu_emu.yuzu/issues">https://github.com/flathub/org.yuzu_emu.yuzu/issues</a>.
We kindly ask you to submit a bug report to <a href="https://gitlab.com/suyu-emu/linux-package-sources/flatpak/-/issues">https://gitlab.com/suyu-emu/linux-package-sources/flatpak/-/issues</a>.
When submitting a bug report, please attach your <b>system information</b> and the <b>yuzu log file</b>.
You seem to be using ${XDG_SESSION_DESKTOP} ${DESKTOP_SESSION} (${XDG_SESSION_TYPE}):
To obtain yuzu log files, please see <a href="https://yuzu-emu.org/help/reference/log-files/">this guide</a>.
To obtain suyu log files, please see <a href="https://gitlab.com/suyu-emu/suyu/-/wikis/FAQ#how-do-i-upload-my-log-file">this guide</a>.
To obtain your system information, please install <tt>inxi</tt> and run <tt>inxi -v3</tt>. |
EOF
zenity --warning --no-wrap --title "That's awkward ..." --text "$MESSAGE"
@ -19,6 +19,6 @@ for i in {0..9}; do
done
if ! prlimit --nofile=8192 yuzu "$@"; then
if ! prlimit --nofile=8192 suyu "$@"; then
report_error
fi