From d1fba885c6031307356a22f465b8ea111dc12e73 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 27 Mar 2022 10:34:37 +0900 Subject: [PATCH] Directories fix. --- com.xargon.retrodeck.yml | 26 ++++++++++++++++++++++---- retroarch.cfg | 14 +++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 3c8e9819..7c65a9b0 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -12,14 +12,14 @@ finish-args: - --share=ipc - --share=network - --device=all - - --filesystem=~/retrodeck/roms:create + - --filesystem=~/retrodeck:create - --allow=multiarch - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.freedesktop.PowerManagement.Inhibit - --talk-name=org.freedesktop.login1 - --filesystem=host - --filesystem=xdg-run/app/com.discordapp.Discord:create - # Yuzu + # Yuzu - --filesystem=home:ro - --filesystem=/run/media:ro @@ -143,8 +143,8 @@ modules: - name: art-book-next buildsystem: simple build-commands: - - mkdir -p /app/emulationstation/themes/art-book-next - - mv -f * /app/emulationstation/themes/art-book-next/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ sources: - type: git url: https://github.com/anthonycaccese/es-theme-art-book-next.git @@ -271,6 +271,19 @@ modules: # RetroArch - END + # Not part of the offical RetroArch manifest + - name: retroarch-cores + buildsystem: simple + build-commands: + - mkdir -p /app/share/libretro/cores/ + - mv ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/ + cleanup: + - RetroArch_cores.7z + sources: + - type: archive + url: https://buildbot.libretro.com/stable/1.10.1/linux/x86_64/RetroArch_cores.7z + sha256: 3467de291c0849947993a535b0f32e7c211878dcaf6a37a9f864cf50cbe824fd + # Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu #- shared-modules/libusb/libusb.json @@ -569,6 +582,11 @@ modules: - rm -f ${FLATPAK_DEST}/etc/retroarch.cfg - mv retroarch.cfg ${FLATPAK_DEST}/etc/retroarch.cfg + # - symlink useful dirs and files in ~/retrodeck + # TODO: cannot see home folder at this point + #- ln -s ${FLATPAK_DEST}/etc/retroarch.cfg ~/retrodeck/retroarch.cfg + #- ln -s ${FLATPAK_DEST}/share/emulationstation/themes/ ~/retrodeck/ + #cleanup: ['*'] sources: - type: file diff --git a/retroarch.cfg b/retroarch.cfg index 9d1b31a2..04700e21 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -5,7 +5,7 @@ ai_service_source_lang = "0" all_users_control_menu = "true" apply_cheats_after_load = "false" apply_cheats_after_toggle = "false" -assets_directory = "/app/retrodeck/retroarch/.config/assets/" +assets_directory = "/app/share/libretro/assets" audio_block_frames = "0" audio_device = "" audio_driver = "alsathread" @@ -48,7 +48,7 @@ cache_directory = "/tmp/cache" camera_allow = "false" camera_device = "" camera_driver = "null" -cheat_database_path = "/app/retrodeck/retroarch/.config/database/cht" +cheat_database_path = "/app/share/libretro/database/cht" check_firmware_before_loading = "false" cheevos_badges_enable = "false" cheevos_richpresence_enable = "true" @@ -57,7 +57,7 @@ cheevos_test_unofficial = "false" cheevos_token = "" cheevos_unlock_sound_enable = "false" config_save_on_exit = "false" -content_database_path = "/app/retrodeck/retroarch/.config/database/rdb" +content_database_path = "/app/share/libretro/database/rdb" content_favorites_path = "/app/retrodeck/retroarch/.config/content_favorites.lpl" content_favorites_size = "200" content_history_dir = "" @@ -96,7 +96,7 @@ crt_switch_resolution_super = "2560" crt_switch_resolution_use_custom_refresh_rate = "false" crt_video_refresh_rate = "60.000000" current_resolution_id = "0" -cursor_directory = "/app/retrodeck/retroarch/.config/database/cursors" +cursor_directory = "/app/share/libretro/database/cursors" desktop_menu_enable = "true" discord_allow = "false" discord_app_id = "475456035851599874" @@ -335,8 +335,8 @@ keyboard_gamepad_mapping_type = "1" kiosk_mode_enable = "false" kiosk_mode_password = "" led_driver = "null" -libretro_directory = "/tmp/cores" -libretro_info_path = "/tmp/cores" +libretro_directory = "/app/share/libretro/cores" +libretro_info_path = "/app/share/libretro/cores" libretro_log_level = "1" load_dummy_on_core_shutdown = "true" location_allow = "false" @@ -497,7 +497,7 @@ ozone_truncate_playlist_name = "true" pause_nonactive = "true" perfcnt_enable = "false" playlist_compression = "false" -playlist_cores = "/tmp/cores/stella_libretro.so;/tmp/cores/atari800_libretro.so;/tmp/cores/prosystem_libretro.so;/tmp/cores/virtualjaguar_libretro.so;/tmp/cores/handy_libretro.so;/tmp/cores/hatari_libretro.so;/tmp/cores/beetle_wswan_libretro.so;/tmp/cores/beetle_wswan_libretro.so;/tmp/cores/nxengine_libretro.so;/tmp/cores/chailove_libretro.so;/tmp/cores/bluemsx_libretro.so;/tmp/cores/vice_x64_libretro.so;/tmp/cores/vice_x64_libretro.so;/tmp/cores/vice_x64_libretro.so;/tmp/cores/puae_libretro.so;/tmp/cores/vice_xplus4_libretro.so;/tmp/cores/vice_xvic_libretro.so;/tmp/cores/dinothawr_libretro.so;/tmp/cores/prboom_libretro.so;/tmp/cores/dosbox_libretro.so;/tmp/cores/fbneo_libretro.so;/tmp/cores/reminiscence_libretro.so;/tmp/cores/vecx_libretro.so;/tmp/cores/lutro_libretro.so;/tmp/cores/o2em_libretro.so;/tmp/cores/mame2003_plus_libretro.so;/tmp/cores/mame2010_libretro.so;/tmp/cores/freeintv_libretro.so;/tmp/cores/bluemsx_libretro.so;/tmp/cores/bluemsx_libretro.so;/tmp/cores/beetle_supergrafx_libretro.so;/tmp/cores/beetle_pce_fast_libretro.so;/tmp/cores/nestopia_libretro.so;/tmp/cores/mgba_libretro.so;/tmp/cores/mgba_libretro.so;/tmp/cores/gambatte_libretro.so;/tmp/cores/gambatte_libretro.so;/tmp/cores/dolphin_libretro.so;/tmp/cores/citra_libretro.so;/tmp/cores/parallel_n64_libretro.so;/tmp/cores/desmume_libretro.so;/tmp/cores/desmume_libretro.so;/tmp/cores/desmume_libretro.so;/tmp/cores/desmume_libretro.so;/tmp/cores/desmume_libretro.so;/tmp/cores/nestopia_libretro.so;/tmp/cores/snes9x2010_libretro.so;/tmp/cores/snes9x2010_libretro.so;/tmp/cores/beetle_vb_libretro.so;/tmp/cores/dolphin_libretro.so;/tmp/cores/pokemini_libretro.so;/tmp/cores/tyrquake_libretro.so;/tmp/cores/scummvm_libretro.so;/tmp/cores/picodrive_libretro.so;/tmp/cores/flycast_libretro.so;/tmp/cores/genesis_plus_gx_libretro.so;/tmp/cores/genesis_plus_gx_libretro.so;/tmp/cores/genesis_plus_gx_libretro.so;/tmp/cores/picodrive_libretro.so;/tmp/cores/genesis_plus_gx_libretro.so;/tmp/cores/yabause_libretro.so;/tmp/cores/fuse_libretro.so;/tmp/cores/beetle_ngp_libretro.so;/tmp/cores/beetle_ngp_libretro.so;/tmp/cores/play_libretro.so;/tmp/cores/ppsspp_libretro.so;/tmp/cores/pcsx_rearmed_libretro.so;/tmp/cores/theodore_libretro.so;/tmp/cores/tic80_libretro.so;/tmp/cores/4do_libretro.so" +playlist_cores = "" playlist_directory = "~/playlists" playlist_entry_remove = "false" playlist_entry_remove_enable = "1"