Merge branch 'fix-windows' into 'dev'

Windows build + remove dependency from github.com See merge request suyu-emu/suyu!11
Merge branch 'zqpvr-master-patch-36851' into 'dev'
2024-03-06 13:02:11 +00:00 · 2024-03-06 13:00:56 +00:00 · 2024-03-06 13:00:56 +00:00 · 2024-03-06 13:00:10 +00:00 · 2024-03-06 13:32:29 +01:00 · 2024-03-06 11:56:24 +00:00
30 changed files with 138 additions and 167 deletions
--- a/.ci/scripts/linux/upload.sh
+++ b/.ci/scripts/linux/upload.sh
@ -3,6 +3,8 @@
 # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

+# Modified by JuanCStar on 2024/03/06
+
 . .ci/scripts/common/pre-upload.sh

 APPIMAGE_NAME="yuzu-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
@ -37,7 +39,7 @@ fi

 # Don't let AppImageLauncher ask to integrate EA
 if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
-    echo "X-AppImage-Integrate=false" >> AppDir/org.yuzu_emu.yuzu.desktop
+    echo "X-AppImage-Integrate=false" >> AppDir/org.suyu_emu.suyu.desktop
 fi

 if [ "${RELEASE_NAME}" = "mainline" ]; then
--- a/.gitmodules
+++ b/.gitmodules
@ -9,22 +9,22 @@
 	url = https://github.com/mozilla/cubeb.git
 [submodule "dynarmic"]
 	path = externals/dynarmic
-	url = https://github.com/merryhime/dynarmic.git
+	url = https://gitlab.com/suyu-emu/dynarmic.git
 [submodule "libusb"]
 	path = externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
 	path = externals/discord-rpc
-	url = https://gitlab.com/suyu2/discord-rpc.git
+	url = https://gitlab.com/suyu-emu/discord-rpc.git
 [submodule "Vulkan-Headers"]
 	path = externals/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
 [submodule "sirit"]
 	path = externals/sirit
-	url = https://gitlab.com/suyu2/sirit.git
+	url = https://gitlab.com/suyu-emu/sirit.git
 [submodule "mbedtls"]
 	path = externals/mbedtls
-	url = https://gitlab.com/suyu2/mbedtls.git
+	url = https://gitlab.com/suyu-emu/mbedtls.git
 [submodule "xbyak"]
 	path = externals/xbyak
 	url = https://github.com/herumi/xbyak.git
@ -57,7 +57,7 @@
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
 [submodule "breakpad"]
 	path = externals/breakpad
-	url = https://gitlab.com/suyu2/breakpad.git
+	url = https://gitlab.com/suyu-emu/breakpad.git
 [submodule "simpleini"]
 	path = externals/simpleini
 	url = https://github.com/brofield/simpleini.git
@ -67,69 +67,3 @@
 [submodule "Vulkan-Utility-Libraries"]
 	path = externals/Vulkan-Utility-Libraries
 	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
