From 51feed8d9022fe44b1826952a87046dfdd76911a Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Fri, 14 Jul 2023 10:36:07 +0200
Subject: [PATCH] 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