fix license hdr

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

.ci/android/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: 2025 eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 export NDK_CCACHE=$(which ccache)
@@ -13,8 +13,8 @@ fi
 cd src/android
 chmod +x ./gradlew
 
-./gradlew assembleRelease
-./gradlew bundleRelease
+./gradlew assembleMainlineRelease
+./gradlew bundleMainlineRelease
 
 if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     rm "${ANDROID_KEYSTORE_FILE}"

.ci/android/package.sh

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

.ci/license-header.rb

@@ -1,47 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: true
-
-license_header = <<~EOF
-      // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-      // SPDX-License-Identifier: GPL-3.0-or-later
-      EOF
-
-print 'Getting branch changes...'
-branch_name = `git rev-parse --abbrev-ref HEAD`.chomp
-branch_commits = `git log #{branch_name} --not master --pretty=format:"%h"`.split("\n")
-branch_commit_range = "#{branch_commits[-1]}^..#{branch_commits[0]}"
-branch_changed_files = `git diff-tree --no-commit-id --name-only #{branch_commit_range} -r`.split("\n")
-puts 'done'
-
-print 'Checking files...'
-issue_files = []
-branch_changed_files.each do |file_name|
-   if file_name.end_with?('.cpp', '.h', '.kt', '.kts') and File.file?(file_name)
-      file_content = File.read(file_name)
-      if not file_content.start_with?(license_header)
-         issue_files.push(file_name)
-      end
-   end
-end
-puts 'done'
-
-if issue_files.empty?
-   puts "\nAll changed files have correct headers"
-   exit 0
-end
-
-puts <<-EOF
-
-The following #{issue_files.length} files have incorrect license headers:
-#{issue_files.join("\n")}
-
-The following license header should be added to the start of all offending files:
-=== BEGIN ===
-#{license_header}
-===  END  ===
-
-If some of the code in this PR is not being contributed by the original author, the files which have been exclusively changed by that code can be ignored.
-If this happens, this PR requirement can be bypassed once all other files are addressed.
-EOF
-
-exit 1

.ci/license-header.sh

@@ -1,74 +1,150 @@
 #!/bin/sh -e
 
-HEADER="$(cat "$PWD/.ci/license/header.txt")"
-HEADER_HASH="$(cat "$PWD/.ci/license/header-hash.txt")"
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-echo "Getting branch changes"
+# specify full path if dupes may exist
+EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake sse2neon.h renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder"
 
-# BRANCH=`git rev-parse --abbrev-ref HEAD`
-# COMMITS=`git log ${BRANCH} --not master --pretty=format:"%h"`
-# RANGE="${COMMITS[${#COMMITS[@]}-1]}^..${COMMITS[0]}"
-# FILES=`git diff-tree --no-commit-id --name-only ${RANGE} -r`
+# license header constants, please change when needed :))))
+YEAR=2025
+HOLDER="Eden Emulator Project"
+LICENSE="GPL-3.0-or-later"
 
-BASE=`git merge-base master HEAD`
-FILES=`git diff --name-only $BASE`
+usage() {
+	cat << EOF
+Usage: $0 [uc]
+Compares the current HEAD to the master branch to check for license
+header discrepancies. Each file changed in a branch MUST have a
+license header, and this script attempts to enforce that.
 
-#FILES=$(git diff --name-only master)
+Options:
+    -u, --update	Fix license headers, if applicable;
+                	if the license header exists but has the incorrect
+                	year or is otherwise malformed, it will be fixed.
 
-echo "Done"
+    -c, --commit	Commit changes to Git (requires --update)
+
+Copyright $YEAR $HOLDER
+Licensed under $LICENSE
+
+The following files/directories are marked as external
+and thus will not have license headers asserted:
+EOF
+
+	for file in $EXCLUDE_FILES; do
+		echo "- $file"
+	done
+
+	exit 0
+}
+
+while true; do
+	case "$1" in
+		(-uc) UPDATE=true; COMMIT=true ;;
+		(-u|--update) UPDATE=true ;;
+		(-c|--commit) COMMIT=true ;;
+		("$0") break ;;
+		("") break ;;
+		(*) usage ;;
+	esac
+
+	shift
+done
+
+# human-readable header string
+header() {
+	header_line1 "$1"
+	header_line2 "$1"
+}
+
+header_line1() {
+	echo "$1 SPDX-FileCopyrightText: Copyright $YEAR $HOLDER"
+}
+
+header_line2() {
+	echo "$1 SPDX-License-Identifier: $LICENSE"
+}
 
 check_header() {
-    CONTENT="`head -n3 < $1`"
-    case "$CONTENT" in
-        "$HEADER"*) ;;
-        *) BAD_FILES="$BAD_FILES $1" ;;
-    esac
+	begin="$1"
+	file="$2"
+
+	# separate things out as spaces to make our lives 100000000x easier
+    content="$(head -n5 < "$2" | tr '\n' ' ')"
+
+	line1="$(header_line1 "$begin")"
+	line2="$(header_line2 "$begin")"
+
+	# perl and awk are actually awful, so to avoid this problem we avoid it by avoiding it
+	if ! echo "$content" | grep -o "$line1 $line2" >/dev/null; then
+		# SRC_FILES is Kotlin/C++
+		# OTHER_FILES is sh, CMake
+		case "$begin" in
+			"//")
+				SRC_FILES="$SRC_FILES $file"
+				;;
+			"#")
+				OTHER_FILES="$OTHER_FILES $file"
+				;;
+		esac
+	fi
 }
 
-check_cmake_header() {
-    CONTENT="`head -n3 < $1`"
+BASE=$(git merge-base master HEAD)
+FILES=$(git diff --name-only "$BASE")
 
-    case "$CONTENT" in
-        "$HEADER_HASH"*) ;;
-        *)
-            BAD_CMAKE="$BAD_CMAKE $1" ;;
-    esac
-}
 for file in $FILES; do
     [ -f "$file" ] || continue
 
-    if [ `basename -- "$file"` = "CMakeLists.txt" ]; then
-        check_cmake_header "$file"
-        continue
-    fi
+	# skip files that are third party (crueter's CMake modules, sse2neon, etc)
+	for pattern in $EXCLUDE_FILES; do
+		case "$file" in
+			*"$pattern"*)
+				excluded=true
+				break
+				;;
+			*)
+				excluded=false
+				;;
+		esac
+	done
 
-    EXTENSION="${file##*.}"
-    case "$EXTENSION" in
-        kts|kt|cpp|h)
-            check_header "$file"
-            ;;
-        cmake)
-            check_cmake_header "$file"
-            ;;
+	[ "$excluded" = "true" ] && continue
+
+	case "$file" in
+		*.cmake|*.sh|CMakeLists.txt)
+			begin="#"
+			;;
+		*.kt*|*.cpp|*.h)
+			begin="//"
+			;;
+		*)
+			continue
+			;;
     esac
+
+	check_header "$begin" "$file"
 done
 
-if [ "$BAD_FILES" = "" ] && [ "$BAD_CMAKE" = "" ]; then
-    echo
-    echo "All good."
+if [ -z "$SRC_FILES" ] && [ -z "$OTHER_FILES" ]; then
+    echo "-- All good."
 
     exit
 fi
 
-if [ "$BAD_FILES" != "" ]; then
-    echo "The following source files have incorrect license headers:"
-    echo
+echo
 
-    for file in $BAD_FILES; do echo $file; done
+if [ "$SRC_FILES" != "" ]; then
+    echo "-- The following source files have incorrect license headers:"
+
+	HEADER=$(header "//")
+
+    for file in $SRC_FILES; do echo "-- * $file"; done
 
     cat << EOF
 
-The following license header should be added to the start of all offending SOURCE files:
+-- The following license header should be added to the start of these offending files:
 
 === BEGIN ===
 $HEADER
@@ -78,18 +154,19 @@ EOF
 
 fi
 
-if [ "$BAD_CMAKE" != "" ]; then
-    echo "The following CMake files have incorrect license headers:"
-    echo
+if [ "$OTHER_FILES" != "" ]; then
+    echo "-- The following CMake and shell scripts have incorrect license headers:"
 
-    for file in $BAD_CMAKE; do echo $file; done
+	HEADER=$(header "#")
+
+    for file in $OTHER_FILES; do echo "-- * $file"; done
 
     cat << EOF
 
-The following license header should be added to the start of all offending CMake files:
+-- The following license header should be added to the start of these offending files:
 
 === BEGIN ===
-$HEADER_HASH
+$HEADER
 ===  END  ===
 
 EOF
@@ -97,50 +174,76 @@ EOF
 fi
 
 cat << EOF
-If some of the code in this PR is not being contributed by the original author,
-the files which have been exclusively changed by that code can be ignored.
-If this happens, this PR requirement can be bypassed once all other files are addressed.
+    If some of the code in this PR is not being contributed by the original author,
+    the files which have been exclusively changed by that code can be ignored.
+    If this happens, this PR requirement can be bypassed once all other files are addressed.
+
 EOF
 
-if [ "$FIX" = "true" ]; then
-    echo
-    echo "FIX set to true. Fixing headers."
-    echo
+if [ "$UPDATE" = "true" ]; then
+	TMP_DIR=$(mktemp -d)
+	echo "-- Fixing headers..."
 
-    for file in $BAD_FILES; do
-        cat $file > $file.bak
+	for file in $SRC_FILES $OTHER_FILES; do
+		case $(basename -- "$file") in
+			*.cmake|CMakeLists.txt)
+				begin="#"
+				shell="false"
+				;;
+			*.sh)
+				begin="#"
+				shell=true
+				;;
+			*.kt*|*.cpp|*.h)
+				begin="//"
+				shell="false"
+				;;
+		esac
 