-[submodule "externals/cubeb"]
-	path = externals/cubeb
-	url = https://github.com/mozilla/cubeb.git
-[submodule "externals/Vulkan-Headers"]
-	path = externals/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
-[submodule "externals/breakpad"]
-	path = externals/breakpad
-	url = https://gitlab.com/suyu2/breakpad.git
-[submodule "externals/VulkanMemoryAllocator"]
-	path = externals/VulkanMemoryAllocator
-	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-[submodule "externals/SDL"]
-	path = externals/SDL
-	url = https://github.com/libsdl-org/SDL.git
-[submodule "externals/mbedtls"]
-	path = externals/mbedtls
-	url = https://gitlab.com/suyu2/mbedtls.git
-[submodule "externals/Vulkan-Utility-Libraries"]
-	path = externals/Vulkan-Utility-Libraries
-	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
-[submodule "externals/oaknut"]
-	path = externals/oaknut
-	url = https://github.com/merryhime/oaknut.git
-[submodule "externals/sirit"]
-	path = externals/sirit
-	url = https://gitlab.com/suyu2/sirit.git
-[submodule "externals/enet"]
-	path = externals/enet
-	url = https://github.com/lsalzman/enet.git
-[submodule "externals/opus"]
-	path = externals/opus
-	url = https://github.com/xiph/opus.git
-[submodule "externals/xbyak"]
-	path = externals/xbyak
-	url = https://github.com/herumi/xbyak.git
-[submodule "externals/simpleini"]
-	path = externals/simpleini
-	url = https://github.com/brofield/simpleini.git
-[submodule "externals/nx_tzdb/tzdb_to_nx"]
-	path = externals/nx_tzdb/tzdb_to_nx
-	url = https://github.com/lat9nq/tzdb_to_nx.git
-[submodule "externals/cpp-jwt"]
-	path = externals/cpp-jwt
-	url = https://github.com/arun11299/cpp-jwt.git
-[submodule "externals/vcpkg"]
-	path = externals/vcpkg
-	url = https://github.com/microsoft/vcpkg.git
-[submodule "externals/cpp-httplib"]
-	path = externals/cpp-httplib
-	url = https://github.com/yhirose/cpp-httplib.git
-[submodule "externals/libusb/libusb"]
-	path = externals/libusb/libusb
-	url = https://github.com/libusb/libusb.git
-[submodule "externals/discord-rpc"]
-	path = externals/discord-rpc
-	url = https://gitlab.com/suyu2/discord-rpc.git
-[submodule "externals/libadrenotools"]
-	path = externals/libadrenotools
-	url = https://github.com/bylaws/libadrenotools.git
-[submodule "externals/ffmpeg/ffmpeg"]
-	path = externals/ffmpeg/ffmpeg
-	url = https://github.com/FFmpeg/FFmpeg.git
-[submodule "externals/dynarmic"]
-	path = externals/dynarmic
-	url = https://gitlab.com/suyu2/dynarmic.git
--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -9,15 +9,15 @@ Files: dist/english_plurals/*
       dist/qt_themes/*/icons/48x48/sd_card.png
       dist/qt_themes/*/icons/index.theme
       dist/qt_themes/default/style.qss
-Copyright: yuzu Emulator Project
+Copyright: suyu Emulator Project
 License: GPL-2.0-or-later

 Files: dist/qt_themes/default/icons/256x256/yuzu.png
       dist/yuzu.bmp
       dist/yuzu.icns
-       dist/yuzu.ico
-       dist/yuzu.svg
-Copyright: yuzu Emulator Project
+       dist/suyu.ico
+       dist/suyu.svg
+Copyright: suyu Emulator Project
 License: GPL-2.0-or-later

 Files: dist/qt_themes/qdarkstyle*/LICENSE.*
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

+# Modified by JuanCStar on 2024/03/06
+
 cmake_minimum_required(VERSION 3.22)

 project(yuzu)
@ -126,7 +128,7 @@ if (YUZU_USE_BUNDLED_VCPKG)
        set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads)
        set(NASM_VERSION "2.16.01")
        set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip)
-        set(NASM_DOWNLOAD_URL "https://github.com/yuzu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip")
+        set(NASM_DOWNLOAD_URL "https://gitlab.com/suyu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip")

        if (NOT EXISTS ${NASM_DESTINATION_PATH})
            file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS)
@ -620,7 +622,7 @@ if (NOT CLANG_FORMAT)
        message(STATUS "Clang format not found! Downloading...")
        set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe")
        file(DOWNLOAD
-            https://github.com/yuzu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
+            https://gitlab.com/suyu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe
            "${CLANG_FORMAT}" SHOW_PROGRESS
            STATUS DOWNLOAD_SUCCESS)
        if (NOT DOWNLOAD_SUCCESS EQUAL 0)
@ -720,13 +722,13 @@ endif()
 # https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 # https://www.freedesktop.org/software/appstream/docs/
 if(ENABLE_QT AND UNIX AND NOT APPLE)
