Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 05:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MANIFEST: trimmed down rd-submodules

Browse source
This commit is contained in:
xargon 2022-06-15 15:18:00 +02:00
parent 4757d15f2b
commit 6d21b24f77
12 changed files with 201 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitmodules vendored
View file

@ -4,21 +4,3 @@
[submodule "rd-submodules/retroarch"]
path = rd-submodules/retroarch
url = https://github.com/flathub/org.libretro.RetroArch.git
[submodule "rd-submodules/yuzu"]
path = rd-submodules/yuzu
url = https://github.com/flathub/org.yuzu_emu.yuzu
[submodule "rd-submodules/pcsx2"]
path = rd-submodules/pcsx2
url = https://github.com/flathub/net.pcsx2.PCSX2.git
[submodule "rd-submodules/dolphin"]
path = rd-submodules/dolphin
url = https://github.com/flathub/org.DolphinEmu.dolphin-emu
[submodule "rd-submodules/ryujinx"]
path = rd-submodules/ryujinx
url = https://github.com/flathub/org.ryujinx.Ryujinx.git
[submodule "rd-submodules/citra"]
path = rd-submodules/citra
url = https://github.com/flathub/org.citra_emu.citra.git
[submodule "rd-submodules/primehack"]
path = rd-submodules/primehack
url = https://github.com/flathub/io.github.shiiion.primehack

249
net.retrodeck.retrodeck.yml
View file

