From 4b521f8de48abc5d0506a85ab025ad92691c72bf Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Wed, 30 Oct 2024 19:00:48 +0100 Subject: [PATCH 1/7] README -- Add link to repo for official builds --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b898751..77b4ca7 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ - [Update Frequency](#update-frequency) - [Official Releases](#official-releases) - [Development Releases](#development-releases) +- [Official Builds](#official-builds) ## How to connect your Wii remotes @@ -151,4 +152,14 @@ If you have both the official "Release" and the "Development" release installed ``` flatpak make-current org.DolphinEmu.dolphin-emu -``` \ No newline at end of file +``` + +## Official Builds + +As of `2409-260` official dev builds are available from this repo: + +https://flatpak.dolphin-emu.org/dev.flatpakrepo + +Single file bundles for `2409-260+` versions are available from the downloads section of the official dolphin site: + +https://dolphin-emu.org/download/ From 4355d9bd61ec7beabb4e8e6901dd9acc514d3aeb Mon Sep 17 00:00:00 2001 From: Julien Reichardt Date: Thu, 31 Oct 2024 20:32:25 +0100 Subject: [PATCH 2/7] Upgrade runtime to 6.8 (#288) --- org.DolphinEmu.dolphin-emu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index 6d37be4..9da7739 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -1,6 +1,6 @@ app-id: org.DolphinEmu.dolphin-emu runtime: org.kde.Platform -runtime-version: '6.7' +runtime-version: '6.8' sdk: org.kde.Sdk command: dolphin-emu-wrapper rename-desktop-file: dolphin-emu.desktop From dc2461cc1bd51987adf915831134df12f20e3c94 Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Thu, 31 Oct 2024 20:46:06 +0100 Subject: [PATCH 3/7] The 6.8 runtime already bundles SDL2-2.30.6 --- SDL2/SDL2-no-libdecor.json | 22 ---------------------- org.DolphinEmu.dolphin-emu.yml | 3 --- 2 files changed, 25 deletions(-) delete mode 100644 SDL2/SDL2-no-libdecor.json diff --git a/SDL2/SDL2-no-libdecor.json b/SDL2/SDL2-no-libdecor.json deleted file mode 100644 index 672ac0f..0000000 --- a/SDL2/SDL2-no-libdecor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "SDL2", - "buildsystem": "autotools", - "config-opts": ["--disable-static"], - "sources": [ - { - "type": "archive", - "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz", - "sha256": "c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4" - } - ], - "cleanup": [ "/bin/sdl2-config", - "/include", - "/lib/libSDL2.la", - "/lib/libSDL2main.a", - "/lib/libSDL2main.la", - "/lib/libSDL2_test.a", - "/lib/libSDL2_test.la", - "/lib/cmake", - "/share/aclocal", - "/lib/pkgconfig"] -} diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index 9da7739..dcc3644 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -65,9 +65,6 @@ modules: url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399 - # The kde runtime bundles 2.28.5 but current dolphin versions require 2.30.6 - - SDL2/SDL2-no-libdecor.json - - name: dolphin-emu buildsystem: cmake-ninja config-opts: From 84342aa178b6558cc3e3cd37ece6a3227d83b1ea Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Fri, 1 Nov 2024 07:16:25 +0100 Subject: [PATCH 4/7] Revert back to 6.7 because of libfmt error --- SDL2/SDL2-no-libdecor.json | 22 ++++++++++++++++++++++ org.DolphinEmu.dolphin-emu.yml | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 SDL2/SDL2-no-libdecor.json diff --git a/SDL2/SDL2-no-libdecor.json b/SDL2/SDL2-no-libdecor.json new file mode 100644 index 0000000..672ac0f --- /dev/null +++ b/SDL2/SDL2-no-libdecor.json @@ -0,0 +1,22 @@ +{ + "name": "SDL2", + "buildsystem": "autotools", + "config-opts": ["--disable-static"], + "sources": [ + { + "type": "archive", + "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz", + "sha256": "c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4" + } + ], + "cleanup": [ "/bin/sdl2-config", + "/include", + "/lib/libSDL2.la", + "/lib/libSDL2main.a", + "/lib/libSDL2main.la", + "/lib/libSDL2_test.a", + "/lib/libSDL2_test.la", + "/lib/cmake", + "/share/aclocal", + "/lib/pkgconfig"] +} diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index dcc3644..6d37be4 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -1,6 +1,6 @@ app-id: org.DolphinEmu.dolphin-emu runtime: org.kde.Platform -runtime-version: '6.8' +runtime-version: '6.7' sdk: org.kde.Sdk command: dolphin-emu-wrapper rename-desktop-file: dolphin-emu.desktop @@ -65,6 +65,9 @@ modules: url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399 + # The kde runtime bundles 2.28.5 but current dolphin versions require 2.30.6 + - SDL2/SDL2-no-libdecor.json + - name: dolphin-emu buildsystem: cmake-ninja config-opts: From 18439a50c3140e3971695578f65481b1a76f4c1c Mon Sep 17 00:00:00 2001 From: Carles Pastor Badosa Date: Sat, 9 Nov 2024 02:11:19 +0100 Subject: [PATCH 5/7] Upgrade to 6.8 runtime again now that libfmt issue is fixed (#303) --- SDL2/SDL2-no-libdecor.json | 22 ---------------------- org.DolphinEmu.dolphin-emu.yml | 5 +---- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 SDL2/SDL2-no-libdecor.json diff --git a/SDL2/SDL2-no-libdecor.json b/SDL2/SDL2-no-libdecor.json deleted file mode 100644 index 672ac0f..0000000 --- a/SDL2/SDL2-no-libdecor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "SDL2", - "buildsystem": "autotools", - "config-opts": ["--disable-static"], - "sources": [ - { - "type": "archive", - "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-2.30.6.tar.gz", - "sha256": "c6ef64ca18a19d13df6eb22df9aff19fb0db65610a74cc81dae33a82235cacd4" - } - ], - "cleanup": [ "/bin/sdl2-config", - "/include", - "/lib/libSDL2.la", - "/lib/libSDL2main.a", - "/lib/libSDL2main.la", - "/lib/libSDL2_test.a", - "/lib/libSDL2_test.la", - "/lib/cmake", - "/share/aclocal", - "/lib/pkgconfig"] -} diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index 6d37be4..dcc3644 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -1,6 +1,6 @@ app-id: org.DolphinEmu.dolphin-emu runtime: org.kde.Platform -runtime-version: '6.7' +runtime-version: '6.8' sdk: org.kde.Sdk command: dolphin-emu-wrapper rename-desktop-file: dolphin-emu.desktop @@ -65,9 +65,6 @@ modules: url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399 - # The kde runtime bundles 2.28.5 but current dolphin versions require 2.30.6 - - SDL2/SDL2-no-libdecor.json - - name: dolphin-emu buildsystem: cmake-ninja config-opts: From 60f9b2d24ff89de93c0e07cf53dac8d077460de7 Mon Sep 17 00:00:00 2001 From: flathubbot Date: Mon, 2 Dec 2024 02:31:47 +0000 Subject: [PATCH 6/7] dolphin-emu: Update dolphin.git to 2412 --- org.DolphinEmu.dolphin-emu.metainfo.xml | 5 ++++- org.DolphinEmu.dolphin-emu.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.DolphinEmu.dolphin-emu.metainfo.xml b/org.DolphinEmu.dolphin-emu.metainfo.xml index 0be28fe..9d9ddad 100644 --- a/org.DolphinEmu.dolphin-emu.metainfo.xml +++ b/org.DolphinEmu.dolphin-emu.metainfo.xml @@ -36,9 +36,12 @@ dolphin-emu.desktop - + + + + diff --git a/org.DolphinEmu.dolphin-emu.yml b/org.DolphinEmu.dolphin-emu.yml index dcc3644..ea3c260 100644 --- a/org.DolphinEmu.dolphin-emu.yml +++ b/org.DolphinEmu.dolphin-emu.yml @@ -83,7 +83,7 @@ modules: sources: - type: git url: https://github.com/dolphin-emu/dolphin.git - commit: 3c4d4fcd09173ea070dc812ab5d64ca3a3af5f29 + commit: 992b4ea9309899ebc7ca576ebea711a70523098a x-checker-data: type: json url: https://dolphin-emu.org/update/latest/beta From 354b2838505e6e6eb1b67d4b0b2a423463fe2192 Mon Sep 17 00:00:00 2001 From: Carles Pastor Badosa Date: Mon, 2 Dec 2024 23:51:43 +0100 Subject: [PATCH 7/7] README.md -- beta branch eol --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 77b4ca7..e53866f 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ - [Official Releases](#official-releases) - [Development Releases](#development-releases) - [Official Builds](#official-builds) +- [Beta Branch](#beta-branch) ## How to connect your Wii remotes @@ -163,3 +164,15 @@ https://flatpak.dolphin-emu.org/dev.flatpakrepo Single file bundles for `2409-260+` versions are available from the downloads section of the official dolphin site: https://dolphin-emu.org/download/ + +## Beta Branch + +The beta branch is being retired, there won't be any further updates after `2412`. + +Switch back to the stable branch in order to receive further updates (drop the `--user` at the end if you've installed dolphin-emu at the system level): + +``` +flatpak make-current org.DolphinEmu.dolphin-emu stable --user +``` + +If for any reason you'd rather keep getting dev builds, switch to the official dev repo instead.