-    install(FILES "dist/org.yuzu_emu.yuzu.desktop"
+    install(FILES "dist/org.suyu_emu.suyu.desktop"
            DESTINATION "share/applications")
-    install(FILES "dist/yuzu.svg"
+    install(FILES "dist/suyu.svg"
            DESTINATION "share/icons/hicolor/scalable/apps"
-            RENAME "org.yuzu_emu.yuzu.svg")
-    install(FILES "dist/org.yuzu_emu.yuzu.xml"
+            RENAME "org.suyu_emu.suyu.svg")
+    install(FILES "dist/org.suyu_emu.suyu.xml"
            DESTINATION "share/mime/packages")
-    install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml"
+    install(FILES "dist/org.suyu_emu.suyu.metainfo.xml"
            DESTINATION "share/metainfo")
 endif()
--- a/CMakeModules/DownloadExternals.cmake
+++ b/CMakeModules/DownloadExternals.cmake
@ -7,17 +7,18 @@
 #   prefix_var: name of a variable which will be set with the path to the extracted contents
 function(download_bundled_external remote_path lib_name prefix_var)

-set(package_base_url "https://github.com/yuzu-emu/")
+set(package_base_url "https://gitlab.com/suyu-emu/")
 set(package_repo "no_platform")
 set(package_extension "no_platform")
+set(package_head "?ref_type=heads")
 if (WIN32)
-    set(package_repo "ext-windows-bin/raw/master/")
+    set(package_repo "ext-windows-bin/-/raw/master/")
    set(package_extension ".7z")
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    set(package_repo "ext-linux-bin/raw/main/")
+    set(package_repo "ext-linux-bin/-/raw/main/")
    set(package_extension ".tar.xz")
 elseif (ANDROID)    
-    set(package_repo "ext-android-bin/raw/main/")
+    set(package_repo "ext-android-bin/-/raw/main/")
    set(package_extension ".tar.xz")
 else()
    message(FATAL_ERROR "No package available for this platform")
@ -28,7 +29,7 @@ set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")
 if (NOT EXISTS "${prefix}")
    message(STATUS "Downloading binaries for ${lib_name}...")
    file(DOWNLOAD
-        ${package_url}${remote_path}${lib_name}${package_extension}
+        ${package_url}${remote_path}${lib_name}${package_extension}${package_head}
        "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" SHOW_PROGRESS)
    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}"
        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -3,4 +3,4 @@ SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->

-**The Contributor's Guide has moved to [the yuzu wiki](https://github.com/yuzu-emu/yuzu/wiki/Contributing).**
+**The Contributor's Guide has moved to [the suyu wiki](https://gitlab.com/suyu2/suyu/-/wikis/Contributing).**
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@ SPDX-FileCopyrightText: 2024 suyu emulator project
 SPDX-License-Identifier: GPL v3
 -->

-<h4>This project DOES NOT suppot piracy, you are required to source your own games and keys, we make no money off this project (mainly so that Nintendon't sue us lol)</h4>
+<h4>This project DOES NOT support piracy, you are required to source your own games and keys, we make no money off this project (mainly so that Nintendo won't sue us lol)</h4>


 We are in great need of developers, join our discord server at <a href="https://discord.gg/2gQRBp44KT">https://discord.gg/2gQRBp44KT</a>
@ -18,7 +18,7 @@ This repo is created based on yuzu EA 4176. Please contribute
  <br>
 </h1>

-<h4 align="center"><b>suyu</b>, prounced "sue-you" is the afterlife the world's most popular, open-source, Nintendo Switch emulator — started by the creators of <a href="https://citra-emu.org" target="_blank">Citra</a>.
+<h4 align="center"><b>suyu</b>, pronounced "sue-you" is the afterlife the world's most popular, open-source, Nintendo Switch emulator — started by the creators of <a href="https://citra-emu.org" target="_blank">Citra</a>.
 <br>
 It is written in C++ with portability in mind, and we actively maintain builds for Windows, Linux and Android.
 </h4>
@ -65,7 +65,7 @@ This project is completely free and open source, this project is made possible b

 Most of the development happens on GitHub. For development discussion, please join us on [Discord](https://discord.gg/2gQRBp44KT).

-If you want to contribute, please take a look at the [Contributor's Guide](https://github.com/suyu-emu/suyu/wiki/Contributing) and [Developer Information](https://github.com/suyu-emu/suyu/wiki/Developer-Information).
+If you want to contribute, please take a look at the [Contributor's Guide](https://gitlab.com/suyu-emu/suyu/-/wikis/Contributing) and [Developer Information](https://gitlab.com/suyu-emu/suyu/-/wikis/Developer-Information).
 You can also contact any of the developers on Discord in order to know about the current state of the emulator.

 If you want to contribute to the user interface translation project, please check out the [suyu project on transifex](https://www.transifex.com/suyu-emulator/suyu). We centralize translation work there, and periodically upstream translations.
--- a/dist/org.suyu_emu.suyu.desktop
+++ b/dist/org.suyu_emu.suyu.desktop
@ -1,16 +1,16 @@
-# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+# SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=yuzu
+Name=suyu
 GenericName=Switch Emulator
 Comment=Nintendo Switch video game console emulator
-Icon=org.yuzu_emu.yuzu
-TryExec=yuzu
-Exec=yuzu %f
+Icon=org.suyu_emu.suyu
+TryExec=suyu
+Exec=suyu %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
 Keywords=Nintendo;Switch;
-StartupWMClass=yuzu
+StartupWMClass=suyu
--- a/dist/org.suyu_emu.suyu.metainfo.xml
+++ b/dist/org.suyu_emu.suyu.metainfo.xml
@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--
-SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+SPDX-FileCopyrightText: 2021 yuzu Emulator Project & 2024 suyu Emulator Project
 SPDX-License-Identifier: CC0-1.0
 -->

 <component type="desktop-application">
-  <id>org.yuzu_emu.yuzu</id>
+  <id>org.suyu_emu.suyu</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <name>yuzu</name>
+  <name>suyu</name>
  <summary>Nintendo Switch emulator</summary>
  <description>
-    <p>yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.</p>
+    <p>suyu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.</p>
    <p>The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.</p>
-    <p>For a full list of games yuzu support, please visit our Compatibility page.</p>
+    <p>For a full list of games suyu support, please visit our Compatibility page.</p>
    <p>Check out our website for the latest news on exciting features, monthly progress reports, and more!</p>
  </description>
  <categories>
@ -24,19 +24,19 @@ SPDX-License-Identifier: CC0-1.0
    <keyword>switch</keyword>
    <keyword>emulator</keyword>
  </keywords>
-  <url type="homepage">https://yuzu-emu.org/</url>
-  <url type="bugtracker">https://github.com/yuzu-emu/yuzu/issues</url>
-  <url type="faq">https://yuzu-emu.org/wiki/faq/</url>
-  <url type="help">https://yuzu-emu.org/wiki/home/</url>
-  <url type="donation">https://yuzu-emu.org/donate/</url>
-  <url type="translate">https://www.transifex.com/projects/p/yuzu</url>
+  <url type="homepage">https://suyu-emu.org/</url>
+  <url type="bugtracker">https://gitlab.com/suyu-emu/suyu/issues</url>
+  <url type="faq">https://suyu-emu.org/wiki/faq/</url>
+  <url type="help">https://suyu-emu.org/wiki/home/</url>
+  <url type="donation">https://suyu-emu.org/donate/</url>
+  <url type="translate">https://www.transifex.com/projects/p/suyu</url>
  <url type="contact">https://community.citra-emu.org/</url>
-  <url type="vcs-browser">https://github.com/yuzu-emu/yuzu</url>
-  <url type="contribute">https://yuzu-emu.org/wiki/contributing/</url>
-  <launchable type="desktop-id">org.yuzu_emu.yuzu.desktop</launchable>
+  <url type="vcs-browser">https://gitlab.com/suyu-emu/suyu</url>
+  <url type="contribute">https://suyu-emu.org/wiki/contributing/</url>
+  <launchable type="desktop-id">org.suyu_emu.suyu.desktop</launchable>
  <provides>
-    <binary>yuzu</binary>
-    <binary>yuzu-cmd</binary>
+    <binary>suyu</binary>
+    <binary>suyu-cmd</binary>
  </provides>
  <supports>
    <control>pointing</control>
@ -50,13 +50,13 @@ SPDX-License-Identifier: CC0-1.0
    <memory>16384</memory>
  </recommends>
  <project_license>GPL-3.0-or-later</project_license>
-  <developer_name>yuzu Emulator Team</developer_name>
+  <developer_name>suyu Emulator Team</developer_name>
  <content_rating type="oars-1.0"/>
  <screenshots>
-    <screenshot type="default"><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</image></screenshot>
+    <screenshot type="default"><image>https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</image></screenshot>
+    <screenshot><image>https://raw.githubusercontent.com/suyu-emu/suyu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</image></screenshot>
  </screenshots>
 </component>
--- a/dist/org.suyu_emu.suyu.xml
+++ b/dist/org.suyu_emu.suyu.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--
-SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->

@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
    <mime-type type="application/x-nx-nro">
        <comment>Nintendo Switch homebrew executable</comment>
        <acronym>NRO</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="org.suyu_emu.suyu"/>
        <glob pattern="*.nro"/>
        <magic><match value="NRO" type="string" offset="16"/></magic>
    </mime-type>
@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
    <mime-type type="application/x-nx-nso">
        <comment>Nintendo Switch homebrew executable</comment>
        <acronym>NSO</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="org.suyu_emu.suyu"/>
        <glob pattern="*.nso"/>
        <magic><match value="NSO" type="string" offset="0"/></magic>
    </mime-type>
@ -25,7 +25,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
    <mime-type type="application/x-nx-nsp">
        <comment>Nintendo Switch Package</comment>
        <acronym>NSP</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="org.suyu_emu.suyu"/>
        <glob pattern="*.nsp"/>
        <magic><match value="PFS" type="string" offset="0"/></magic>
    </mime-type>
@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
    <mime-type type="application/x-nx-xci">
        <comment>Nintendo Switch Card Image</comment>
        <acronym>XCI</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="org.suyu_emu.suyu"/>
        <glob pattern="*.xci"/>
    </mime-type>
 </mime-info>
--- a/dist/suyu.bmp
+++ b/dist/suyu.bmp
--- a/dist/suyu.ico
+++ b/dist/suyu.ico
--- a/dist/suyu.manifest
+++ b/dist/suyu.manifest
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <!--
-SPDX-FileCopyrightText: 2020 yuzu Emulator Project
+SPDX-FileCopyrightText: 2020 yuzu Emulator Project & 2024 suyu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
 -->

--- a/dist/suyu.svg
+++ b/dist/suyu.svg
@ -0,0 +1,4 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M394.633 471.208C407.342 448.401 414.583 422.138 414.583 394.194C414.583 306.657 343.529 235.612 255.992 235.612C190.969 235.612 138.192 182.835 138.192 117.806C138.192 52.7762 190.969 0 255.992 0C397.313 0 512 114.688 512 256C512 346.235 465.227 425.613 394.633 471.208ZM255.992 52.7613C244.032 52.7613 234.316 62.4761 234.316 74.4429C234.316 86.4084 244.032 96.1245 255.992 96.1245C267.969 96.1245 277.673 86.4084 277.673 74.4429C277.673 62.4761 267.969 52.7613 255.992 52.7613ZM299.355 96.1245C287.391 96.1245 277.673 105.839 277.673 117.806C277.673 129.772 287.391 139.488 299.355 139.488C311.332 139.488 321.036 129.772 321.036 117.806C321.036 105.839 311.332 96.1245 299.355 96.1245ZM212.634 96.1245C200.669 96.1245 190.954 105.839 190.954 117.806C190.954 129.772 200.669 139.488 212.634 139.488C224.601 139.488 234.316 129.772 234.316 117.806C234.316 105.839 224.601 96.1245 212.634 96.1245ZM255.992 139.488C244.032 139.488 234.316 149.203 234.316 161.168C234.316 173.135 244.032 182.85 255.992 182.85C267.969 182.85 277.673 173.135 277.673 161.168C277.673 149.203 267.969 139.488 255.992 139.488Z" fill="#FF3554"/>
+<path d="M117.361 40.7917C104.657 63.5994 97.4173 89.8623 97.4173 117.806C97.4173 205.343 168.461 276.388 255.992 276.388C321.022 276.388 373.805 329.165 373.805 394.194C373.805 459.222 321.022 512 255.992 512C114.687 512 0 397.312 0 256C0 165.766 46.7638 86.3854 117.361 40.7917ZM255.992 329.149C244.032 329.149 234.316 338.865 234.316 350.831C234.316 362.798 244.032 372.512 255.992 372.512C267.969 372.512 277.673 362.798 277.673 350.831C277.673 338.865 267.969 329.149 255.992 329.149ZM299.355 372.512C287.391 372.512 277.673 382.227 277.673 394.194C277.673 406.161 287.391 415.876 299.355 415.876C311.332 415.876 321.036 406.161 321.036 394.194C321.036 382.227 311.332 372.512 299.355 372.512ZM255.992 415.876C244.032 415.876 234.316 425.59 234.316 437.557C234.316 449.523 244.032 459.239 255.992 459.239C267.969 459.239 277.673 449.523 277.673 437.557C277.673 425.59 267.969 415.876 255.992 415.876ZM212.635 372.512C200.669 372.512 190.955 382.227 190.955 394.194C190.955 406.161 200.669 415.876 212.635 415.876C224.601 415.876 234.316 406.161 234.316 394.194C234.316 382.227 224.601 372.512 212.635 372.512Z" fill="#3A99FF"/>
+</svg>
--- a/dist/yuzu.bmp
+++ b/dist/yuzu.bmp
--- a/dist/yuzu.ico
+++ b/dist/yuzu.ico
--- a/src/core/hle/service/cmif_types.h
+++ b/src/core/hle/service/cmif_types.h
@ -12,8 +12,10 @@ namespace Service {

 // clang-format off
 template <typename T>
-struct AutoOut {
-    T raw;
+class AutoOut {
+    public:
+        T raw;
+        AutoOut() : raw() {}
 };

 template <typename T>
--- a/src/core/hle/service/set/settings_types.h
+++ b/src/core/hle/service/set/settings_types.h
@ -401,6 +401,10 @@ static_assert(sizeof(AccountNotificationSettings) == 0x18,
 /// This is nn::settings::factory::BatteryLot
 struct BatteryLot {
    std::array<char, 0x18> lot_number;
+    BatteryLot() = default;
+    BatteryLot(const char* str) {
+        std::copy(str, str + std::min(sizeof(lot_number), strlen(str)), lot_number.begin());
+    }
 };
 static_assert(sizeof(BatteryLot) == 0x18, "BatteryLot is an invalid size");

@ -477,6 +481,10 @@ static_assert(sizeof(NotificationSettings) == 0x18, "NotificationSettings is an
 /// This is nn::settings::factory::SerialNumber
 struct SerialNumber {
    std::array<char, 0x18> serial_number;
+    SerialNumber() = default;
+    SerialNumber(const char* str) {
+        std::copy(str, str + std::min(sizeof(serial_number), strlen(str)), serial_number.begin());
+    }
 };
 static_assert(sizeof(SerialNumber) == 0x18, "SerialNumber is an invalid size");

--- a/src/core/hle/service/set/system_settings_server.cpp
+++ b/src/core/hle/service/set/system_settings_server.cpp
@ -939,7 +939,7 @@ Result ISystemSettingsServer::GetBatteryLot(Out<BatteryLot> out_battery_lot) {
 Result ISystemSettingsServer::GetSerialNumber(Out<SerialNumber> out_console_serial) {
    LOG_INFO(Service_SET, "called");

-    *out_console_serial = {"YUZ10000000001"};
+    *out_console_serial = SerialNumber("YUZ10000000001");
    R_SUCCEED();
 }

--- a/src/dedicated_room/yuzu_room.rc
+++ b/src/dedicated_room/yuzu_room.rc
@ -1,6 +1,8 @@
-// SPDX-FileCopyrightText: 2017 Citra Emulator Project
+// SPDX-FileCopyrightText: 2017 Citra Emulator Project & 2024 suyu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+// Modified by JuanCStar on 2024/03/06
+
 #include "winresrc.h"
 /////////////////////////////////////////////////////////////////////////////
 //
@ -9,7 +11,7 @@

 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-YUZU_ICON              ICON                    "../../dist/yuzu.ico"
+SUYU_ICON              ICON                    "../../dist/suyu.ico"


 /////////////////////////////////////////////////////////////////////////////
@ -17,4 +19,4 @@ YUZU_ICON              ICON                    "../../dist/yuzu.ico"
 // RT_MANIFEST
 //

-0                       RT_MANIFEST             "../../dist/yuzu.manifest"
+0                       RT_MANIFEST             "../../dist/suyu.manifest"
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

+# Modified by JuanCStar on 2024/03/06
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@ -229,8 +231,8 @@ add_executable(yuzu
    vk_device_info.h
    compatdb.cpp
    compatdb.h
-    yuzu.qrc
-    yuzu.rc
+    suyu.qrc
+    suyu.rc
 )

 if (YUZU_CRASH_DUMPS)
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@ -1,6 +1,8 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2024 suyu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+// Modified by JuanCStar on 2024/03/06
+
 #include <QIcon>
 #include <fmt/format.h>
 #include "common/scm_rev.h"
@ -13,19 +15,19 @@ AboutDialog::AboutDialog(QWidget* parent)
    const auto description = std::string(Common::g_scm_desc);
    const auto build_id = std::string(Common::g_build_id);

-    const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
+    const auto suyu_build = fmt::format("suyu Development Build | {}-{}", branch_name, description);
    const auto override_build =
        fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
-    const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
+    const auto suyu_build_version = override_build.empty() ? suyu_build : override_build;

    ui->setupUi(this);
    // Try and request the icon from Qt theme (Linux?)
-    const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu"));
-    if (!yuzu_logo.isNull()) {
-        ui->labelLogo->setPixmap(yuzu_logo.pixmap(200));
+    const QIcon suyu_logo = QIcon::fromTheme(QStringLiteral("org.suyu_emu.suyu"));
+    if (!suyu_logo.isNull()) {
+        ui->labelLogo->setPixmap(suyu_logo.pixmap(200));
    }
    ui->labelBuildInfo->setText(
-        ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
+        ui->labelBuildInfo->text().arg(QString::fromStdString(suyu_build_version),
                                       QString::fromUtf8(Common::g_build_date).left(10)));
 }

--- a/src/yuzu/about_dialog.h
+++ b/src/yuzu/about_dialog.h
@ -1,6 +1,8 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2024 suyu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+// Modified by JuanCStar on 2024/03/06
+
 #pragma once

 #include <memory>
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+// Modified by JuanCStar on 2024/03/06
+
 #include <cinttypes>
 #include <clocale>
 #include <cmath>
@ -4551,10 +4553,10 @@ void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_vie
    const auto description = std::string(Common::g_scm_desc);
    const auto build_id = std::string(Common::g_build_id);

-    const auto yuzu_title = fmt::format("yuzu | {}-{}", branch_name, description);
+    const auto suyu_title = fmt::format("suyu | {}-{}", branch_name, description);
    const auto override_title =
        fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
-    const auto window_title = override_title.empty() ? yuzu_title : override_title;
+    const auto window_title = override_title.empty() ? suyu_title : override_title;

    if (title_name.empty()) {
        setWindowTitle(QString::fromStdString(window_title));
@ -5303,7 +5305,7 @@ int main(int argc, char* argv[]) {

    // Fix the Wayland appId. This needs to match the name of the .desktop file without the .desktop
    // suffix.
-    QGuiApplication::setDesktopFileName(QStringLiteral("org.yuzu_emu.yuzu"));
+    QGuiApplication::setDesktopFileName(QStringLiteral("org.suyu_emu.suyu"));
 #endif

    SetHighDPIAttributes();
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@ -11,11 +11,11 @@
   </rect>
  </property>
  <property name="windowTitle">
-   <string>yuzu</string>
+   <string>suyu</string>
  </property>
  <property name="windowIcon">
-   <iconset resource="yuzu.qrc">
-    <normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset>
+   <iconset resource="suyu.qrc">
+    <normaloff>:/img/suyu.ico</normaloff>:/img/suyu.ico</iconset>
  </property>
  <property name="tabShape">
   <enum>QTabWidget::Rounded</enum>
@ -477,7 +477,7 @@
  </action>
 </widget>
 <resources>
-  <include location="yuzu.qrc"/>
+  <include location="suyu.qrc"/>
 </resources>
 <connections/>
 </ui>
--- a/src/yuzu/suyu.qrc
+++ b/src/yuzu/suyu.qrc
@ -0,0 +1,12 @@
+<!--
+SPDX-FileCopyrightText: 2021 yuzu Emulator Project & 2024 suyu Emulator Project
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Modified by JuanCStar on 2024/03/06
+-->
+
+<RCC>
+    <qresource prefix="/img">
+        <file alias="suyu.ico">../../dist/suyu.ico</file>
+    </qresource>
+</RCC>
--- a/src/yuzu/suyu.rc
+++ b/src/yuzu/suyu.rc
@ -1,6 +1,8 @@
-// SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+// Modified by JuanCStar on 2024/03/06
+
 #include "winresrc.h"
 /////////////////////////////////////////////////////////////////////////////
 //
@ -11,7 +13,7 @@
 // remains consistent on all systems.
 // QT requires that the default application icon is named IDI_ICON1

-IDI_ICON1               ICON                    "../../dist/yuzu.ico"
+IDI_ICON1               ICON                    "../../dist/suyu.ico"


 /////////////////////////////////////////////////////////////////////////////
@ -19,4 +21,4 @@ IDI_ICON1               ICON                    "../../dist/yuzu.ico"
 // RT_MANIFEST
 //

-0                       RT_MANIFEST             "../../dist/yuzu.manifest"
+0                       RT_MANIFEST             "../../dist/suyu.manifest"
--- a/src/yuzu/yuzu.qrc
+++ b/src/yuzu/yuzu.qrc
@ -1,10 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 yuzu Emulator Project
-SPDX-License-Identifier: GPL-2.0-or-later
-->
-
-<RCC>
-    <qresource prefix="/img">
-        <file alias="yuzu.ico">../../dist/yuzu.ico</file>
-    </qresource>
-</RCC>
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

+# Modified by JuanCStar on 2024/03/06
+
 # Credits to Samantas5855 and others for this function.
 function(create_resource file output filename)
    # Read hex data from file
@ -25,7 +27,7 @@ add_executable(yuzu-cmd
    sdl_config.cpp
    sdl_config.h
    yuzu.cpp
-    yuzu.rc
+    suyu.rc
 )

 target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common)
@ -35,7 +37,7 @@ if (MSVC)
 endif()
 target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)

-create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
+create_resource("../../dist/suyu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
 target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})

 target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
--- a/src/yuzu_cmd/suyu.rc
+++ b/src/yuzu_cmd/suyu.rc
@ -1,6 +1,8 @@
-// SPDX-FileCopyrightText: 2018 yuzu Emulator Project
+// SPDX-FileCopyrightText: 2018 yuzu Emulator Project & 2024 suyu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+// Modified by JuanCStar on 2024/03/06
+
 #include "winresrc.h"
 /////////////////////////////////////////////////////////////////////////////
 //
@ -9,7 +11,7 @@

 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-YUZU_ICON               ICON                    "../../dist/yuzu.ico"
+SUYU_ICON               ICON                    "../../dist/suyu.ico"


 /////////////////////////////////////////////////////////////////////////////
@ -17,4 +19,4 @@ YUZU_ICON               ICON                    "../../dist/yuzu.ico"
 // RT_MANIFEST
 //

-0                       RT_MANIFEST             "../../dist/yuzu.manifest"
+0                       RT_MANIFEST             "../../dist/suyu.manifest"
Author	SHA1	Message	Date
Crimson Hawk	069482a788	Merge branch 'fix-windows' into 'dev' Windows build + remove dependency from github.com See merge request suyu-emu/suyu!11	2024-03-06 13:02:11 +00:00
Crimson Hawk	c6b015394b	Merge branch 'zqpvr-master-patch-36851' into 'dev' change github to gitlab in readme See merge request suyu-emu/suyu!13	2024-03-06 13:00:56 +00:00
zqpvr	600f66ebbd	change github to gitlab in readme	2024-03-06 13:00:56 +00:00
Crimson Hawk	885161d45f	Merge branch 'dev' into 'dev' Reverted Copyright headers and added suyu See merge request suyu-emu/suyu!30	2024-03-06 13:00:10 +00:00
JuanCStar	1f7a8ed4ed	Reverted Copyright headers and added suyu	2024-03-06 13:32:29 +01:00
Crimson Hawk	d3a82480da	Merge branch 'dev' into 'dev' Changed app window name, logo and other references related See merge request suyu-emu/suyu!29	2024-03-06 11:56:24 +00:00
JuanCStar	f772e7d776	Changed app window name, logo and other references related	2024-03-06 11:19:34 +01:00
Crimson Hawk	93102c4140	Merge branch 'dev' into 'dev' Replace yuzu.bmp references See merge request suyu-emu/suyu!25	2024-03-06 10:19:19 +00:00
Andrea V	4b917ac0c7	Merge remote-tracking branch 'origin/dev' into fix-windows	2024-03-06 09:56:42 +01:00
Jamie	292d02c039	Replace yuzu.bmp references Changing the icon to branding as well as replace the references to it	2024-03-06 03:51:23 -05:00
Crimson Hawk	ed20ee50f5	Merge branch 'master' into 'dev' Build success for Android and Windows: cleaned up external packages See merge request suyu-emu/suyu!23	2024-03-06 07:09:04 +00:00
blitzingeagle	2611f474e2	Merge from @jermzxL	2024-03-06 01:13:46 -05:00
Jermz	c6de190c91	Merge branch 'dev' into 'dev' # Conflicts: # CMakeLists.txt # CMakeModules/DownloadExternals.cmake	2024-03-06 05:55:02 +00:00
blitzingeagle	13e4a1df23	Merge with upstream/dev	2024-03-06 00:38:58 -05:00
blitzingeagle	b9e198f0a8	Merge with upstream/dev	2024-03-05 23:40:19 -05:00
blitzingeagle	9c12172ffe	Clean up and resolve externals for build	2024-03-05 21:19:13 -05:00
Crimson Hawk	91a6777e9c	Merge branch 'zqpvr-master-patch-55236' into 'master' Update README.md See merge request suyu-emu/suyu!21	2024-03-06 01:02:55 +00:00
Crimson Hawk	56ab794ed3	Merge branch 'blitzingeagle-master-patch-30432' into 'master' Fix typo in README.md See merge request suyu-emu/suyu!22	2024-03-06 01:02:28 +00:00
blitzingeagle	ba17a5688f	Fix typo in README.md	2024-03-06 00:57:49 +00:00
Jamie	ac9963aea8	Project moving to suyu-emu instead of suyu2	2024-03-05 19:50:36 -05:00
zqpvr	e15ab4929c	Update README.md	2024-03-06 00:38:47 +00:00
Jamie	c4d58ce508	Migrate the downloads to suyu gitlab	2024-03-05 18:40:22 -05:00
Jamie	b108b5a8aa	Add fixes to compile under windows	2024-03-05 17:41:53 -05:00
Crimson Hawk	9cee46b38b	Merge branch 'niansa-master-patch-97019' into 'master' Fixed wiki links in README.md See merge request suyu2/suyu!7	2024-03-05 22:27:00 +00:00
Crimson Hawk	6e1a5b35ac	Merge branch 'zqpvr-master-patch-37684' into 'master' Update README.md See merge request suyu2/suyu!8	2024-03-05 22:26:37 +00:00
Crimson Hawk	5fb6db78bc	Merge branch 'niansa-master-patch-41092' into 'master' Fixed link in CONTRIBUTING.md See merge request suyu2/suyu!6	2024-03-05 22:26:00 +00:00
Crimson Hawk	978297fc81	Merge branch 'fix-compile-ubuntu-22.04' into 'master' Fix Linux compile See merge request suyu2/suyu!9	2024-03-05 22:25:39 +00:00
Crimson Hawk	5382be9787	Merge branch 'zqpvr-master-patch-32885' into 'master' Update README.md See merge request suyu2/suyu!14	2024-03-05 22:23:29 +00:00
zqpvr	f7c0931e3c	Update README.md	2024-03-05 18:06:23 +00:00
Andrea V	159507e2a0	Windows build + remove dependency from github.com	2024-03-05 18:14:49 +01:00
Andrea V	183ffc943f	Merge remote-tracking branch 'origin/master' into fix-compile-ubuntu-22.04	2024-03-05 16:00:36 +01:00
Andrea V	ebe9d3b0a2	Introduced default constructors to fix compile	2024-03-05 15:57:05 +01:00
zqpvr	a154a5c4bf	Update README.md	2024-03-05 14:55:58 +00:00
niansa	5d185f144c	Fixed wiki links in README.md	2024-03-05 14:45:07 +00:00
niansa	4d3d83e928	Fixed link in CONTRIBUTING.md	2024-03-05 14:30:56 +00:00