[gamemode] default disable on msvc, move to UI category

Signed-off-by: lizzie <lizzie@eden-emu.dev>

.ci/android/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 export NDK_CCACHE=$(which ccache)

.ci/android/package.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 GITDATE="$(git show -s --date=short --format='%ad' | sed 's/-//g')"

.ci/linux/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 case "$1" in

.ci/linux/package.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # This script assumes you're in the source directory

.ci/translate.sh

@@ -5,7 +5,7 @@ for i in dist/languages/*.ts; do
     TARGET=`head -n1 $i | awk -F 'language="' '{split($2, a, "\""); print a[1]}'`
 
     # requires fd
-    SOURCES=`fd . src/yuzu src/qt_common -tf -e ui -e cpp -e h -e plist`
+    SOURCES=`fd . src/yuzu -tf -e ui -e cpp -e h -e plist`
 
     lupdate -source-language $SRC -target-language $TARGET $SOURCES -ts /data/code/eden/$i
 done

.ci/update-icons.sh

@@ -1,7 +1,8 @@
 #!/bin/sh -e
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+
+# SPDX-FileCopyrightText: 2025 eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
-# Updates main icons for eden
+
 which png2icns || [ which yay && yay libicns ] || exit
 which magick || exit
 

.ci/windows/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ "$COMPILER" == "clang" ]

.tx/config

@@ -1,21 +0,0 @@
-[main]
-host = https://app.transifex.com
-
-[o:edenemu:p:eden-emulator:r:android-translations]
-file_filter            = src/android/app/src/main/res/values-<lang>/strings.xml
-source_file            = src/android/app/src/main/res/values/strings.xml
-type                   = ANDROID
-minimum_perc           = 0
-resource_name          = Android Translations
-replace_edited_strings = false
-keep_translations      = false
-lang_map = zh_CN: zh-rCN, zh_TW: zh-rTW, pt_BR: pt-rBR, pt_PT: pt-rPT, vi_VN: vi, ku: ckb, ja_JP: ja, ko_KR: ko, ru_RU: ru
-
-[o:edenemu:p:eden-emulator:r:qt-translations]
-file_filter            = dist/languages/<lang>.ts
-source_file            = dist/languages/en.ts
-type                   = QT
-minimum_perc           = 0
-resource_name          = Qt Translations
-replace_edited_strings = false
-keep_translations      = false

CMakeLists.txt

@@ -165,8 +165,7 @@ option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if n
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF)
 
-option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF)
+option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ${EXT_DEFAULT})
 
 option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
 
@@ -185,8 +184,12 @@ option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ${EXT_DEFAULT})
 # TODO(crueter): CI this?
 option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
 
+option(FORCE_DOWNLOAD_WIN_BUNDLES "Forcefully download bundled Windows dependencies (useful for CI)" OFF)
+
 # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" OFF)
+if (YUZU_USE_CPM AND ENABLE_SDL2)
+    option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")
+endif()
 
 CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
 
@@ -206,8 +209,6 @@ CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead
 
 set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")
 
-option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)
-
 set(DEFAULT_ENABLE_OPENSSL ON)
 if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
     # - Windows defaults to the Schannel backend.
@@ -230,13 +231,12 @@ if (ENABLE_OPENSSL)
 endif()
 
 if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
-    # TODO(crueter): CPM this
-    set(vvl_version "1.4.321.0")
+    set(vvl_version "sdk-1.3.261.1")
     set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
     if (NOT EXISTS "${vvl_zip_file}")
         # Download and extract validation layer release to externals directory
         set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
-        file(DOWNLOAD "${vvl_base_url}/vulkan-sdk-${vvl_version}/android-binaries-${vvl_version}.zip"
+        file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
             "${vvl_zip_file}" SHOW_PROGRESS)
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
@@ -379,7 +379,6 @@ if (YUZU_USE_CPM)
 
     set(BUILD_SHARED_LIBS OFF)
     set(BUILD_TESTING OFF)
-    set(ENABLE_TESTING OFF)
 
     # TODO(crueter): renderdoc?
 
@@ -449,10 +448,6 @@ if (YUZU_USE_CPM)
         target_include_directories(enet INTERFACE ${enet_SOURCE_DIR}/include)
     endif()
 
-    if (NOT TARGET enet::enet)
-        add_library(enet::enet ALIAS enet)
-    endif()
-
     # Opus
     AddJsonPackage(opus)
 
@@ -464,10 +459,6 @@ if (YUZU_USE_CPM)
         endif()
     endif()
 
-    if (NOT TARGET Opus::opus)
-        add_library(Opus::opus ALIAS opus)
-    endif()
-
     # VulkanUtilityHeaders - pulls in headers and utility libs
     AddJsonPackage(vulkan-utility-headers)
 
@@ -492,10 +483,7 @@ if (YUZU_USE_CPM)
 else()
     # Enforce the search mode of non-required packages for better and shorter failure messages
     find_package(fmt 8 REQUIRED)
-    if (NOT YUZU_DISABLE_LLVM)
-        find_package(LLVM MODULE COMPONENTS Demangle)
-    endif()
-
+    find_package(LLVM MODULE COMPONENTS Demangle)
     find_package(nlohmann_json 3.8 REQUIRED)
     find_package(lz4 REQUIRED)
     find_package(RenderDoc MODULE)
@@ -535,6 +523,10 @@ else()
         find_package(Catch2 3.0.1 REQUIRED)
     endif()
 
+    if (PLATFORM_LINUX OR ANDROID)
+        find_package(gamemode 1.7 MODULE)
+    endif()
+
     if (ENABLE_OPENSSL)
         find_package(OpenSSL 1.1.1 REQUIRED)
     endif()
@@ -584,10 +576,6 @@ if(ENABLE_CUBEB)
             )
         endif()
     endif()
-
-    if (NOT TARGET cubeb::cubeb)
-        add_library(cubeb::cubeb ALIAS cubeb)
-    endif()
 endif()
 
 # find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the YUZU_find_package
@@ -658,7 +646,6 @@ add_subdirectory(externals)
 # pass targets from externals
 find_package(libusb)
 find_package(VulkanMemoryAllocator)
-find_package(gamemode)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
@@ -672,6 +659,10 @@ if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
     find_package(cpp-jwt)
 endif()
 
+if (ENABLE_SDL2)
+    find_package(SDL2)
+endif()
+
 if (ENABLE_QT)
     if (YUZU_USE_BUNDLED_QT)
         download_qt(6.8.3)
@@ -744,8 +735,9 @@ if (UNIX AND NOT APPLE AND NOT ANDROID)
     pkg_check_modules(LIBVA libva)
 endif()
 
-if (NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
+if (NOT YUZU_USE_BUNDLED_FFMPEG)
     # Use system installed FFmpeg
+    #find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
     find_package(FFmpeg REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
 
     # TODO(crueter): Version

CMakeModules/CPMUtil.cmake

@@ -126,15 +126,6 @@ function(AddJsonPackage)
             DISABLED_PLATFORMS ${disabled_platforms}
             CMAKE_FILENAME ${cmake_filename}
         )
-
-        # pass stuff to parent scope
-        set(${package}_ADDED "${${package}_ADDED}"
-            PARENT_SCOPE)
-        set(${package}_SOURCE_DIR "${${package}_SOURCE_DIR}"
-            PARENT_SCOPE)
-        set(${package}_BINARY_DIR "${${package}_BINARY_DIR}"
-            PARENT_SCOPE)
-
         return()
     endif()
 
@@ -608,8 +599,11 @@ function(AddCIPackage)
     if (DEFINED ARTIFACT_DIR)
         include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake)
 
+        set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_NAMES ${ARTIFACT_NAME})
+        set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_URLS "https://github.com/${ARTIFACT_REPO}") # TODO(crueter) other hosts?
+        set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS ${ARTIFACT_VERSION})
+
         set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
-        set(${ARTIFACT_PACKAGE}_SOURCE_DIR "${ARTIFACT_DIR}" PARENT_SCOPE)
     else()
         find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED)
     endif()

CMakeModules/DownloadExternals.cmake

@@ -51,6 +51,15 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
     message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
 endfunction()
 
+function(download_win_archives)
+    set(FORCE_WIN_ARCHIVES ON)
+    set(FFmpeg_EXT_NAME "ffmpeg-7.1.1")
+
+    download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "ffmpeg-bundled" "" 7.1.1)
+
+    set(FORCE_WIN_ARCHIVES OFF)
+endfunction()
+
 function(download_moltenvk_external platform version)
     set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
     set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")

CMakeModules/Findsirit.cmake

@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_search_module(sirit QUIET IMPORTED_TARGET sirit)
+find_package_handle_standard_args(sirit
+    REQUIRED_VARS sirit_LINK_LIBRARIES
+    VERSION_VAR sirit_VERSION
+)

CMakeModules/GenerateSCMRev.cmake

@@ -1,35 +1,38 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# generate git/build information
-include(GetSCMRev)
-
+# Gets a UTC timestamp and sets the provided variable to it
 function(get_timestamp _var)
     string(TIMESTAMP timestamp UTC)
     set(${_var} "${timestamp}" PARENT_SCOPE)
 endfunction()
 
+# generate git/build information
+include(GetGitRevisionDescription)
+if(NOT GIT_REF_SPEC)
+    get_git_head_revision(GIT_REF_SPEC GIT_REV)
+endif()
+if(NOT GIT_DESC)
+    git_describe(GIT_DESC --always --long --dirty)
+endif()
+if (NOT GIT_BRANCH)
+  git_branch_name(GIT_BRANCH)
+endif()
 get_timestamp(BUILD_DATE)
 
-if (DEFINED GIT_RELEASE)
-  set(BUILD_VERSION "${GIT_TAG}")
-  set(GIT_REFSPEC "${GIT_RELEASE}")
-  set(IS_DEV_BUILD false)
-else()
-  string(SUBSTRING ${GIT_COMMIT} 0 10 BUILD_VERSION)
-  set(BUILD_VERSION "${BUILD_VERSION}-${GIT_REFSPEC}")
+git_get_exact_tag(GIT_TAG --tags)
+if (GIT_TAG MATCHES "NOTFOUND")
+  set(BUILD_VERSION "${GIT_DESC}")
   set(IS_DEV_BUILD true)
+else()
+  set(BUILD_VERSION ${GIT_TAG})
+  set(IS_DEV_BUILD false)
 endif()
 
-set(GIT_DESC ${BUILD_VERSION})
-
 # 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
 set(REPO_NAME "Eden")
-set(BUILD_ID ${GIT_REFSPEC})
+set(BUILD_ID ${GIT_BRANCH})
 set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION} ")
 
 set(CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")

CMakeModules/GetSCMRev.cmake

@@ -1,49 +0,0 @@
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-include(GetGitRevisionDescription)
-
-function(trim var)
-  string(REGEX REPLACE "\n" "" new "${${var}}")
-  set(${var} ${new} PARENT_SCOPE)
-endfunction()
-
-set(TAG_FILE ${CMAKE_SOURCE_DIR}/GIT-TAG)
-set(REF_FILE ${CMAKE_SOURCE_DIR}/GIT-REFSPEC)
-set(COMMIT_FILE ${CMAKE_SOURCE_DIR}/GIT-COMMIT)
-set(RELEASE_FILE ${CMAKE_SOURCE_DIR}/GIT-RELEASE)
-
-if (EXISTS ${REF_FILE} AND EXISTS ${COMMIT_FILE})
-  file(READ ${REF_FILE} GIT_REFSPEC)
-  file(READ ${COMMIT_FILE} GIT_COMMIT)
-else()
-  get_git_head_revision(GIT_REFSPEC GIT_COMMIT)
-  git_branch_name(GIT_REFSPEC)
-  if (GIT_REFSPEC MATCHES "NOTFOUND")
-    set(GIT_REFSPEC 1.0.0)
-    set(GIT_COMMIT stable)
-  endif()
-endif()
-
-if (EXISTS ${TAG_FILE})
-  file(READ ${TAG_FILE} GIT_TAG)
-else()
-  git_describe(GIT_TAG --tags --abbrev=0)
-  if (GIT_TAG MATCHES "NOTFOUND")
-    set(GIT_TAG "${GIT_REFSPEC}")
-  endif()
-endif()
-
-if (EXISTS ${RELEASE_FILE})
-  file(READ ${RELEASE_FILE} GIT_RELEASE)
-  trim(GIT_RELEASE)
-  message(STATUS "Git release: ${GIT_RELEASE}")
-endif()
-
-trim(GIT_REFSPEC)
-trim(GIT_COMMIT)
-trim(GIT_TAG)
-
-message(STATUS "Git commit: ${GIT_COMMIT}")
-message(STATUS "Git tag: ${GIT_TAG}")
-message(STATUS "Git refspec: ${GIT_REFSPEC}")

CMakeModules/WindowsCopyFiles.cmake

@@ -1,6 +1,3 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 

README.md

@@ -55,10 +55,6 @@ You can also follow us on [X (Twitter)](https://x.com/edenemuofficial) for updat
 
 If you would like to contribute, we are open to new developers and pull requests. Please ensure that your work is of a high standard and properly documented. You can also contact any of the developers on Discord or Revolt to learn more about the current state of the emulator.
 
-See the [sign-up instructions](docs/SIGNUP.md) for information on registration.
-
-Alternatively, if you wish to add translations, go to the [Eden project on Transifex](https://app.transifex.com/edenemu/eden-emulator) and review [the translations README](./dist/languages).
-
 ## Building
 
 See the [General Build Guide](docs/Build.md)

cpmfile.json

@@ -4,7 +4,7 @@
         "package": "OpenSSL",
         "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "3.5.3",
+        "version": "3.5.2",
         "min_version": "1.1.1"
     },
     "boost": {

dist/languages/README.md

@@ -1,7 +1,3 @@
-This directory stores translation patches (TS files) for yuzu Qt frontend. This directory is linked with the [Eden project on transifex](https://app.transifex.com/edenemu/eden-emulator), so you can update the translation by executing `tx pull -t -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically. Do not directly open PRs on github to modify the translation.
+This directory stores translation patches (TS files) for yuzu Qt frontend. This directory is linked with [yuzu project on transifex](https://www.transifex.com/yuzu-emulator/yuzu), so you can update the translation by executing `tx pull -t -a`. If you want to contribute to the translation, please go the transifex link and submit your translation there. This directory on the main repo will be synchronized with transifex periodically.
 
-When creating/improving translations, please keep in mind:
-
-- You are responsible for providing accurate translations that do NOT contain illicit content or messages,
-- Many of our developers do not speak the languages you may be translating, so will only be able to help with confusions about the source language,
-- And bad-faith translations or attempts to insert illicit content may result in an immediate removal of access.
+Do not directly open PRs on github to modify the translation.