Merge remote-tracking branch 'upstream/cooker-0.7.1b' into cooker-0.7.1b-icenine451

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
 
@@ -615,6 +615,7 @@ modules:
       - type: patch
         path: rd-submodules/citra/unified-source-compat.patch
 
+
   # CITRA - END
 
   # PCSX2 - START
@@ -632,8 +633,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
 
@@ -810,8 +811,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
@@ -863,7 +864,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
@@ -908,7 +909,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/RPCS3/rpcs3.git
-        commit: 5d7e75c5d8c7492ae655ea38bb7ead4b868a2f17
+        commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd
 
   # RPCS3 - END
 
@@ -1007,8 +1008,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
@@ -1063,9 +1064,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
@@ -1073,15 +1074,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
@@ -1098,8 +1098,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:
           - |
@@ -1111,7 +1115,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
 

rd-submodules/retroarch

@@ -1 +1 @@
-Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
+Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2

rd-submodules/shared-modules

@@ -1 +1 @@
-Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
+Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed