From dbf40496c3472a6afb8334aca4b8e1e7fcb7b892 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:22:44 +0200 Subject: [PATCH 01/11] Updated ES-DE to 2.1.0 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 4d00799d..575859b6 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -303,7 +303,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e + branch: c78e215d13b02132762b9fbf45ec7b861d50601b - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From 5483a89f70678def2d2b1c56694c2be8b9987089 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:26:30 +0200 Subject: [PATCH 02/11] Updated Yuzu --- 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 575859b6..fb538a7e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -567,8 +567,8 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1465/yuzu-mainline-20230611-b9fc07fc0.AppImage - sha256: 3a5c90947d0e5ca839921a4b77ec11b71176dcd4fb6f64c81757af1ba0f6f4d3 + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1495/yuzu-mainline-20230713-523db3ac6.AppImage + sha256: 1eb43101835c37888f427efa94f0c2e9b8ebfd3181f480fa914fd15041dc4c2f # Yuzu - END From 51feed8d9022fe44b1826952a87046dfdd76911a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:36:07 +0200 Subject: [PATCH 03/11] Updated Citra --- net.retrodeck.retrodeck.yml | 7 +-- .../citra/unified-source-compat.patch | 56 ------------------- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 rd-submodules/citra/unified-source-compat.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fb538a7e..86457c70 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -592,7 +592,6 @@ modules: # FFMPEG VIDEO DUMPER was disabled because of this: https://github.com/citra-emu/citra/issues/5949 - '-DUSE_SYSTEM_SDL2=ON' - '-DCMAKE_POLICY_DEFAULT_CMP0069=NEW' - - '-DENABLE_FDK=ON' cleanup: - /share/man - /share/pixmaps @@ -602,8 +601,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-1898/citra-unified-source-20230504-70335a7.tar.xz - sha256: b320585bd8c4c075f63d3d9c74b830718e58fcf04d987a5dcead402a72abf753 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-1940/citra-unified-source-20230704-df9cc1b.tar.xz + sha256: d63dc8d57b44eebca6abec9839ce67ba7d614e7a8bb62cecbf3c9b0768a0b713 x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest @@ -612,8 +611,6 @@ modules: .assets[] | .browser_download_url | match("https://.+citra-unified-source-.+.xz$") | .string is-main-source: true - - type: patch - path: rd-submodules/citra/unified-source-compat.patch # CITRA - END diff --git a/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/unified-source-compat.patch deleted file mode 100644 index 6a1ca47c..00000000 --- a/rd-submodules/citra/unified-source-compat.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 710f3fcfb..e5f4f4687 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,11 @@ function(check_submodules_present) - endif() - endforeach() - endfunction() --check_submodules_present() -+ -+if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects") -+ # only check submodules when source is obtained via Git -+ check_submodules_present() -+endif() - - configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc - ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc -diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake -index a011c6cbf..87e9eef35 100644 ---- a/CMakeModules/GenerateSCMRev.cmake -+++ b/CMakeModules/GenerateSCMRev.cmake -@@ -6,15 +6,27 @@ endfunction() - - list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules") - --# Find the package here with the known path so that the GetGit commands can find it as well --find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") -- - # generate git/build information --include(GetGitRevisionDescription) --get_git_head_revision(GIT_REF_SPEC GIT_REV) --git_describe(GIT_DESC --always --long --dirty) --git_branch_name(GIT_BRANCH) - get_timestamp(BUILD_DATE) -+if (EXISTS "${SRC_DIR}/.git/objects") -+ # Find the package here with the known path so that the GetGit commands can find it as well -+ find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") -+ # only use Git to check revision info when source is obtained via Git -+ include(GetGitRevisionDescription) -+ get_git_head_revision(GIT_REF_SPEC GIT_REV) -+ git_describe(GIT_DESC --always --long --dirty) -+ git_branch_name(GIT_BRANCH) -+elseif(EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG") -+ # unified source archive -+ file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64) -+ string(STRIP "${GIT_REV_RAW}" GIT_REV) -+ string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC) -+ set(GIT_BRANCH "HEAD") -+else() -+ # self-packed archive? -+ set(GIT_DESC "UNKNOWN") -+ set(GIT_BRANCH "UNKNOWN") -+endif() - - # Generate cpp with Git revision from template - # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well \ No newline at end of file From 5410a2e378a0886fa217ce752ad58107c4e3b477 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:36:28 +0200 Subject: [PATCH 04/11] Updated PCSX2 --- 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 86457c70..2e7ed0b3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -629,8 +629,8 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4570/pcsx2-v1.7.4570-linux-AppImage-64bit-Qt.AppImage - sha256: fab77713f37140451d37b237092df479fa61325a97c038fad5a9c687f1e5f2b1 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4729/pcsx2-v1.7.4729-linux-appimage-x64-Qt.AppImage + sha256: 2e0571926ac6253b7ebaea45c36b3ebd19c2923075c3e76c6b4936c0190867e4 # PCSX2 - END From 7f045e96d038f1915e4e70b7522b086f4f5ca761 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:38:18 +0200 Subject: [PATCH 05/11] Updated Xemu --- net.retrodeck.retrodeck.yml | 4 ++-- rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2e7ed0b3..8f62806d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -807,8 +807,8 @@ modules: sources: - type: git url: https://github.com/xemu-project/xemu.git - tag: v0.7.92 - commit: d557a294feb3ecae8ec22adca0909e2d3adcc459 + tag: v0.7.98 + commit: 7bfb7c85378f64f93556c365ea0cc18cb2181dc8 x-checker-data: type: json url: https://api.github.com/repos/xemu-project/xemu/releases/latest diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 0b1cfb79..fbfdda61 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 +Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index a2441b96..50314360 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 +Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed From b1d91ab399e3df46217fc7f48c7a34ed4da35803 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:57:42 +0200 Subject: [PATCH 06/11] Updated RPCS3 --- 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 8f62806d..9fcc7f8d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -860,7 +860,7 @@ modules: # glu issue, check libglu module for more info #- rd-submodules/shared-modules/glu/glu-9.json - - rd-submodules/shared-modules/glew/glew.json + - rd-submodules/shared-modules/glew/glew.json # RPCS3 is not using this anymore, what about the other emu? Can we remove it? - name: rpcs3 buildsystem: cmake-ninja @@ -905,7 +905,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: 5d7e75c5d8c7492ae655ea38bb7ead4b868a2f17 + commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd # RPCS3 - END From 06284eace0f66558629a2e7adc68c51a23990972 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 11:17:19 +0200 Subject: [PATCH 07/11] Updated Cemu --- net.retrodeck.retrodeck.yml | 49 +++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 9fcc7f8d..2c796a5a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1004,8 +1004,8 @@ modules: - /lib/pkgconfig sources: - type: archive - url: https://libzip.org/download/libzip-1.9.2.tar.xz - sha256: c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 + url: https://libzip.org/download/libzip-1.10.0.tar.xz + sha256: cd2a7ac9f1fb5bfa6218272d9929955dc7237515bba6e14b5ad0e1d1e2212b43 x-checker-data: type: anitya project-id: 10649 @@ -1060,9 +1060,9 @@ modules: type: anitya project-id: 11526 url-template: https://github.com/fmtlib/fmt/archive/$version.tar.gz + versions: {<: '10.0'} - name: wxwidgets - buildsystem: cmake-ninja cleanup: - /bin - /include @@ -1070,15 +1070,14 @@ modules: - /lib/wx - /share sources: - - type: git - url: https://github.com/wxWidgets/wxWidgets - tag: v3.2.2.1 - commit: a812fffda3fe686c94e24bff27e8effd96e4de64 + - type: archive + url: https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1.tar.bz2 + sha256: dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02 x-checker-data: type: anitya project-id: 5150 stable-only: true - tag-template: v$version + url-template: https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2 - name: Cemu buildsystem: cmake-ninja @@ -1095,8 +1094,12 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+-\d+)$ - tag: v2.0-39 - commit: eda4cf4b241d56c5c16f6aa4d135b8a269676a76 + tag: v2.0-44 + commit: f1c200a01675714e51548137f2365ab2a1a9977b + - type: shell + commands: + - sed "s/set(EXPERIMENTAL_VERSION.*/set(EXPERIMENTAL_VERSION \"$(git describe + --tag | sed "s/v2.0-//")\" CACHE STRING \"\")/g" -i CMakeLists.txt - type: script commands: - | @@ -1108,7 +1111,33 @@ modules: done Cemu_relwithdebinfo "$@" dest-filename: Cemu-wrapper + - type: script + dest-filename: dev_release_metainfo.py + commands: + - | + import os + import xml.etree.ElementTree as ET + meta_file = os.environ.get('AS_META_FILE') + version = os.environ.get('AS_META_VERSION') + release_type = os.environ.get('AS_META_TYPE') + release_date = os.environ.get('AS_META_DATE') + release_url = os.environ.get('AS_META_URL') + tree = ET.parse(meta_file) + root = tree.getroot() + el_releases = root.find('releases') + for el_release in el_releases: + el_releases.remove(el_release) + el_release = ET.SubElement(el_releases, 'release') + el_url = ET.SubElement(el_release, 'url') + el_url.text = release_url + el_release.attrib['type'] = release_type + el_release.attrib['date'] = release_date + el_release.attrib['version'] = version + ET.indent(tree, space=' ', level=0) + tree.write(meta_file, encoding='utf8') post-install: + - cp -r bin/gameProfiles ${FLATPAK_DEST}/share/Cemu/ + - cp -r bin/resources ${FLATPAK_DEST}/share/Cemu/ - install -Dm644 -t ${FLATPAK_DEST}/share/icons/hicolor/128x128/apps/ dist/linux/info.cemu.Cemu.png - install -D -t ${FLATPAK_DEST}/bin/ bin/Cemu_relwithdebinfo Cemu-wrapper From 8b42d77571bef26c527882ae3ebc5aff7586c215 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 11:53:33 +0200 Subject: [PATCH 08/11] ES-DE: reverted to the previous version due to patches incompatbility --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2c796a5a..78e004e7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -303,7 +303,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: c78e215d13b02132762b9fbf45ec7b861d50601b + branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From babd77ffb9ca394b987cd4cb72eb6a4ad2dd1f48 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 12:57:06 +0200 Subject: [PATCH 09/11] Reverted Citra as it's on QT6 --- net.retrodeck.retrodeck.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 78e004e7..be3cedd2 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -592,6 +592,7 @@ modules: # FFMPEG VIDEO DUMPER was disabled because of this: https://github.com/citra-emu/citra/issues/5949 - '-DUSE_SYSTEM_SDL2=ON' - '-DCMAKE_POLICY_DEFAULT_CMP0069=NEW' + - '-DENABLE_FDK=ON' cleanup: - /share/man - /share/pixmaps @@ -601,8 +602,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-1940/citra-unified-source-20230704-df9cc1b.tar.xz - sha256: d63dc8d57b44eebca6abec9839ce67ba7d614e7a8bb62cecbf3c9b0768a0b713 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-1898/citra-unified-source-20230504-70335a7.tar.xz + sha256: b320585bd8c4c075f63d3d9c74b830718e58fcf04d987a5dcead402a72abf753 x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest @@ -611,6 +612,9 @@ modules: .assets[] | .browser_download_url | match("https://.+citra-unified-source-.+.xz$") | .string is-main-source: true + - type: patch + path: rd-submodules/citra/unified-source-compat.patch + # CITRA - END From 9c771aeef1604bfc7ba00d874e2f5f4ff2f882b2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 13:00:33 +0200 Subject: [PATCH 10/11] Reverted Citra as it's on QT6 --- .../citra/unified-source-compat.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch diff --git a/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch new file mode 100644 index 00000000..6a1ca47c --- /dev/null +++ b/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 710f3fcfb..e5f4f4687 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,11 @@ function(check_submodules_present) + endif() + endforeach() + endfunction() +-check_submodules_present() ++ ++if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects") ++ # only check submodules when source is obtained via Git ++ check_submodules_present() ++endif() + + configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc + ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc +diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake +index a011c6cbf..87e9eef35 100644 +--- a/CMakeModules/GenerateSCMRev.cmake ++++ b/CMakeModules/GenerateSCMRev.cmake +@@ -6,15 +6,27 @@ endfunction() + + list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules") + +-# Find the package here with the known path so that the GetGit commands can find it as well +-find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") +- + # generate git/build information +-include(GetGitRevisionDescription) +-get_git_head_revision(GIT_REF_SPEC GIT_REV) +-git_describe(GIT_DESC --always --long --dirty) +-git_branch_name(GIT_BRANCH) + get_timestamp(BUILD_DATE) ++if (EXISTS "${SRC_DIR}/.git/objects") ++ # Find the package here with the known path so that the GetGit commands can find it as well ++ find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") ++ # only use Git to check revision info when source is obtained via Git ++ include(GetGitRevisionDescription) ++ get_git_head_revision(GIT_REF_SPEC GIT_REV) ++ git_describe(GIT_DESC --always --long --dirty) ++ git_branch_name(GIT_BRANCH) ++elseif(EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG") ++ # unified source archive ++ file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64) ++ string(STRIP "${GIT_REV_RAW}" GIT_REV) ++ string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC) ++ set(GIT_BRANCH "HEAD") ++else() ++ # self-packed archive? ++ set(GIT_DESC "UNKNOWN") ++ set(GIT_BRANCH "UNKNOWN") ++endif() + + # Generate cpp with Git revision from template + # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well \ No newline at end of file From 6280a13401828217a8b07e6bb6a9e3495e06c61b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 13:19:27 +0200 Subject: [PATCH 11/11] Reverted Citra as it's on QT6 --- .../citra/{rd-submodules/citra => }/unified-source-compat.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rd-submodules/citra/{rd-submodules/citra => }/unified-source-compat.patch (100%) diff --git a/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/unified-source-compat.patch similarity index 100% rename from rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch rename to rd-submodules/citra/unified-source-compat.patch