@ -222,129 +222,128 @@ modules:
# RetroArch - https://github.com/flathub/org.libretro.RetroArch
# - name: retroarch
# config-opts:
# - '--enable-dbus'
# make-args:
# - GLOBAL_CONFIG_DIR=${FLATPAK_DEST}/etc
# sources:
# - type: git
# url: https://github.com/libretro/RetroArch.git
# branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
# - type: file
# path: retroarch.cfg
# post-install:
# - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/
# - >-
# mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg
# ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/
# - rmdir --ignore-fail-on-non-empty ${FLATPAK_DEST}/share/pixmaps/
# - mkdir -p ${FLATPAK_DEST}/etc
# - >-
# sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg >
# ${FLATPAK_DEST}/etc/retroarch.cfg
# modules:
# - libpng/libpng-1.6.35.json
# #nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
# - shared-modules/SDL/SDL-1.2.15.json
# - shared-modules/SDL/SDL_image-1.2.12.json
# - shared-modules/SDL/SDL_mixer-1.2.12.json
# - shared-modules/SDL/SDL_net-1.2.8.json
# - shared-modules/SDL/SDL_ttf-2.0.11.json
# - shared-modules/libusb/libusb.json
# # certificate glu issue
# #- shared-modules/gudev/gudev.json
# libbz2/libbz2-1.0.8.json
# xrandr/xrandr-1.5.1.json
# libaio/libaio-0.3.112.json
# # certificate issue, check libglu module for more info
# #- shared-modules/glu/glu-9.json
# libdecor/libdecor-0.1.0.json
# - name: retroarch-filers-video
# subdir: gfx/video_filters
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/RetroArch.git
# branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
# - name: retroarch-filers-audio
# subdir: libretro-common/audio/dsp_filters
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/RetroArch.git
# branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
# - name: retroarch-assets
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/retroarch-assets.git
# commit: f45dd1351e6bfb9f01e12bee8d358ad22a2bb8f9
# - name: libretro-database
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/libretro-database.git
# commit: f3b10ec262fcbd78da3473f46d244270d12a327e
# - name: libretro-core-info
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/libretro-core-info.git
# commit: 06dac6318c067a6a40e2ea1e1260e74681ada844
# - name: retroarch-joypad-autoconfig
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/retroarch-joypad-autoconfig.git
# commit: 760b057f1865a827762a54a8a32afda2cdd9e170
# - name: common-shaders
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/common-shaders.git
# commit: 55e401834b732e62c34411321c4ffd82524345d4
# - name: slang-shaders
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/slang-shaders.git
# commit: 148c57d9747f5db124135501ac280b5ca129a83f
# - name: glsl-shaders
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/glsl-shaders.git
# commit: 8f6b2649489760caea8f36ec6099998854059569
# - name: common-overlays
# make-install-args:
# - PREFIX=${FLATPAK_DEST}
# sources:
# - type: git
# url: https://github.com/libretro/common-overlays.git
# commit: db9744f4e58a740f0f10b04b62af347cd6f01928
- name: retroarch
config-opts:
- '--enable-dbus'
make-args:
- GLOBAL_CONFIG_DIR=${FLATPAK_DEST}/etc
- type: git
url: https://github.com/libretro/RetroArch.git
branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
- type: file
path: retroarch.cfg
post-install:
- mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/
- >-
mv ${FLATPAK_DEST}/share/pixmaps/retroarch.svg
${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/
- rmdir --ignore-fail-on-non-empty ${FLATPAK_DEST}/share/pixmaps/
- mkdir -p ${FLATPAK_DEST}/etc
- >-
sed s:@prefix@:${FLATPAK_DEST}:g retroarch.cfg >
${FLATPAK_DEST}/etc/retroarch.cfg
modules:
- libpng/libpng-1.6.35.json
#nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json
- shared-modules/SDL/SDL-1.2.15.json
- shared-modules/SDL/SDL_image-1.2.12.json
- shared-modules/SDL/SDL_mixer-1.2.12.json
- shared-modules/SDL/SDL_net-1.2.8.json
- shared-modules/SDL/SDL_ttf-2.0.11.json
- shared-modules/libusb/libusb.json
# certificate glu issue
#- shared-modules/gudev/gudev.json
libbz2/libbz2-1.0.8.json
xrandr/xrandr-1.5.1.json
libaio/libaio-0.3.112.json
# certificate issue, check libglu module for more info
#- shared-modules/glu/glu-9.json
libdecor/libdecor-0.1.0.json
- name: retroarch-filers-video
subdir: gfx/video_filters
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/RetroArch.git
branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
- name: retroarch-filers-audio
subdir: libretro-common/audio/dsp_filters
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/RetroArch.git
branch: 9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38
- name: retroarch-assets
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/retroarch-assets.git
commit: f45dd1351e6bfb9f01e12bee8d358ad22a2bb8f9
- name: libretro-database
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/libretro-database.git
commit: f3b10ec262fcbd78da3473f46d244270d12a327e
- name: libretro-core-info
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/libretro-core-info.git
commit: 06dac6318c067a6a40e2ea1e1260e74681ada844
- name: retroarch-joypad-autoconfig
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/retroarch-joypad-autoconfig.git
commit: 760b057f1865a827762a54a8a32afda2cdd9e170
- name: common-shaders
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/common-shaders.git
commit: 55e401834b732e62c34411321c4ffd82524345d4
- name: slang-shaders
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/slang-shaders.git
commit: 148c57d9747f5db124135501ac280b5ca129a83f
- name: glsl-shaders
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/glsl-shaders.git
commit: 8f6b2649489760caea8f36ec6099998854059569
- name: common-overlays
make-install-args:
- PREFIX=${FLATPAK_DEST}
sources:
- type: git
url: https://github.com/libretro/common-overlays.git
commit: db9744f4e58a740f0f10b04b62af347cd6f01928
# RetroArch experiment: cloning the flathub repository directly and adding its manifest as module
- name: retroarch
buildsystem: simple
build-commands:
- echo ""
sources:
- type: git
url: https://github.com/flathub/org.libretro.RetroArch
tag: v1.10.2
modules:
- org.libretro.RetroArch.json
# - name: retroarch
# buildsystem: simple
# build-commands:
# - echo ""
# sources:
# - type: git
# url: https://github.com/flathub/org.libretro.RetroArch
# tag: v1.10.2
# modules:
# - org.libretro.RetroArch.json
# RetroArch - END
@ -359,7 +358,8 @@ modules:
url: https://buildbot.libretro.com/stable/1.10.3/linux/x86_64/RetroArch_cores.7z
sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f
# Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu
# Yuzu - START
# https://github.com/flathub/org.yuzu_emu.yuzu
- name: libzip
buildsystem: cmake-ninja
@ -518,7 +518,7 @@ modules:
# Yuzu - END
# pcsx2 - https://github.com/flathub/net.pcsx2.PCSX2
# PCSX2 START - https://github.com/flathub/net.pcsx2.PCSX2
- name: wxWidgets
buildsystem: cmake-ninja
@ -633,9 +633,6 @@ modules:
- >-
desktop-file-edit --set-key=Exec --set-value=pcsx2
/app/share/applications/PCSX2.desktop
- >-
install -Dm644 ../AppIcon128.png
/app/share/icons/hicolor/128x128/apps/PCSX2.png
sources:
- type: git
url: https://github.com/PCSX2/pcsx2.git
@ -644,7 +641,7 @@ modules:
- type: file
path: rd-submodules/pcsx2/AppIcon128.png
# pcsx2 - END
# PCSX2 - END
# Dolphin - START
# https://github.com/flathub/org.DolphinEmu.dolphin-emu

1
rd-submodules/citra

@ -1 +0,0 @@
Subproject commit 9ae0295fe78ef72e121b358b2b87605d4c55e4e8

1
rd-submodules/dolphin

@ -1 +0,0 @@
Subproject commit f75cb4987bb2de1a745ff4179a401a855cf1432f

40
rd-submodules/dolphin/detectflatpak.patch Normal file
View file

@ -0,0 +1,40 @@
commit d4c899cede0743d40934ca11f83691cda72ff9dd
Author: Carles Pastor <cpbadosa@gmail.com>
Date: Sat Apr 2 20:47:06 2022 +0200
Detect when running inside a flatpak sandbox
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
index cb857fd3c7..e3ddde24fb 100644
--- a/Source/Core/UICommon/UICommon.cpp
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -309,24 +309,25 @@ void SetUserDirectory(std::string custom_path)
// We are on a non-Apple and non-Android POSIX system, there are 4 cases:
// 1. GetExeDirectory()/portable.txt exists
// -> Use GetExeDirectory()/User
- // 2. $DOLPHIN_EMU_USERPATH is set
+ // 2. $DOLPHIN_EMU_USERPATH is set, and we're not in flatpak
// -> Use $DOLPHIN_EMU_USERPATH
- // 3. ~/.dolphin-emu directory exists
+ // 3. ~/.dolphin-emu directory exists, and we're not in flatpak
// -> Use ~/.dolphin-emu
// 4. Default
// -> Use XDG basedir, see
// http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
std::string exe_path = File::GetExeDirectory();
+ bool flatpak = File::Exists("/.flatpak-info");
if (File::Exists(exe_path + DIR_SEP "portable.txt"))
{
user_path = exe_path + DIR_SEP "User" DIR_SEP;
}
- else if (env_path)
+ else if (env_path && !flatpak)
{
user_path = env_path;
}
- else if (!File::Exists(user_path))
+ else if (flatpak || !File::Exists(user_path))
{
const char* data_home = getenv("XDG_DATA_HOME");
std::string data_path =

13
rd-submodules/dolphin/nodirtyversion.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9af66009a1..2acd3bed9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,7 +149,7 @@ if(GIT_FOUND)
OUTPUT_VARIABLE DOLPHIN_WC_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE)
# defines DOLPHIN_WC_DESCRIBE
- execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+ execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long
OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
OUTPUT_STRIP_TRAILING_WHITESPACE)

1
rd-submodules/pcsx2

@ -1 +0,0 @@
Subproject commit 68a40d61b37b6f9c9033dc93d426570b86938e3f

1
rd-submodules/primehack

@ -1 +0,0 @@
Subproject commit 6bdab1bbeb3e42d832af31f94725836bfa101072

1
rd-submodules/ryujinx

@ -1 +0,0 @@
Subproject commit 4776d6c931314c2fd2b30776603130ed0e6027e7

1
rd-submodules/yuzu

@ -1 +0,0 @@
Subproject commit c23956479d76c12b559316cfd30755eef5e09902

1
rd-submodules/yuzu/compatibility_list.json Normal file
View file

File diff suppressed because one or more lines are too long

24
rd-submodules/yuzu/yuzu-launcher.sh Executable file
View file

@ -0,0 +1,24 @@
#!/bin/bash -e
report_error() {
read -r -d '|' MESSAGE <<EOF
Unfortunately, yuzu 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>.
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 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"
}
# Discord RPC
for i in {0..9}; do
test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
done
if ! prlimit --nofile=8192 yuzu "$@"; then
report_error
fi