From fcf4e6ef118bb83aa32ba1837771acfcfc349086 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 19 Sep 2024 13:58:52 +0900 Subject: [PATCH 1/6] XENIA: added to manifest --- net.retrodeck.retrodeck.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0a79370a..6a11d307 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -2,6 +2,8 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform runtime-version: "6.7" sdk: org.kde.Sdk +base: org.winehq.Wine +base-version: stable-23.08 command: retrodeck.sh finish-args: @@ -609,6 +611,23 @@ modules: url: https://github.com/ruffle-rs/ruffle/releases/download/nightly-2024-08-09/ruffle-nightly-2024_08_09-linux-x86_64.tar.gz sha256: d2c4c77d8426da6df8dc8b2a57565c151146464a8eec605d5faa68a297d8cad6 + # TODO: rolling release, we need to automate it (?) + - name: xenia-canary + buildsystem: simple + build-commands: + - install -Dm755 xenia-canary.exe "${FLATPAK_DEST}/xenia-canary/xenia-canary.exe" + - install -Dm755 xenia-canary "${FLATPAK_DEST}/bin/xenia-canary" + sources: + - type: archive + url: https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip + sha256sum: 4a7a405b8184b8308ed3666ce234b804c727dacbe4f44b26d09b192b746244fe + - type: script + commands: + - | + #!/bin/bash + WINEPREFIX="/data/xenia-canary-pfx" wine "/app/xenia-canary/xenia-canary.exe" + dest-filename: xenia-canary + - name: fetch-missing-libs buildsystem: simple build-commands: From 251c76f382e827f0270856ef41d5b48da5befcb8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 19 Sep 2024 14:39:21 +0900 Subject: [PATCH 2/6] XENIA: first add --- automation_tools/automation_task_list.cfg | 1 + .../retrodeck/reference_lists/features.json | 9 +++++++++ functions/prepare_component.sh | 11 +++++++++++ net.retrodeck.retrodeck.yml | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index 979b5998..ae465be1 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -24,3 +24,4 @@ hash^RETRODECKMELONDSLATEST^https://github.com/RetroDECK/net.kuribo64.melonDS/re hash^RETRODECKSOLARUSLATEST^https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest/download/RetroDECK-solarus-Artifact.tar.gz hash^RETRODECKGZDOOMLATEST^https://github.com/RetroDECK/org.zdoom.GZDoom/releases/latest/download/RetroDECK-gzdoom-Artifact.tar.gz hash^RETRODECKMAMELATEST^https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz +hash^XENIACANARYLATESTSHA^https://github.com/xenia-canary/xenia-canary/releases/latest/download/experimental/xenia_canary.zip diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json index 6da76574..1f6a1d10 100644 --- a/config/retrodeck/reference_lists/features.json +++ b/config/retrodeck/reference_lists/features.json @@ -776,6 +776,9 @@ "x68000": { "name": "Sharp X68000" }, + "xbox360": { + "name": "Microsoft Xbox 360" + }, "xbox": { "name": "Microsoft Xbox" }, @@ -1133,6 +1136,12 @@ "name": "PortMaster", "system": "portmaster", "launch": "PortMaster" + }, + "xenia": { + "description": "Xenia Canary Xbox360 Emulator", + "name": "Xenia Canary", + "system": "xbox360", + "launch": "xenia-canary" } } } diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 03765a58..e2198463 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -890,6 +890,17 @@ prepare_component() { fi + if [[ "$component" =~ ^(xenia|all)$ ]]; then + component_found="true" + log i "----------------------" + log i "Prepearing Xenia" + log i "----------------------" + + rm -rf "/var/data/xenia-canary-pfx" + # TODO: fill this + + fi + if [[ $component_found == "false" ]]; then log e "Supplied component $component not found, not resetting" fi diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0a79370a..c4ff64ef 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -2,6 +2,8 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform runtime-version: "6.7" sdk: org.kde.Sdk +base: org.winehq.Wine +base-version: stable-23.08 command: retrodeck.sh finish-args: @@ -609,6 +611,23 @@ modules: url: https://github.com/ruffle-rs/ruffle/releases/download/nightly-2024-08-09/ruffle-nightly-2024_08_09-linux-x86_64.tar.gz sha256: d2c4c77d8426da6df8dc8b2a57565c151146464a8eec605d5faa68a297d8cad6 + # XENIA CANARY + - name: xenia-canary + buildsystem: simple + build-commands: + - install -Dm755 xenia-canary.exe "${FLATPAK_DEST}/xenia-canary/xenia-canary.exe" + - install -Dm755 xenia-canary "${FLATPAK_DEST}/bin/xenia-canary" + sources: + - type: archive + url: https://github.com/xenia-canary/xenia-canary/releases/latest/download/experimental/xenia_canary.zip + sha256: XENIACANARYLATESTSHA + - type: script + commands: + - | + #!/bin/bash + WINEPREFIX="/var/data/xenia-canary-pfx" wine "/app/xenia-canary/xenia-canary.exe" + dest-filename: xenia-canary + - name: fetch-missing-libs buildsystem: simple build-commands: From 5e89e7f68349718c97669603f5e4d5174a0cce5a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 19 Sep 2024 15:01:51 +0900 Subject: [PATCH 3/6] XENIA: poiting ES-DE to Xenia branch --- net.retrodeck.retrodeck.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c4ff64ef..564a0bde 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -582,10 +582,11 @@ modules: - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: - # Testing the new feat/update-3.1.0 - type: archive - url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz - sha256: RETRODECKESDELATEST + url: https://github.com/RetroDECK/ES-DE/releases/download/feat%2Fxenia-190924.46/RetroDECK-ES-DE-Artifact.tar.gz + sha256: 6ea55f59613a066ae36f04b61b3e9810d45fa2ca0924d876b5ada2ca28f5f36f + # url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz + # sha256: RETRODECKESDELATEST - name: retrodeck-theme buildsystem: simple From 6d147d35570987f8dd4dbf944ffd775fcadb719b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 19 Sep 2024 15:10:33 +0900 Subject: [PATCH 4/6] XENIA: fixing Xenia Canary url --- automation_tools/automation_task_list.cfg | 2 +- net.retrodeck.retrodeck.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg index ae465be1..d943ca72 100644 --- a/automation_tools/automation_task_list.cfg +++ b/automation_tools/automation_task_list.cfg @@ -24,4 +24,4 @@ hash^RETRODECKMELONDSLATEST^https://github.com/RetroDECK/net.kuribo64.melonDS/re hash^RETRODECKSOLARUSLATEST^https://github.com/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest/download/RetroDECK-solarus-Artifact.tar.gz hash^RETRODECKGZDOOMLATEST^https://github.com/RetroDECK/org.zdoom.GZDoom/releases/latest/download/RetroDECK-gzdoom-Artifact.tar.gz hash^RETRODECKMAMELATEST^https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz -hash^XENIACANARYLATESTSHA^https://github.com/xenia-canary/xenia-canary/releases/latest/download/experimental/xenia_canary.zip +hash^XENIACANARYLATESTSHA^https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 564a0bde..c2d05954 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -620,7 +620,7 @@ modules: - install -Dm755 xenia-canary "${FLATPAK_DEST}/bin/xenia-canary" sources: - type: archive - url: https://github.com/xenia-canary/xenia-canary/releases/latest/download/experimental/xenia_canary.zip + url: https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip sha256: XENIACANARYLATESTSHA - type: script commands: From 9745428b807890a1f03b98321ff82edeeb611da6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 19 Sep 2024 15:36:18 +0900 Subject: [PATCH 5/6] XENIA: fixing xenia_canary filename --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c2d05954..8d6632d3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -616,7 +616,7 @@ modules: - name: xenia-canary buildsystem: simple build-commands: - - install -Dm755 xenia-canary.exe "${FLATPAK_DEST}/xenia-canary/xenia-canary.exe" + - install -Dm755 xenia_canary.exe "${FLATPAK_DEST}/xenia-canary/xenia_canary.exe" - install -Dm755 xenia-canary "${FLATPAK_DEST}/bin/xenia-canary" sources: - type: archive @@ -626,7 +626,7 @@ modules: commands: - | #!/bin/bash - WINEPREFIX="/var/data/xenia-canary-pfx" wine "/app/xenia-canary/xenia-canary.exe" + WINEPREFIX="/var/data/xenia-canary-pfx" wine "/app/xenia-canary/xenia_canary.exe" dest-filename: xenia-canary - name: fetch-missing-libs From 875bed3e041a5c60c029ba0932ce59356cb412d7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 20 Sep 2024 12:20:31 +0900 Subject: [PATCH 6/6] WINE: added extensions --- net.retrodeck.retrodeck.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8d6632d3..d01715f6 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -2,9 +2,15 @@ app-id: net.retrodeck.retrodeck runtime: org.kde.Platform runtime-version: "6.7" sdk: org.kde.Sdk +command: retrodeck.sh + base: org.winehq.Wine base-version: stable-23.08 -command: retrodeck.sh + +inherit-extensions: + - org.winehq.Wine.gecko + - org.winehq.Wine.mono + - org.winehq.Wine.DLLs finish-args: - --socket=wayland