-        cat .ci/license/header.txt > $file
-        echo >> $file
-        cat $file.bak >> $file
+		# This is fun
+		match="$begin SPDX-FileCopyrightText.*$HOLDER"
 
-        rm $file.bak
+		# basically if the copyright holder is already defined we can just replace the year
+		if head -n5 < "$file" | grep -e "$match" >/dev/null; then
+			replace=$(header_line1 "$begin")
+			sed "s|$match|$replace|" "$file" > "$file".bak
+			mv "$file".bak "$file"
+		else
+			header "$begin" > "$TMP_DIR"/header
 
-        git add $file
-    done
+			if [ "$shell" = "true" ]; then
+				# grab shebang
+				head -n1 "$file" > "$TMP_DIR/shebang"
+				echo >> "$TMP_DIR/shebang"
 
-    for file in $BAD_CMAKE; do
-        cat $file > $file.bak
+				# remove shebang
+				sed '1d' "$file" > "$file".bak
+				mv "$file".bak "$file"
 
-        cat .ci/license/header-hash.txt > $file
-        echo >> $file
-        cat $file.bak >> $file
+				# add to header
+				cat "$TMP_DIR"/shebang "$TMP_DIR"/header > "$TMP_DIR"/new-header
+				mv "$TMP_DIR"/new-header "$TMP_DIR"/header
+			else
+				echo >> "$TMP_DIR/header"
+			fi
 
-        rm $file.bak
+			cat "$TMP_DIR"/header "$file" > "$file".bak
+			mv "$file".bak "$file"
+		fi
 
-        git add $file
-    done
-    echo "License headers fixed."
+		[ "$shell" = "true" ] && chmod a+x "$file"
+		[ "$COMMIT" = "true" ] && git add "$file"
+	done
 
-    if [ "$COMMIT" = "true" ]; then
-        echo
-        echo "COMMIT set to true. Committing changes."
-        echo
-
-        git commit -m "Fix license headers"
-
-        echo "Changes committed. You may now push."
-    fi
-else
-    exit 1
+	echo "-- Done"
 fi
+
+if [ "$COMMIT" = "true" ]; then
+	echo "-- Committing changes"
+
+	git commit -m "Fix license headers"
+
+	echo "-- Changes committed. You may now push."
+fi
+
+[ -d "$TMP_DIR" ] && rm -rf "$TMP_DIR"

.ci/license/header-hash.txt

@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later

.ci/license/header.txt

@@ -1,2 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later

.ci/linux/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# SPDX-FileCopyrightText: 2025 eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 case "$1" in
@@ -67,8 +67,9 @@ else
     export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_PRECOMPILED_HEADERS=OFF)
 fi
 
+
 if [ "$DEVEL" != "true" ]; then
-    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_QT_UPDATE_CHECKER=ON)
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_UPDATE_CHECKER=ON)
 fi
 
 if [ "$USE_WEBENGINE" = "true" ]; then

.ci/linux/package.sh

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

.ci/windows/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-# SPDX-FileCopyrightText: 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 if [ "$COMPILER" == "clang" ]
@@ -36,8 +36,8 @@ cmake .. -G Ninja \
 	-DCMAKE_EXE_LINKER_FLAGS=" /LTCG" \
     -DDYNARMIC_ENABLE_LTO=ON \
     -DYUZU_USE_BUNDLED_QT=${BUNDLE_QT:-false} \
-    -DUSE_CCACHE=${CCACHE:-false} \
-    -DENABLE_QT_UPDATE_CHECKER=${DEVEL:-true} \
+    -DUSE_CCACHE=${CCACHE:-false}  \
+    -DENABLE_UPDATE_CHECKER=${DEVEL:-true} \
     "${EXTRA_CMAKE_FLAGS[@]}" \
     "$@"
 

.ci/windows/install-msvc.ps1

@@ -10,7 +10,7 @@ if (-not ([bool](net session 2>$null))) {
 }
 
 $VSVer = "17"
-$ExeFile = "vs_BuildTools.exe"
+$ExeFile = "vs_community.exe"
 $Uri = "https://aka.ms/vs/$VSVer/release/$ExeFile"
 $Destination = "./$ExeFile"
 
@@ -19,21 +19,39 @@ $WebClient = New-Object System.Net.WebClient
 $WebClient.DownloadFile($Uri, $Destination)
 Write-Host "Finished downloading $ExeFile"
 
-$VSROOT = "C:/VSBuildTools/$VSVer"
 $Arguments = @(
-    "--installPath `"$VSROOT`"",                               # set custom installation path
-    "--quiet",                                                  # suppress UI
-    "--wait",                                                   # wait for installation to complete
-    "--norestart",                                              # prevent automatic restart
-    "--add Microsoft.VisualStudio.Workload.VCTools",            # add C++ build tools workload
-    "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",  # add core x86/x64 C++ tools
-    "--add Microsoft.VisualStudio.Component.Windows10SDK.19041" # add specific Windows SDK
+    "--quiet",                                                  # Suppress installer UI
+    "--wait",                                                   # Wait for installation to complete
+    "--norestart",                                              # Prevent automatic restart
+    "--force",                                                  # Force installation even if components are already installed
+    "--add Microsoft.VisualStudio.Workload.NativeDesktop",      # Desktop development with C++
+    "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",  # Core C++ compiler/tools for x86/x64
+    "--add Microsoft.VisualStudio.Component.Windows11SDK.26100",# Windows 11 SDK (26100)
+    "--add Microsoft.VisualStudio.Component.Windows10SDK.19041",# Windows 10 SDK (19041)
+    "--add Microsoft.VisualStudio.Component.VC.Llvm.Clang",     # LLVM Clang compiler
+    "--add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset", # LLVM Clang integration toolset
+    "--add Microsoft.VisualStudio.Component.Windows11SDK.22621",# Windows 11 SDK (22621)
+    "--add Microsoft.VisualStudio.Component.VC.CMake.Project",  # CMake project support
+    "--add Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", # VC++ 14.2 toolset
+    "--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang" # LLVM Clang for native desktop
 )
 
 Write-Host "Installing Visual Studio Build Tools"
-$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -Wait -ArgumentList $Arguments
-$ExitCode = $InstallProcess.ExitCode
+$InstallProcess = Start-Process -FilePath $Destination -NoNewWindow -PassThru -ArgumentList $Arguments
 
+# Spinner while installing
+$Spinner = "|/-\"
+$i = 0
+while (-not $InstallProcess.HasExited) {
+    Write-Host -NoNewline ("`rInstalling... " + $Spinner[$i % $Spinner.Length])
+    Start-Sleep -Milliseconds 250
+    $i++
+}
+
+# Clear spinner line
+Write-Host "`rSetup completed!           "
+
+$ExitCode = $InstallProcess.ExitCode
 if ($ExitCode -ne 0) {
     Write-Host "Error installing Visual Studio Build Tools (Error: $ExitCode)"
     Exit $ExitCode

.github/workflows/trigger_release.yml

@@ -96,7 +96,7 @@ jobs:
           fetch-tags: true
 
       - name: Build
-        run: TARGET=appimage RELEASE=1 ./.ci/linux/build.sh v3 8
+        run: TARGET=appimage RELEASE=1 DEVEL=false ./.ci/linux/build.sh v3 8
 
       - name: Package AppImage
         run: ./.ci/linux/package.sh v3 &> /dev/null
@@ -133,7 +133,7 @@ jobs:
           echo $GIT_TAG_NAME
 
       - name: Build
-        run: ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh
+        run: DEVEL=false ANDROID_HOME=/home/runner/sdk ./.ci/android/build.sh
         env:
           ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
           ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}

.gitignore

@@ -10,6 +10,12 @@ doc-build/
 AppDir/
 uruntime
 
+# dtrace and ktrace stuffs
+[dk]trace-out/
+[dk]trace.out
+*.core
+log.txt
+
 # Generated source files
 src/common/scm_rev.cpp
 dist/english_plurals/generated_en.ts

.patch/catch2/0001-solaris-isnan-fix.patch

@@ -0,0 +1,12 @@
+diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp
+index fc7b444..0e1a3c2 100644
+--- a/src/catch2/matchers/catch_matchers_floating_point.cpp
++++ b/src/catch2/matchers/catch_matchers_floating_point.cpp
+@@ -5,6 +5,7 @@
+ //        https://www.boost.org/LICENSE_1_0.txt)
+ 
+ // SPDX-License-Identifier: BSL-1.0
++#include <catch2/internal/catch_polyfills.hpp>
+ #include <catch2/matchers/catch_matchers_floating_point.hpp>
+ #include <catch2/internal/catch_enforce.hpp>
+ #include <catch2/internal/catch_polyfills.hpp>

.patch/glslang/0001-haikuos-fix.patch

@@ -0,0 +1,49 @@
+diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
+index be7f442..5fd0438 100644
+--- a/StandAlone/StandAlone.cpp
++++ b/StandAlone/StandAlone.cpp
+@@ -1766,9 +1766,10 @@ int singleMain()
+         glslang::FinalizeProcess();
+     } else {
+         ShInitialize();
++#ifndef __HAIKU__
+         ShInitialize();  // also test reference counting of users
+         ShFinalize();    // also test reference counting of users
+-
++#endif
+         bool printShaderNames = workList.size() > 1;
+ 
+         if (Options & EOptionMultiThreaded) {
+@@ -1793,8 +1794,9 @@ int singleMain()
+                 PutsIfNonEmpty(WorkItems[w]->results.c_str());
+             }
+         }
+-
++#ifndef __HAIKU__
+         ShFinalize();
++#endif
+     }
+ 
+     if (CompileFailed.load())
+@@ -1809,8 +1811,10 @@ int C_DECL main(int argc, char* argv[])
+ {
+     ProcessArguments(WorkItems, argc, argv);
+ 
++#ifdef __HAIKU__
++    return singleMain();
++#else
+     int ret = 0;
+-
+     // Loop over the entire init/finalize cycle to watch memory changes
+     const int iterations = 1;
+     if (iterations > 1)
+@@ -1820,8 +1824,8 @@ int C_DECL main(int argc, char* argv[])
+         if (iterations > 1)
+             glslang::OS_DumpMemoryCounters();
+     }
+-
+     return ret;
++#endif
+ }
+ 
+ //

