DOLPHIN: Updated

This commit is contained in:
XargonWan 2023-01-10 16:25:50 +00:00
parent 2ad057a2d2
commit 2259ccb75c
4 changed files with 9 additions and 14 deletions

View file

@ -76,6 +76,7 @@
<li>Removed Ryjuinx as it was broken (sorry)</li> <li>Removed Ryjuinx as it was broken (sorry)</li>
<li>Yuzu updated to mainline-1301</li> <li>Yuzu updated to mainline-1301</li>
<li>Added missing Primehack config and Configurator options</li> <li>Added missing Primehack config and Configurator options</li>
<li>Add CLI option to run Configurator directly</li>
<li>Resized configurator windows</li> <li>Resized configurator windows</li>
<li>Fixed a bug where the retrodeck folder was having a symlink creation issue after migration</li> <li>Fixed a bug where the retrodeck folder was having a symlink creation issue after migration</li>
</ul> </ul>

View file

@ -599,13 +599,14 @@ modules:
cleanup: cleanup:
- /share/man - /share/man
post-install: post-install:
- install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper
- install -Dm644 -t ${FLATPAK_DEST}/share/appdata/ org.DolphinEmu.dolphin-emu.appdata.xml
- sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
sources: sources:
- type: git - type: git
url: ssh://git@github.com/dolphin-emu/dolphin.git url: ssh://git@github.com/dolphin-emu/dolphin.git
#url: https://github.com/dolphin-emu/dolphin.git #url: https://github.com/dolphin-emu/dolphin.git
commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c commit: 8bad821019721b9b72701b495da95656ace5fea5
x-checker-data: x-checker-data:
type: json type: json
url: https://dolphin-emu.org/update/latest/beta url: https://dolphin-emu.org/update/latest/beta
@ -630,14 +631,7 @@ modules:
test -S $XDG_RUNTIME_DIR/discord-ipc-$i || test -S $XDG_RUNTIME_DIR/discord-ipc-$i ||
ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
done done
# use gtk3 filechooser on steamdeck dolphin-emu "$@"
bv=`cat /sys/devices/virtual/dmi/id/board_vendor`
bv=$bv`cat /sys/devices/virtual/dmi/id/board_name`
if [[ $bv == "ValveJupiter" ]]; then
QT_QPA_PLATFORMTHEME=gtk3 dolphin-emu "$@"
else
dolphin-emu "$@"
fi
dest-filename: dolphin-emu-wrapper dest-filename: dolphin-emu-wrapper
# Dolphin - END # Dolphin - END

View file

@ -23,11 +23,11 @@ index 8d9dc2abb8..8a9d39a3d5 100644
@@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path) @@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path)
{ {
user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP; user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
- if (!File::Exists(user_path)) - if (!File::Exists(user_path))
+ if (File::Exists("/.flatpak-info") || !File::Exists(user_path)) + if (File::Exists("/.flatpak-info") || !File::Exists(user_path))
{ {
const char* data_home = getenv("XDG_DATA_HOME"); const char* data_home = getenv("XDG_DATA_HOME");
std::string data_path = std::string data_path =
-- --
2.37.1 2.37.1

View file

@ -10,4 +10,4 @@ index 9af66009a1..2acd3bed9a 100644
+ execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long + execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long
OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)