.patch/libusb/0001-netbsd-gettime.patch

@@ -0,0 +1,25 @@
+diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
+index a9a50b2..56e681b 100644
+--- a/libusb/os/netbsd_usb.c
++++ b/libusb/os/netbsd_usb.c
+@@ -580,6 +580,20 @@ _access_endpoint(struct libusb_transfer *transfer)
+ 	return hpriv->endpoints[endpt];
+ }
+ 
++void usbi_get_monotonic_time(struct timespec *tp) {
++        struct timeval tv;
++        gettimeofday(&tv, NULL);
++        tp->tv_sec = tv.tv_sec;
++        tp->tv_nsec = tv.tv_usec * 1000ull;
++}
++
++void usbi_get_real_time(struct timespec *tp) {
++	struct timeval tv;
++	gettimeofday(&tv, NULL);
++	tp->tv_sec = tv.tv_sec;
++	tp->tv_nsec = tv.tv_usec * 1000ull;
++}
++
+ int
+ _sync_gen_transfer(struct usbi_transfer *itransfer)
+ {

.patch/mbedtls/0002-aesni-fix.patch

@@ -0,0 +1,13 @@
+diff --git a/library/aesni.h b/library/aesni.h
+index 754c984c79..59e27afd3e 100644
+--- a/library/aesni.h
++++ b/library/aesni.h
+@@ -35,7 +35,7 @@
+ /* GCC-like compilers: currently, we only support intrinsics if the requisite
+  * target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
+  * or `clang -maes -mpclmul`). */
+-#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
++#if defined(__GNUC__) || defined(__clang__)
+ #define MBEDTLS_AESNI_HAVE_INTRINSICS
+ #endif
+ /* For 32-bit, we only support intrinsics */

.patch/mbedtls/0003-aesni-fix.patch

@@ -0,0 +1,22 @@
+diff --git a/library/aesni.c b/library/aesni.c
+index 2857068..3e104ab 100644
+--- a/library/aesni.c
++++ b/library/aesni.c
+@@ -31,16 +31,14 @@
+ #include <immintrin.h>
+ #endif
+ 
+-#if defined(MBEDTLS_ARCH_IS_X86)
+ #if defined(MBEDTLS_COMPILER_IS_GCC)
+ #pragma GCC push_options
+ #pragma GCC target ("pclmul,sse2,aes")
+ #define MBEDTLS_POP_TARGET_PRAGMA
+-#elif defined(__clang__) && (__clang_major__ >= 5)
++#elif defined(__clang__)
+ #pragma clang attribute push (__attribute__((target("pclmul,sse2,aes"))), apply_to=function)
+ #define MBEDTLS_POP_TARGET_PRAGMA
+ #endif
+-#endif
+ 
+ #if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
+ /*

.patch/mcl/0001-assert-macro.patch

@@ -0,0 +1,55 @@
+diff --git a/include/mcl/assert.hpp b/include/mcl/assert.hpp
+index f77dbe7..9ec0b9c 100644
+--- a/include/mcl/assert.hpp
++++ b/include/mcl/assert.hpp
+@@ -23,8 +23,11 @@ template<typename... Ts>
+
+ }  // namespace mcl::detail
+
++#ifndef UNREACHABLE
+ #define UNREACHABLE() ASSERT_FALSE("Unreachable code!")
++#endif
+
++#ifndef ASSERT
+ #define ASSERT(expr)                                                     \
+     [&] {                                                                \
+         if (std::is_constant_evaluated()) {                              \
+@@ -37,7 +40,9 @@ template<typename... Ts>
+             }                                                            \
+         }                                                                \
+     }()
++#endif
+
++#ifndef ASSERT_MSG
+ #define ASSERT_MSG(expr, ...)                                                \
+     [&] {                                                                    \
+         if (std::is_constant_evaluated()) {                                  \
+@@ -50,13 +55,24 @@ template<typename... Ts>
+             }                                                                \
+         }                                                                    \
+     }()
++#endif
+
++#ifndef ASSERT_FALSE
+ #define ASSERT_FALSE(...) ::mcl::detail::assert_terminate("false", __VA_ARGS__)
++#endif
+
+ #if defined(NDEBUG) || defined(MCL_IGNORE_ASSERTS)
+-#    define DEBUG_ASSERT(expr) ASSUME(expr)
+-#    define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr)
++#    ifndef DEBUG_ASSERT
++#        define DEBUG_ASSERT(expr) ASSUME(expr)
++#    endif
++#    ifndef DEBUG_ASSERT_MSG
++#        define DEBUG_ASSERT_MSG(expr, ...) ASSUME(expr)
++#    endif
+ #else
+-#    define DEBUG_ASSERT(expr) ASSERT(expr)
+-#    define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__)
++#    ifndef DEBUG_ASSERT
++#        define DEBUG_ASSERT(expr) ASSERT(expr)
++#    endif
++#    ifndef DEBUG_ASSERT_MSG
++#        define DEBUG_ASSERT_MSG(expr, ...) ASSERT_MSG(expr, __VA_ARGS__)
++#    endif
+ #endif

.patch/spirv-tools/0001-netbsd-fix.patch

@@ -0,0 +1,14 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index eb4e69e..3155805 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -72,7 +72,8 @@ if (SPIRV_TOOLS_USE_MIMALLOC)
+   pop_variable(MI_BUILD_TESTS)
+ endif()
+ 
+-if (DEFINED SPIRV-Headers_SOURCE_DIR)
++# NetBSD doesn't have SPIRV-Headers readily available on system
++if (DEFINED SPIRV-Headers_SOURCE_DIR AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
+   # This allows flexible position of the SPIRV-Headers repo.
+   set(SPIRV_HEADER_DIR ${SPIRV-Headers_SOURCE_DIR})
+ else()

.reuse/dep5

@@ -13,12 +13,13 @@ Copyright: yuzu Emulator Project
 License: GPL-2.0-or-later
 
 Files: dist/qt_themes/default/icons/256x256/eden.png
+       dist/qt_themes/default/icons/256x256/eden_named.png
        dist/yuzu.bmp
-       dist/yuzu.icns
+       dist/eden.icns
        dist/eden.ico
-       dist/eden.svg
-Copyright: yuzu Emulator Project
-License: GPL-2.0-or-later
+       dist/dev.eden_emu.eden.svg
+Copyright: 2025 Eden Emulator Project
+License: GPL-3.0-or-later
 
 Files: dist/qt_themes/qdarkstyle*/LICENSE.*
        dist/qt_themes/qdarkstyle*/style.qrc
@@ -155,3 +156,39 @@ License: BSD-3-Clause
 Files: src/android/app/debug.keystore
 Copyright: 2023 yuzu Emulator Project
 License: GPL-3.0-or-later
+
+Files: dist/qt_themes/colorful/icons/48x48/user-trash.png
+       dist/qt_themes/colorful/icons/48x48/upload.png
+       dist/qt_themes/colorful/icons/48x48/download.png
+Copyright: 2014 Uri Herrera
+           1996-2025 KDE Software Foundation
+License: LGPL-2.0-or-later
+
+Files: dist/qt_themes/default/icons/48x48/user-trash.png
+       dist/qt_themes/default/icons/48x48/upload.png
+       dist/qt_themes/default/icons/48x48/download.png
+       dist/qt_themes/default_dark/icons/48x48/user-trash.png
+       dist/qt_themes/default_dark/icons/48x48/upload.png
+       dist/qt_themes/default_dark/icons/48x48/download.png
+Copyright: 2025 Fonticons, Inc.
+License: CC-BY-4.0
+Comment: All of these icons have been modified by crueter <crueter@crueter.xyz>
+
+Files: CMakeModules/CPM.cmake
+Copyright: 2019-2023 Lars Melchior
+License: MIT
+
+Files: CMakeModules/CPMUtil.cmake
+       CMakeModules/CPM.cmake
+       CMakeModules/GetSCMRev.cmake
+       CMakeModules/DetectArchitecture.cmake
+       tools/cpm/*
+       tools/update-cpm.sh
+       tools/shellcheck.sh
+       docs/CPMUtil.md
+       **cpmfile.json
+Copyright: 2025 crueter <crueter@crueter.xyz>
+License: GPL-3.0-or-later
+Comment: CPM.cmake has had additional modifications from crueter to better work with CPMUtil
+         https://git.crueter.xyz/CMake/CPMUtil
+         https://git.crueter.xyz/CMake/Modules

.shellcheckrc

@@ -0,0 +1 @@
+shell=sh

.tx/config

@@ -0,0 +1,21 @@
+[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

@@ -11,6 +11,10 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     set(PLATFORM_FREEBSD ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
     set(PLATFORM_OPENBSD ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
+    set(PLATFORM_NETBSD ON)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
+    set(PLATFORM_HAIKU ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(PLATFORM_LINUX ON)
 endif()
@@ -32,16 +36,29 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
+
+# NB: this does not account for SPARC
+# If you get Eden working on SPARC, please shoot crueter@crueter.xyz multiple emails
+# and you will be hailed for eternity
 if (PLATFORM_SUN)
     # Terrific Solaris pkg shenanigans
     list(APPEND CMAKE_PREFIX_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
     list(APPEND CMAKE_MODULE_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
+
+    # Amazing - absolutely incredible
+    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "/usr/lib/amd64/cmake")
+
     # For some mighty reason, doing a normal release build sometimes may not trigger
     # the proper -O3 switch to materialize
     if (CMAKE_BUILD_TYPE MATCHES "Release")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
     endif()
+    if (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+    endif()
 endif()
 
 # Needed for FFmpeg w/ VAAPI and DRM
@@ -49,6 +66,15 @@ if (PLATFORM_OPENBSD)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/X11R6/include")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/X11R6/include")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/X11R6/lib")
+elseif (PLATFORM_NETBSD)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/X11R7/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/X11R7/include")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/X11R7/lib")
+endif()
+
+# NetBSD: Fun for the whole family!
+if (PLATFORM_NETBSD)
+    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()
 
 # Detect current compilation architecture and create standard definitions
@@ -135,80 +161,109 @@ endif()
 
 if (PLATFORM_FREEBSD)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/lib")
+
 endif()
 
 # Set bundled sdl2/qt as dependent options.
 # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion
-CMAKE_DEPENDENT_OPTION(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)
+cmake_dependent_option(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)
+
+if (ENABLE_SDL2)
+    # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
+    cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" OFF "NOT MSVC" OFF)
+    option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")
+endif()
+
+# qt stuff
+option(ENABLE_QT "Enable the Qt frontend" ON)
+option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
+option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)
+cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
+option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
+option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
+set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
+
+# FreeBSD doesn't have a cubeb port yet, vendoring it isn't required (it's optional anyways)
+cmake_dependent_option(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT PLATFORM_FREEBSD" OFF)
 
 set(EXT_DEFAULT OFF)
-
 if (MSVC OR ANDROID)
     set(EXT_DEFAULT ON)
 endif()
+option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})
 
-CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ${EXT_DEFAULT} "ENABLE_SDL2;NOT MSVC" OFF)
+# ffmpeg
+option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
 
-cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)
+# sirit
+option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT})
+
+# Re-allow on FreeBSD once its on mainline ports
+cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR APPLE" OFF)
 
 cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
 
-option(ENABLE_QT "Enable the Qt frontend" ON)
-option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
-option(ENABLE_QT_UPDATE_CHECKER "Enable update checker for the Qt frontend" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
-
-option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})
-
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
 option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF)
 
-option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ${EXT_DEFAULT})
-
-option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
-
-option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
-
-set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
-
-option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
-
-CMAKE_DEPENDENT_OPTION(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF "ENABLE_QT" OFF)
+cmake_dependent_option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF "ENABLE_QT" OFF)
 
 option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
-option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ${EXT_DEFAULT})
+option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
+if (YUZU_USE_PRECOMPILED_HEADERS)
+    message(STATUS "Using Precompiled Headers.")
+    set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
+endif()
+option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
+if(YUZU_ENABLE_LTO)
+    include(CheckIPOSupported)
+    check_ipo_supported(RESULT COMPILER_SUPPORTS_LTO)
+    if(NOT COMPILER_SUPPORTS_LTO)
+        message(FATAL_ERROR "Your compiler does not support interprocedural optimization (IPO). Re-run CMake with -DYUZU_ENABLE_LTO=OFF.")
+    endif()
+    set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})
+endif()
+option(USE_CCACHE "Use ccache for compilation" OFF)
+set(CCACHE_PATH "ccache" CACHE STRING "Path to ccache binary")
+if(USE_CCACHE)
+    find_program(CCACHE_BINARY ${CCACHE_PATH})
+    if(CCACHE_BINARY)
+        message(STATUS "Found ccache at: ${CCACHE_BINARY}")
+        set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_BINARY})
+        set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_BINARY})
+        if (YUZU_USE_PRECOMPILED_HEADERS)
+            message(FATAL_ERROR "Precompiled headers are incompatible with ccache. Re-run CMake with -DYUZU_USE_PRECOMPILED_HEADERS=OFF.")
+        endif()
+    else()
+        message(WARNING "USE_CCACHE enabled, but no executable found at: ${CCACHE_PATH}")
+    endif()
+endif()
 
 # 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)
+option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.g. Snapdragon 865) at the cost of performance" OFF)
 
-# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
-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)
+cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
 
-CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL2;NOT ANDROID" OFF)
 
-CMAKE_DEPENDENT_OPTION(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL2;NOT ANDROID" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
-
-option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
+cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX OR PLATFORM_SUN" OFF)
 
 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)
-
-CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
-
-CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
-
 set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")
 
+cmake_dependent_option(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "LINUX" OFF)
+
+cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)
+
+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.
@@ -219,24 +274,26 @@ if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)
     # your own copy of it.
     set(DEFAULT_ENABLE_OPENSSL OFF)
 endif()
-
 if (ENABLE_WEB_SERVICE)
     set(DEFAULT_ENABLE_OPENSSL ON)
 endif()
-
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
-
 if (ENABLE_OPENSSL)
-    CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON)
+    set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
+    if (EXT_DEFAULT OR PLATFORM_SUN)
+        set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL ON)
+    endif()
+    option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL})
 endif()
 
 if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
-    set(vvl_version "sdk-1.3.261.1")
+    # TODO(crueter): CPM this
+    set(vvl_version "1.4.321.0")
     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}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
+        file(DOWNLOAD "${vvl_base_url}/vulkan-sdk-${vvl_version}/android-binaries-${vvl_version}.zip"
             "${vvl_zip_file}" SHOW_PROGRESS)
         execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
@@ -253,19 +310,11 @@ if (ANDROID)
     set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # Workaround for Oboe
 endif()
 
-if (YUZU_USE_PRECOMPILED_HEADERS)
-    if (MSVC AND CCACHE)
-        # buildcache does not properly cache PCH files, leading to compilation errors.
-        # See https://github.com/mbitsnbites/buildcache/discussions/230
-        message(WARNING "buildcache does not properly support Precompiled Headers. Disabling PCH")
-        set(DYNARMIC_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
-        set(YUZU_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)
-    endif()
-endif()
-
-if (YUZU_USE_PRECOMPILED_HEADERS)
-    message(STATUS "Using Precompiled Headers.")
-    set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
+# We need to downgrade debug info (/Zi -> /Z7) to use an older but more cacheable format
+# See https://github.com/nanoant/CMakePCHCompiler/issues/21
+if(WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
 endif()
 
 # Default to a Release build
@@ -307,6 +356,11 @@ if (UNIX)
     add_compile_definitions(YUZU_UNIX=1)
 endif()
 
+if (YUZU_LEGACY)
+    message(WARNING "Making legacy build. Performance may suffer.")
+    add_compile_definitions(YUZU_LEGACY)
+endif()
+
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
     set(HAS_NCE 1)
     add_compile_definitions(HAS_NCE=1)
@@ -316,6 +370,18 @@ if (YUZU_ROOM)
     add_compile_definitions(YUZU_ROOM)
 endif()
 
+if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
+    if(CXX_APPLE OR CXX_CLANG)
+        # libc++ has stop_token and jthread as experimental
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexperimental-library")
+    else()
+        # Uses glibc, mostly?
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LIBCPP_ENABLE_EXPERIMENTAL=1")
+    endif()
+endif()
+
 # Build/optimization presets
 if (PLATFORM_LINUX OR CXX_CLANG)
     if (ARCHITECTURE_x86_64)
@@ -369,6 +435,9 @@ include(CPMUtil)
 if (ENABLE_OPENSSL)
     if (YUZU_USE_BUNDLED_OPENSSL)
         AddJsonPackage(openssl)
+        if (OpenSSL_ADDED)
+            add_compile_definitions(YUZU_BUNDLED_OPENSSL)
+        endif()
     endif()
 
     find_package(OpenSSL 1.1.1 REQUIRED)
@@ -379,6 +448,7 @@ if (YUZU_USE_CPM)
 
     set(BUILD_SHARED_LIBS OFF)
     set(BUILD_TESTING OFF)
+    set(ENABLE_TESTING OFF)
 
     # TODO(crueter): renderdoc?
 
@@ -434,18 +504,7 @@ if (YUZU_USE_CPM)
 
     if (zstd_ADDED)
         add_library(zstd::zstd ALIAS libzstd_static)
-    endif()
-
-    # Catch2
-    if (YUZU_TESTS OR DYNARMIC_TESTS)
-        AddJsonPackage(catch2)
-    endif()
-
-    # ENet
-    AddJsonPackage(enet)
-
-    if (enet_ADDED)
-        target_include_directories(enet INTERFACE ${enet_SOURCE_DIR}/include)
+        add_library(zstd::libzstd ALIAS libzstd_static)
     endif()
 
     # Opus
@@ -459,69 +518,28 @@ if (YUZU_USE_CPM)
         endif()
     endif()
 
-    # VulkanUtilityHeaders - pulls in headers and utility libs
-    AddJsonPackage(vulkan-utility-headers)
-
-    # small hack
-    if (NOT VulkanUtilityLibraries_ADDED)
-        find_package(VulkanHeaders 1.3.274 REQUIRED)
+    if (NOT TARGET Opus::opus)
+        add_library(Opus::opus ALIAS opus)
     endif()
-
-    # SPIRV Headers
-    AddJsonPackage(spirv-headers)
-
-    # SPIRV Tools
-    AddJsonPackage(spirv-tools)
-
-    if (SPIRV-Tools_ADDED)
-        add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools-static)
-        target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link)
-    endif()
-
-    # mbedtls
-    AddJsonPackage(mbedtls)
 else()
     # Enforce the search mode of non-required packages for better and shorter failure messages
     find_package(fmt 8 REQUIRED)
-    find_package(LLVM MODULE COMPONENTS Demangle)
+
+    if (NOT YUZU_DISABLE_LLVM)
+        find_package(LLVM MODULE COMPONENTS Demangle)
+    endif()
+
     find_package(nlohmann_json 3.8 REQUIRED)
     find_package(lz4 REQUIRED)
     find_package(RenderDoc MODULE)
     find_package(stb MODULE)
-    find_package(enet 1.3 MODULE REQUIRED)
+
     find_package(Opus 1.3 MODULE REQUIRED)
     find_package(ZLIB 1.2 REQUIRED)
     find_package(zstd 1.5 REQUIRED MODULE)
 
     # wow
-    if (PLATFORM_LINUX)
-        find_package(Boost 1.57.0 REQUIRED headers context system fiber)
-    else()
-        find_package(Boost 1.57.0 REQUIRED)
-    endif()
-
-    # OpenBSD does not package mbedtls3 (only 2)
-    if (PLATFORM_OPENBSD)
-        AddJsonPackage(mbedtls)
-    else()
-        find_package(MbedTLS 3 REQUIRED)
-    endif()
-
-    find_package(VulkanUtilityLibraries REQUIRED)
-    find_package(VulkanHeaders 1.3.274 REQUIRED)
-
-    # FreeBSD does not package spirv-headers
-    if (PLATFORM_FREEBSD)
-        AddJsonPackage(spirv-headers)
-    else()
-        find_package(SPIRV-Headers 1.3.274 REQUIRED)
-    endif()
-
-    find_package(SPIRV-Tools MODULE REQUIRED)
-
-    if (YUZU_TESTS)
-        find_package(Catch2 3.0.1 REQUIRED)
-    endif()
+    find_package(Boost 1.57.0 CONFIG REQUIRED OPTIONAL_COMPONENTS headers context system fiber)
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID)
         find_package(gamemode 1.7 MODULE)
@@ -536,86 +554,6 @@ if(NOT TARGET Boost::headers)
     AddJsonPackage(boost_headers)
 endif()
 
-# DiscordRPC
-if (USE_DISCORD_PRESENCE)
-    if (ARCHITECTURE_arm64)
-        add_compile_definitions(RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN)
-    endif()
-
-    AddJsonPackage(discord-rpc)
-
-    target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include)
-    add_library(DiscordRPC::discord-rpc ALIAS discord-rpc)
-endif()
-
-# SimpleIni
-AddJsonPackage(simpleini)
-
-# Most linux distros don't package cubeb, so enable regardless of cpm settings
-if(ENABLE_CUBEB)
-    AddJsonPackage(cubeb)
-
-    if (cubeb_ADDED)
-        if (NOT MSVC)
-            if (TARGET speex)
-                target_compile_options(speex PRIVATE -Wno-sign-compare)
-            endif()
-
-            set_target_properties(cubeb PROPERTIES COMPILE_OPTIONS "")
-            target_compile_options(cubeb INTERFACE
-                -Wno-implicit-const-int-float-conversion
-                -Wno-shadow
-                -Wno-missing-declarations
-                -Wno-return-type
-                -Wno-uninitialized
-            )
-        else()
-            target_compile_options(cubeb PRIVATE
-                /wd4456
-                /wd4458
-            )
-        endif()
-    endif()
-endif()
-
-# find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the YUZU_find_package
-if (ENABLE_SDL2)
-    if (YUZU_USE_EXTERNAL_SDL2)
-        message(STATUS "Using SDL2 from externals.")
-        if (NOT WIN32)
-            # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
-            # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
-            # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
-            # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
-            set(SDL_UNUSED_SUBSYSTEMS
-                File Filesystem
-                Locale Power Render)
-            foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
-              string(TOUPPER ${_SUB} _OPT)
-              set(SDL_${_OPT} OFF)
-            endforeach()
-
-            set(HIDAPI ON)
-        endif()
-
-        if (APPLE)
-            set(SDL_FILE ON)
-        endif()
-
-        if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck")
-            set(SDL_PIPEWIRE OFF) # build errors out with this on
-            AddJsonPackage("sdl2_steamdeck")
-        else()
-            AddJsonPackage("sdl2_generic")
-        endif()
-    elseif (YUZU_USE_BUNDLED_SDL2)
-        message(STATUS "Using bundled SDL2")
-        AddJsonPackage(sdl2)
-    endif()
-
-    find_package(SDL2 2.26.4 REQUIRED)
-endif()
-
 # List of all FFmpeg components required
 set(FFmpeg_COMPONENTS
     avcodec
@@ -646,23 +584,46 @@ add_subdirectory(externals)
 # pass targets from externals
 find_package(libusb)
 find_package(VulkanMemoryAllocator)
+find_package(enet)
+find_package(MbedTLS)
+find_package(VulkanUtilityLibraries)
+find_package(SimpleIni)
+find_package(SPIRV-Tools)
+find_package(sirit)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
 endif()
 
-if (ENABLE_WEB_SERVICE)
-    find_package(httplib)
+if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
+    # Workaround: httplib will kill itself if you attempt to do a find_package propagation
+    # find_package(httplib CONFIG)
 endif()
 
-if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
+if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
     find_package(cpp-jwt)
 endif()
 
+if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
+    find_package(oaknut)
+endif()
+
 if (ENABLE_SDL2)
     find_package(SDL2)
 endif()
 
+if (USE_DISCORD_PRESENCE)
+    find_package(DiscordRPC)
+endif()
+
+if (ENABLE_CUBEB)
+    find_package(cubeb)
+endif()
+
+if (YUZU_TESTS OR DYNARMIC_TESTS)
+    find_package(Catch2)
+endif()
+
 if (ENABLE_QT)
     if (YUZU_USE_BUNDLED_QT)
         download_qt(6.8.3)
@@ -681,6 +642,8 @@ if (ENABLE_QT)
     endif()
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        # yes Qt, we get it
+        set(QT_NO_PRIVATE_MODULE_WARNING ON)
         find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
     elseif (UNIX AND NOT APPLE)
         find_package(Qt6 REQUIRED COMPONENTS DBus Gui)
@@ -735,9 +698,8 @@ if (UNIX AND NOT APPLE AND NOT ANDROID)
     pkg_check_modules(LIBVA libva)
 endif()
 
-if (NOT YUZU_USE_BUNDLED_FFMPEG)
+if (NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_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
@@ -754,17 +716,18 @@ if(ENABLE_QT)
     set_target_properties(Qt6::Platform PROPERTIES INTERFACE_COMPILE_FEATURES "")
 endif()
 
-if (WIN32 AND YUZU_CRASH_DUMPS)
-    set(BREAKPAD_VER "breakpad-c89f9dd")
-    download_bundled_external("breakpad/" ${BREAKPAD_VER} "breakpad-win" BREAKPAD_PREFIX "c89f9dd")
+# TODO: test on windows
+# if (YUZU_CRASH_DUMPS)
+#     set(BREAKPAD_VER "breakpad-c89f9dd")
+#     download_bundled_external("breakpad/" ${BREAKPAD_VER} "breakpad-win" BREAKPAD_PREFIX "c89f9dd")
 
-    set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
-    set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
+#     set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
+#     set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
 
-    add_library(libbreakpad_client INTERFACE IMPORTED)
-    target_link_libraries(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_LIBRARY}")
-    target_include_directories(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_INCLUDE_DIR}")
-endif()
+#     add_library(libbreakpad_client INTERFACE IMPORTED)
+#     target_link_libraries(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_LIBRARY}")
+#     target_include_directories(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_INCLUDE_DIR}")
+# endif()
 
 # Prefer the -pthread flag on Linux.
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -787,6 +750,13 @@ elseif (WIN32)
         # PSAPI is the Process Status API
         set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
     endif()
+elseif (PLATFORM_HAIKU)
+    # Haiku is so special :)
+    # Some fucking genius decided to name an entire module "network" in 2019
+    # this caused great disaster amongst the Haiku community who had came first with
+    # their "libnetwork.so"; since CMake doesn't do magic, we have to use an ABSOLUTE PATH
+    # to the library itself, otherwise it will think we are linking to... our network thing
+    set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
 endif()
@@ -872,18 +842,46 @@ if (MSVC AND CXX_CLANG)
     link_libraries(llvm-mingw-runtime)
 endif()
 
-if (YUZU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    # We will assume that if the compiler is GCC, it will attempt to use ld.bfd by default.
-    # Try to pick a faster linker.
-    find_program(LLD lld)
-    find_program(MOLD mold)
+#[[
+    search order:
+    - gold (GCC only) - the best, generally, but unfortunately not packaged anymore
+    - mold (GCC only) - generally does well on GCC
+    - ldd - preferred on clang
+    - bfd - the final fallback
+    - If none are found (macOS uses ld.prime, etc) just use the default linker
+]]
+if (YUZU_USE_FASTER_LD)
+    find_program(LINKER_BFD bfd)
+    if (LINKER_BFD)
+        set(LINKER bfd)
+    endif()
 
-    if (MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
-        message(NOTICE "Selecting mold as linker")
-        add_link_options("-fuse-ld=mold")
-    elseif (LLD)
-        message(NOTICE "Selecting lld as linker")
-        add_link_options("-fuse-ld=lld")
+    find_program(LINKER_LLD lld)
+    if (LINKER_LLD)
+        set(LINKER lld)
+    endif()
+
+    if (CXX_GCC)
+        find_program(LINKER_MOLD mold)
+        if (LINKER_MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
+            set(LINKER mold)
+        endif()
+
+        find_program(LINKER_GOLD gold)
+        if (LINKER_GOLD)
+            set(LINKER gold)
+        endif()
+    endif()
+
+    if (LINKER)
+        message(NOTICE "Selecting ${LINKER} as linker")
+        add_link_options("-fuse-ld=${LINKER}")
+    else()
+        message(WARNING "No faster linker found--using default")
+    endif()
+
+    if (LINKER STREQUAL "lld" AND CXX_GCC)
+        message(WARNING "Using lld on GCC may cause issues with certain LTO settings. If the program fails to compile, disable YUZU_USE_FASTER_LD, or install mold or GNU gold.")
     endif()
 endif()
 

CMakeModules/CPM.cmake

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This is a slightly modified version of CPM.cmake
+
 # CPM.cmake - CMake's missing package manager
 # ===========================================
 # See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions.
@@ -743,9 +748,11 @@ function(CPMAddPackage)
     if(NOT DEFINED CPM_ARGS_NAME)
       set(CPM_ARGS_NAME ${nameFromUrl})
     endif()
-    if(NOT DEFINED CPM_ARGS_VERSION)
-      set(CPM_ARGS_VERSION ${verFromUrl})
-    endif()
+
+    # this is dumb and should not be done
+    # if(NOT DEFINED CPM_ARGS_VERSION)
+    #   set(CPM_ARGS_VERSION ${verFromUrl})
+    # endif()
 
     list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS URL "${CPM_ARGS_URL}")
   endif()

CMakeModules/CPMUtil.cmake

@@ -107,7 +107,6 @@ function(AddJsonPackage)
         get_json_element("${object}" name name "${JSON_NAME}")
         get_json_element("${object}" extension extension "tar.zst")
         get_json_element("${object}" min_version min_version "")
-        get_json_element("${object}" cmake_filename cmake_filename "")
         get_json_element("${object}" raw_disabled disabled_platforms "")
 
         if (raw_disabled)
@@ -124,12 +123,21 @@ function(AddJsonPackage)
             EXTENSION ${extension}
             MIN_VERSION ${min_version}
             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()
 
     get_json_element("${object}" hash hash "")
+    get_json_element("${object}" hash_suffix hash_suffix "")
     get_json_element("${object}" sha sha "")
     get_json_element("${object}" url url "")
     get_json_element("${object}" key key "")
@@ -139,6 +147,7 @@ function(AddJsonPackage)
     get_json_element("${object}" git_host git_host "")
     get_json_element("${object}" source_subdir source_subdir "")
     get_json_element("${object}" bundled bundled "unset")
+    get_json_element("${object}" download_only download_only "unset")
     get_json_element("${object}" find_args find_args "")
     get_json_element("${object}" raw_patches patches "")
 
@@ -192,13 +201,24 @@ function(AddJsonPackage)
     # system/bundled
     if (bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)
         set(bundled ${JSON_BUNDLED_PACKAGE})
+    else()
+        set(bundled OFF)
     endif()
 
+    # download only
+    if (download_only STREQUAL "unset" AND DEFINED JSON_DOWNLOAD_ONLY)
+        set(download_only ${JSON_DOWNLOAD_ONLY})
+    else()
+        set(download_only OFF)
+    endif()
+
+
     AddPackage(
         NAME "${package}"
         VERSION "${version}"
         URL "${url}"
         HASH "${hash}"
+        HASH_SUFFIX "${hash_suffix}"
         SHA "${sha}"
         REPO "${repo}"
         KEY "${key}"
@@ -211,6 +231,8 @@ function(AddJsonPackage)
         GIT_VERSION ${git_version}
         GIT_HOST ${git_host}
 
+        DOWNLOAD_ONLY ${download_only}
+
         ARTIFACT ${artifact}
         TAG ${tag}
     )
@@ -266,8 +288,11 @@ function(AddPackage)
         URL
         GIT_URL
 
+        DOWNLOAD_ONLY
+
         KEY
         BUNDLED_PACKAGE
+        FORCE_BUNDLED_PACKAGE
         FIND_PACKAGE_ARGUMENTS
     )
 
@@ -315,7 +340,7 @@ function(AddPackage)
                     ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz)
             endif()
         elseif (DEFINED PKG_ARGS_SHA)
-            set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.zip")
+            set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
         else()
             if (DEFINED PKG_ARGS_BRANCH)
                 set(PKG_BRANCH ${PKG_ARGS_BRANCH})
@@ -325,7 +350,7 @@ function(AddPackage)
                 set(PKG_BRANCH master)
             endif()
 
-            set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.zip)
+            set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz)
         endif()
     else()
         cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME} "No URL or repository defined")
@@ -417,7 +442,9 @@ function(AddPackage)
         - BUNDLED_PACKAGE
         - default to allow local
     ]]#
-    if (${PKG_ARGS_NAME}_FORCE_SYSTEM)
+    if (PKG_ARGS_FORCE_BUNDLED_PACKAGE)
+        set_precedence(OFF OFF)
+    elseif (${PKG_ARGS_NAME}_FORCE_SYSTEM)
         set_precedence(ON ON)
     elseif (${PKG_ARGS_NAME}_FORCE_BUNDLED)
         set_precedence(OFF OFF)
@@ -437,9 +464,14 @@ function(AddPackage)
         set_precedence(ON OFF)
     endif()
 
+    if (DEFINED PKG_ARGS_VERSION)
+        list(APPEND EXTRA_ARGS
+            VERSION ${PKG_ARGS_VERSION}
+        )
+    endif()
+
     CPMAddPackage(
         NAME ${PKG_ARGS_NAME}
-        VERSION ${PKG_ARGS_VERSION}
         URL ${pkg_url}
         URL_HASH ${pkg_hash}
         CUSTOM_CACHE_KEY ${pkg_key}
@@ -450,6 +482,8 @@ function(AddPackage)
         PATCHES ${PKG_ARGS_PATCHES}
         EXCLUDE_FROM_ALL ON
 
+        ${EXTRA_ARGS}
+
         ${PKG_ARGS_UNPARSED_ARGUMENTS}
     )
 
@@ -502,12 +536,12 @@ function(add_ci_package key)
         NAME ${ARTIFACT_PACKAGE}
         REPO ${ARTIFACT_REPO}
         TAG v${ARTIFACT_VERSION}
-        VERSION ${ARTIFACT_VERSION}
+        GIT_VERSION ${ARTIFACT_VERSION}
         ARTIFACT ${ARTIFACT}
 
-        KEY ${key}
+        KEY ${key}-${ARTIFACT_VERSION}
         HASH_SUFFIX sha512sum
-        BUNDLED_PACKAGE ON
+        FORCE_BUNDLED_PACKAGE ON
     )
 
     set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}_SOURCE_DIR} PARENT_SCOPE)
@@ -524,7 +558,6 @@ function(AddCIPackage)
         EXTENSION
         MIN_VERSION
         DISABLED_PLATFORMS
-        CMAKE_FILENAME
     )
 
     cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "" ${ARGN})
@@ -580,30 +613,30 @@ function(AddCIPackage)
         add_ci_package(android)
     endif()
 
-    if(PLATFORM_SUN AND NOT "solaris" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(solaris)
+    if(PLATFORM_SUN AND NOT "solaris-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(solaris-amd64)
     endif()
 
-    if(PLATFORM_FREEBSD AND NOT "freebsd" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(freebsd)
+    if(PLATFORM_FREEBSD AND NOT "freebsd-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(freebsd-amd64)
     endif()
 
-    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(linux)
+    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux-amd64)
     endif()
 
     if((PLATFORM_LINUX AND ARCHITECTURE_arm64) AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS)
         add_ci_package(linux-aarch64)
     endif()
 
+    # TODO(crueter): macOS amd64/aarch64 split mayhaps
+    if (APPLE AND NOT "macos-universal" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(macos-universal)
+    endif()
+
     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

@@ -10,6 +10,7 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
     set(package_base_url "https://github.com/eden-emulator/")
     set(package_repo "no_platform")
     set(package_extension "no_platform")
+    set(CACHE_KEY "")
 
     # TODO(crueter): Need to convert ffmpeg to a CI.
     if (WIN32 OR FORCE_WIN_ARCHIVES)
@@ -33,8 +34,9 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
     else()
         message(FATAL_ERROR "No package available for this platform")
     endif()
-    set(package_url "${package_base_url}${package_repo}")
-    set(full_url ${package_url}${remote_path}${lib_name}${package_extension})
+    string(CONCAT package_url "${package_base_url}" "${package_repo}")
+    string(CONCAT full_url "${package_url}" "${remote_path}" "${lib_name}" "${package_extension}")
+    message(STATUS "Resolved bundled URL: ${full_url}")
 
     # TODO(crueter): DELETE THIS ENTIRELY, GLORY BE TO THE CI!
     AddPackage(
@@ -47,35 +49,12 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi
         # TODO(crueter): hash
     )
 
-    set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
-    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")
-    if (NOT EXISTS ${MOLTENVK_DIR})
-        if (NOT EXISTS ${MOLTENVK_TAR})
-            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar
-                ${MOLTENVK_TAR} SHOW_PROGRESS)
-        endif()
-
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
+    if (DEFINED ${cpm_key}_SOURCE_DIR)
+        set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
+        message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
+    else()
+        message(FATAL_ERROR "AddPackage did not set ${cpm_key}_SOURCE_DIR")
     endif()
-
-    # Add the MoltenVK library path to the prefix so find_library can locate it.
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
 # Determine installation parameters for OS, architecture, and compiler
@@ -117,7 +96,7 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
         set(host "linux")
         set(type "desktop")
         set(arch "linux_gcc_64")
-        set(arch_path "linux")
+        set(arch_path "gcc_64")
     endif()
 
     set(${host_out} "${host}" PARENT_SCOPE)
@@ -152,56 +131,79 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
     set(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")
     if (tool)
         set(prefix "${base_path}/Tools")
-        set(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})
+        list(APPEND install_args install-tool --outputdir "${base_path}" "${host}" desktop "${target}")
     else()
         set(prefix "${base_path}/${target}/${arch_path}")
-        set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qt_base)
+        list(APPEND install_args install-qt --outputdir "${base_path}" "${host}" "${type}" "${target}" "${arch}" -m qt_base)
 
         if (YUZU_USE_QT_MULTIMEDIA)
-            set(install_args ${install_args} qtmultimedia)
+            list(APPEND install_args qtmultimedia)
         endif()
 
         if (YUZU_USE_QT_WEB_ENGINE)
-            set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine)
+            list(APPEND install_args qtpositioning qtwebchannel qtwebengine)
         endif()
 
-        if (NOT ${YUZU_QT_MIRROR} STREQUAL "")
+        if (NOT "${YUZU_QT_MIRROR}" STREQUAL "")
             message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}")
-            set(install_args ${install_args} -b ${YUZU_QT_MIRROR})
+            list(APPEND install_args -b "${YUZU_QT_MIRROR}")
         endif()
     endif()
 
-    message(STATUS "Install Args ${install_args}")
+    message(STATUS "Install Args: ${install_args}")
+
     if (NOT EXISTS "${prefix}")
         message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")
         set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")
         if (WIN32)
             set(aqt_path "${base_path}/aqt.exe")
             if (NOT EXISTS "${aqt_path}")
-                file(DOWNLOAD
-                        ${AQT_PREBUILD_BASE_URL}/aqt.exe
-                        ${aqt_path} SHOW_PROGRESS)
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt.exe" "${aqt_path}" SHOW_PROGRESS)
+            endif()
+            execute_process(COMMAND "${aqt_path}" ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                OUTPUT_VARIABLE aqt_out
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt.exe failed: ${aqt_err}")
             endif()
-            execute_process(COMMAND ${aqt_path} ${install_args}
-                    WORKING_DIRECTORY ${base_path})
         elseif (APPLE)
             set(aqt_path "${base_path}/aqt-macos")
             if (NOT EXISTS "${aqt_path}")
-                file(DOWNLOAD
-                        ${AQT_PREBUILD_BASE_URL}/aqt-macos
-                        ${aqt_path} SHOW_PROGRESS)
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt-macos" "${aqt_path}" SHOW_PROGRESS)
+            endif()
+            execute_process(COMMAND chmod +x "${aqt_path}")
+            execute_process(COMMAND "${aqt_path}" ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt-macos failed: ${aqt_err}")
             endif()
-            execute_process(COMMAND chmod +x ${aqt_path})
-            execute_process(COMMAND ${aqt_path} ${install_args}
-                    WORKING_DIRECTORY ${base_path})
         else()
+            find_program(PYTHON3_EXECUTABLE python3)
+            if (NOT PYTHON3_EXECUTABLE)
+                message(FATAL_ERROR "python3 is required to install Qt using aqt (pip mode).")
+            endif()
             set(aqt_install_path "${base_path}/aqt")
             file(MAKE_DIRECTORY "${aqt_install_path}")
 
-            execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall
-                    WORKING_DIRECTORY ${base_path})
-            execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}
-                    WORKING_DIRECTORY ${base_path})
+            execute_process(COMMAND "${PYTHON3_EXECUTABLE}" -m pip install --target="${aqt_install_path}" aqtinstall
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE pip_res
+                ERROR_VARIABLE pip_err)
+            if (NOT pip_res EQUAL 0)
+                message(FATAL_ERROR "pip install aqtinstall failed: ${pip_err}")
+            endif()
+
+            execute_process(COMMAND "${CMAKE_COMMAND}" -E env PYTHONPATH="${aqt_install_path}" "${PYTHON3_EXECUTABLE}" -m aqt ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt (python) failed: ${aqt_err}")
+            endif()
         endif()
 
         message(STATUS "Downloaded Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path} to ${prefix}")
@@ -219,7 +221,7 @@ endfunction()
 function(download_qt target)
     determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_path)
 
-    get_external_prefix(qt base_path)
+    set(base_path "${CMAKE_BINARY_DIR}/externals/qt")
     file(MAKE_DIRECTORY "${base_path}")
 
     download_qt_configuration(prefix "${target}" "${host}" "${type}" "${arch}" "${arch_path}" "${base_path}")
@@ -236,26 +238,34 @@ function(download_qt target)
     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
-function(download_moltenvk)
-set(MOLTENVK_PLATFORM "macOS")
+function(download_moltenvk version platform)
+    if(NOT version)
+        message(FATAL_ERROR "download_moltenvk: version argument is required")
+    endif()
+    if(NOT platform)
+        message(FATAL_ERROR "download_moltenvk: platform argument is required")
+    endif()
 
-set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
-set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
-if (NOT EXISTS ${MOLTENVK_DIR})
-if (NOT EXISTS ${MOLTENVK_TAR})
-    file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10-rc2/MoltenVK-all.tar
-    ${MOLTENVK_TAR} SHOW_PROGRESS)
-endif()
+    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
+    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
-endif()
+    if(NOT EXISTS "${MOLTENVK_DIR}")
+        if(NOT EXISTS "${MOLTENVK_TAR}")
+            file(DOWNLOAD "https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar"
+                          "${MOLTENVK_TAR}" SHOW_PROGRESS)
+        endif()
 
-# Add the MoltenVK library path to the prefix so find_library can locate it.
-list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${MOLTENVK_PLATFORM}")
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+        execute_process(
+            COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
+            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals"
+            RESULT_VARIABLE tar_res
+            ERROR_VARIABLE tar_err
+        )
+        if(NOT tar_res EQUAL 0)
+            message(FATAL_ERROR "Extracting MoltenVK failed: ${tar_err}")
+        endif()
+    endif()
+    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
 endfunction()
 
-function(get_external_prefix lib_name prefix_var)
-    set(${prefix_var} "${CMAKE_BINARY_DIR}/externals/${lib_name}" PARENT_SCOPE)
-endfunction()

CMakeModules/FindDiscordRPC.cmake

@@ -1,27 +1,33 @@
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h)
+find_package(DiscordRPC CONFIG QUIET)
 
-find_library(DiscordRPC_LIBRARY discord-rpc)
+if (NOT DiscordRPC_FOUND)
+    find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h)
+    find_library(DiscordRPC_LIBRARY discord-rpc)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DiscordRPC
-    REQUIRED_VARS
-        DiscordRPC_LIBRARY
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(DiscordRPC
+        REQUIRED_VARS
+            DiscordRPC_LIBRARY
+            DiscordRPC_INCLUDE_DIR
+    )
+
+    if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc)
+        add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED)
+        set_target_properties(DiscordRPC::discord-rpc PROPERTIES
+            IMPORTED_LOCATION "${DiscordRPC_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}"
+        )
+    endif()
+
+    mark_as_advanced(
         DiscordRPC_INCLUDE_DIR
-)
-
-if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc)
-    add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED)
-    set_target_properties(DiscordRPC::discord-rpc PROPERTIES
-        IMPORTED_LOCATION "${DiscordRPC_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}"
+        DiscordRPC_LIBRARY
     )
 endif()
-
-mark_as_advanced(
-    DiscordRPC_INCLUDE_DIR
-    DiscordRPC_LIBRARY
-)

CMakeModules/Findsirit.cmake

@@ -1,11 +0,0 @@
-# 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/Findzstd.cmake

@@ -13,9 +13,12 @@ find_package_handle_standard_args(zstd
 if (zstd_FOUND AND NOT TARGET zstd::zstd)
     if (TARGET zstd::libzstd_shared)
         add_library(zstd::zstd ALIAS zstd::libzstd_shared)
+        add_library(zstd::libzstd ALIAS zstd::libzstd_shared)
     elseif (TARGET zstd::libzstd_static)
         add_library(zstd::zstd ALIAS zstd::libzstd_static)
+        add_library(zstd::libzstd ALIAS zstd::libzstd_static)
     else()
         add_library(zstd::zstd ALIAS PkgConfig::ZSTD)
+        add_library(zstd::libzstd ALIAS PkgConfig::ZSTD)
     endif()
 endif()

CMakeModules/GenerateSCMRev.cmake

@@ -1,40 +1,41 @@
+# 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
 
-# Gets a UTC timestamp and sets the provided variable to it
+# generate git/build information
+include(GetSCMRev)
+
 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)
 
-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})
+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}")
+  set(IS_DEV_BUILD true)
 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_BRANCH})
+set(BUILD_ID ${GIT_REFSPEC})
 set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION} ")
-
 set(CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
+# Auto-updater metadata! Must somewhat mirror GitHub API endpoint
+set(BUILD_AUTO_UPDATE_WEBSITE "https://github.com")
+set(BUILD_AUTO_UPDATE_API "http://api.github.com")
+set(BUILD_AUTO_UPDATE_REPO "eden-emulator/Releases")
+
 configure_file(scm_rev.cpp.in scm_rev.cpp @ONLY)

CMakeModules/GetSCMRev.cmake

@@ -0,0 +1,49 @@
+# 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,3 +1,6 @@
+# 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

@@ -48,6 +48,8 @@ A list of supported games will be available in future. Please be patient.
 
 Check out our [website](https://eden-emu.dev) for the latest news on exciting features, monthly progress reports, and more!
 
+[![Packaging status](https://repology.org/badge/vertical-allrepos/eden-emulator.svg)](https://repology.org/project/eden-emulator/versions)
+
 ## Development
 
 Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/kXAmGCXBGD) or [Revolt](https://rvlt.gg/qKgFEAbH).
@@ -55,10 +57,16 @@ 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)
 
+For information on provided development tooling, see the [Tools directory](./tools)
+
 ## Download
 
 You can download the latest releases from [here](https://github.com/eden-emulator/Releases/releases).

cpmfile.json

@@ -4,8 +4,11 @@
         "package": "OpenSSL",
         "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "3.5.2",
-        "min_version": "1.1.1"
+        "version": "3.6.0",
+        "min_version": "1.1.1",
+        "disabled_platforms": [
+            "macos-universal"
+        ]
     },
     "boost": {
         "package": "Boost",
@@ -15,6 +18,7 @@
         "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
         "git_version": "1.89.0",
         "version": "1.57",
+        "find_args": "CONFIG",
         "patches": [
             "0001-clang-cl.patch",
             "0002-use-marmasm.patch",
@@ -23,33 +27,33 @@
     },
     "fmt": {
         "repo": "fmtlib/fmt",
-        "sha": "40626af88b",
-        "hash": "d59f06c24339f223de4ec2afeba1c67b5835a0f350a1ffa86242a72fc3e616a6b8b21798355428d4200c75287308b66634619ffa0b52ba5bd74cc01772ea1a8a",
+        "tag": "%VERSION%",
+        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
         "version": "8",
-        "options": [
-            "FMT_INSTALL OFF"
-        ]
+        "git_version": "12.0.0"
     },
     "lz4": {
         "name": "lz4",
         "repo": "lz4/lz4",
         "sha": "ebb370ca83",
-        "hash": "43600e87b35256005c0f2498fa56a77de6783937ba4cfce38c099f27c03188d097863e8a50c5779ca0a7c63c29c4f7ed0ae526ec798c1fd2e3736861b62e0a37",
+        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
         "source_subdir": "build/cmake"
     },
     "nlohmann": {
         "package": "nlohmann_json",
         "repo": "nlohmann/json",
-        "sha": "55f93686c0",
-        "hash": "b739749b066800e21154506ea150d2c5cbce8a45344177f46f884547a1399d26753166fd0df8135269ce28cf223552b1b65cd625b88c844d54753f2434900486",
-        "version": "3.8"
+        "tag": "v%VERSION%",
+        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
+        "version": "3.8",
+        "git_version": "3.12.0"
     },
     "zlib": {
         "package": "ZLIB",
         "repo": "madler/zlib",
-        "sha": "51b7f2abda",
-        "hash": "16eaf1f3752489d12fd9ce30f7b5f7cbd5cb8ff53d617005a9847ae72d937f65e01e68be747f62d7ac19fd0c9aeba9956e60f16d6b465c5fdc2f3d08b4db2e6c",
+        "tag": "v%VERSION%",
+        "hash": "8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088",
         "version": "1.2",
+        "git_version": "1.3.1",
         "options": [
             "ZLIB_BUILD_SHARED OFF",
             "ZLIB_INSTALL OFF"
@@ -57,8 +61,8 @@
     },
     "zstd": {
         "repo": "facebook/zstd",
-        "sha": "f8745da6ff",
-        "hash": "3037007f990040fe32573b46f9bef8762fd5dbeeb07ffffcbfeba51ec98167edae39bb9c87f9299efcd61c4e467c5e84f7c19f0df7799bc1fc04864a278792ee",
+        "sha": "b8d6101fba",
+        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
         "version": "1.5",
         "source_subdir": "build/cmake",
         "find_args": "MODULE",
@@ -66,126 +70,27 @@
             "ZSTD_BUILD_SHARED OFF"
         ]
     },
-    "catch2": {
-        "package": "Catch2",
-        "repo": "catchorg/Catch2",
-        "sha": "644821ce28",
-        "hash": "f8795f98acf2c02c0db8e734cc866d5caebab4b4a306e93598b97cb3c0c728dafe8283dce27ffe8d42460e5ae7302f3f32e7e274a7f991b73511ac88eef21b1f",
-        "version": "3.0.1"
-    },
-    "enet": {
-        "repo": "lsalzman/enet",
-        "sha": "2662c0de09",
-        "hash": "3de1beb4fa3d6b1e03eda8dd1e7580694f854af3ed3975dcdabfdcdf76b97f322b9734d35ea7f185855bb490d957842b938b26da4dd2dfded509390f8d2794dd",
-        "version": "1.3",
-        "find_args": "MODULE"
-    },
     "opus": {
         "package": "Opus",
         "repo": "crueter/opus",
         "sha": "ab19c44fad",
-        "hash": "79d0d015b19e74ce6076197fc32b86fe91d724a0b5a79e86adfc4bdcb946ece384e252adbbf742b74d03040913b70bb0e9556eafa59ef20e42d2f3f4d6f2859a",
+        "hash": "d632e8f83c5d3245db404bcb637113f9860bf16331498ba2c8e77979d1febee6b52d8b1da448e7d54eeac373e912cd55e3e300fc6c242244923323280dc43fbe",
         "version": "1.3",
         "find_args": "MODULE",
         "options": [
             "OPUS_PRESUME_NEON ON"
         ]
     },
-    "vulkan-utility-headers": {
-        "package": "VulkanUtilityLibraries",
-        "repo": "scripts/VulkanUtilityHeaders",
-        "tag": "1.4.326",
-        "artifact": "VulkanUtilityHeaders.tar.zst",
-        "git_host": "git.crueter.xyz",
-        "hash": "5924629755cb1605c4aa4eee20ef7957a9dd8d61e4df548be656d98054f2730c4109693c1bd35811f401f4705d2ccff9fc849be32b0d8480bc3f73541a5e0964"
-    },
-    "spirv-tools": {
-        "package": "SPIRV-Tools",
-        "repo": "KhronosGroup/SPIRV-Tools",
-        "sha": "40eb301f32",
-        "hash": "58d0fb1047d69373cf24c73e6f78c73a72a6cca3b4df1d9f083b9dcc0962745ef154abf3dbe9b3623b835be20c6ec769431cf11733349f45e7568b3525f707aa",
-        "find_args": "MODULE",
-        "options": [
-            "SPIRV_SKIP_EXECUTABLES ON"
-        ]
-    },
-    "spirv-headers": {
-        "package": "SPIRV-Headers",
-        "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "4e209d3d7e",
-        "hash": "f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4",
-        "options": [
-            "SPIRV_WERROR OFF"
-        ]
-    },
-    "mbedtls": {
-        "package": "MbedTLS",
-        "repo": "Mbed-TLS/mbedtls",
-        "tag": "mbedtls-%VERSION%",
-        "hash": "6671fb8fcaa832e5b115dfdce8f78baa6a4aea71f5c89a640583634cdee27aefe3bf4be075744da91f7c3ae5ea4e0c765c8fc3937b5cfd9ea73d87ef496524da",
-        "version": "3",
-        "git_version": "3.6.4",
-        "artifact": "%TAG%.tar.bz2"
-    },
-    "cubeb": {
-        "repo": "mozilla/cubeb",
-        "sha": "fa02160712",
-        "hash": "82d808356752e4064de48c8fecbe7856715ade1e76b53937116bf07129fc1cc5b3de5e4b408de3cd000187ba8dc32ca4109661cb7e0355a52e54bd81b9be1c61",
-        "find_args": "CONFIG",
-        "options": [
-            "USE_SANITIZERS OFF",
-            "BUILD_TESTS OFF",
-            "BUILD_TOOLS OFF",
-            "BUNDLE_SPEEX ON"
-        ]
-    },
     "boost_headers": {
         "repo": "boostorg/headers",
         "sha": "95930ca8f5",
-        "hash": "d1dece16f3b209109de02123c537bfe1adf07a62b16c166367e7e5d62e0f7c323bf804c89b3192dd6871bc58a9d879d25a1cc3f7b9da0e497cf266f165816e2a",
+        "hash": "8a07d7a6f0065587d3005a83481a794704ae22e773b9f336fbd89ed230aaa7b4c86c03edcbae30bba8b3e20839c3131eaa2dceac037ef811533ef4eadc53b15b",
         "bundled": true
     },
-    "discord-rpc": {
-        "repo": "eden-emulator/discord-rpc",
-        "sha": "1cf7772bb6",
-        "hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97"
-    },
-    "simpleini": {
-        "package": "SimpleIni",
-        "repo": "brofield/simpleini",
-        "sha": "09c21bda1d",
-        "hash": "99779ca9b6e040d36558cadf484f9ffdab5b47bcc8fc72e4d33639d1d60c0ceb4410d335ba445d72a4324e455167fd6769d99b459943aa135bec085dff2d4b7c",
-        "find_args": "MODULE"
-    },
-    "sdl2_generic": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "sha": "54772f345a",
-        "hash": "2a68a0e01c390043aa9d9df63d8a20a52076c88bb460ac4e0f33194ca7d9bc8fadbbcc04e7506872ac4b6354a73fbc267c036f82200da59465789b87c7d9e3a4",
-        "key": "generic",
-        "bundled": true
-    },
-    "sdl2_steamdeck": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "sha": "cc016b0046",
-        "hash": "34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b",
-        "key": "steamdeck",
-        "bundled": true
-    },
-    "sdl2": {
-        "ci": true,
-        "package": "SDL2",
-        "name": "SDL2",
-        "repo": "crueter-ci/SDL2",
-        "version": "2.32.8",
-        "min_version": "2.26.4",
-        "cmake_filename": "sdl2"
-    },
     "llvm-mingw": {
         "repo": "misc/llvm-mingw",
         "git_host": "git.crueter.xyz",
-        "tag": "20250828",
+        "tag": "%VERSION%",
         "version": "20250828",
         "artifact": "clang-rt-builtins.tar.zst",
         "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181"