updates

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
fx
2025-12-25 23:44:07 -03:00 · 2025-12-25 23:34:05 -03:00 · 2025-12-25 23:34:05 -03:00
99 changed files with 283 additions and 1484 deletions
--- a/.ci/ps4/build.sh
+++ b/.ci/ps4/build.sh
@@ -1,54 +0,0 @@
-#!/usr/local/bin/bash -ex
-
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[ -f "ps4-toolchain.cmake" ] || cat << EOF >"ps4-toolchain.cmake"
-set(CMAKE_SYSROOT "$OO_PS4_TOOLCHAIN")
-set(CMAKE_STAGING_PREFIX "$OO_PS4_TOOLCHAIN")
-set(CMAKE_SYSTEM_NAME "OpenOrbis")
-
-set(CMAKE_C_FLAGS " -D__OPENORBIS__ -D_LIBCPP_HAS_MUSL_LIBC=1 -D_GNU_SOURCE=1 --target=x86_64-pc-freebsd12-elf -mtune=x86-64 -march=x86-64 -fPIC -funwind-tables")
-set(CMAKE_CXX_FLAGS " -D__OPENORBIS__ -D_LIBCPP_HAS_MUSL_LIBC=1 -D_GNU_SOURCE=1 --target=x86_64-pc-freebsd12-elf -mtune=x86-64 -march=x86-64 -fPIC -funwind-tables")
-
-set(CMAKE_EXE_LINKER_FLAGS "-m elf_x86_64 -pie -T $OO_PS4_TOOLCHAIN/link.x --eh-frame-hdr -L$OO_PS4_TOOLCHAIN/lib")
-set(CMAKE_C_LINK_FLAGS "-m elf_x86_64 -pie -T $OO_PS4_TOOLCHAIN/link.x --eh-frame-hdr -L$OO_PS4_TOOLCHAIN/lib")
-set(CMAKE_CXX_LINK_FLAGS "-m elf_x86_64 -pie -T $OO_PS4_TOOLCHAIN/link.x --eh-frame-hdr -L$OO_PS4_TOOLCHAIN/lib")
-
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_CXX_COMPILER clang++)
-set(CMAKE_LINKER ld.lld)
-set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_C_LINK_FLAGS> <OBJECTS> -o <TARGET> -lc -lkernel -lSceUserService  -lSceSysmodule -lSceNet $OO_PS4_TOOLCHAIN/lib/crt1.o <LINK_LIBRARIES>")
-set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_CXX_LINK_FLAGS> <OBJECTS> -o <TARGET> -lc -lkernel -lc++ -lSceUserService -lSceSysmodule -lSceNet $OO_PS4_TOOLCHAIN/lib/crt1.o <LINK_LIBRARIES>")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-# TODO: Why does cmake not set this?
-set(CMAKE_SIZEOF_VOID_P 8)
-EOF
-
-# Normally a platform has a package manager
-# PS4 does not, atleast not in the normal sense
-export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
-cmake -S . -B build -G "Unix Makefiles" \
-    -DCMAKE_TOOLCHAIN_FILE="ps4-toolchain.cmake" \
-    -DENABLE_QT_TRANSLATION=OFF \
-    -DENABLE_CUBEB=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_CXX_FLAGS="$ARCH_FLAGS" \
-    -DCMAKE_C_FLAGS="$ARCH_FLAGS" \
-    -DENABLE_SDL2=ON \
-    -DENABLE_LIBUSB=OFF \
-    -DENABLE_UPDATE_CHECKER=OFF \
-    -DENABLE_QT=OFF \
-    -DENABLE_OPENSSL=OFF \
-    -DENABLE_WEB_SERVICE=OFF \
-    -DUSE_DISCORD_PRESENCE=OFF \
-    -DCPMUTIL_FORCE_BUNDLED=ON \
-    -DYUZU_USE_EXTERNAL_FFMPEG=ON \
-    -DYUZU_USE_CPM=ON \
-    "${EXTRA_CMAKE_FLAGS[@]}" || exit
-cmake --build build -t yuzu-cmd_pkg -- -j8
--- a/.ci/ps4/make-toolchain.sh
+++ b/.ci/ps4/make-toolchain.sh
@@ -1,176 +0,0 @@
-#!/usr/local/bin/bash -ex
-
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Define global vars
-# These flags are used everywhere, so let's reuse them.
-export OO_PS4_TOOLCHAIN="$PWD/prefix"
-export PREFIX="$OO_PS4_TOOLCHAIN"
-export CC="clang"
-export CXX="clang++"
-export AR="llvm-ar"
-export CFLAGS="-fPIC -DPS4 -D_LIBUNWIND_IS_BAREMETAL=1"
-export CXXFLAGS="$CFLAGS -D__STDC_VERSION__=0"
-export TARGET="x86_64-scei-ps4"
-export LLVM_ROOT="$PWD/llvm-project"
-export LLVM_PATH="$PWD/llvm-project/llvm"
-export WORK_PATH="$PWD"
-
-prepare_prefix() {
-    [ -d OpenOrbis-PS4-Toolchain ] || git clone --depth=1 https://github.com/OpenOrbis/OpenOrbis-PS4-Toolchain
-    [ -d musl ] || git clone --depth=1 https://github.com/OpenOrbis/musl
-    [ -d llvm-project ] || git clone --depth=1 --branch openorbis/20.x https://github.com/seuros/llvm-project
-    [ -d create-fself ] || git clone --depth=1 https://github.com/OpenOrbis/create-fself
-    [ -d create-gp4 ] || git clone --depth=1 https://github.com/OpenOrbis/create-gp4
-    [ -d readoelf ] || git clone --depth=1 https://github.com/OpenOrbis/readoelf
-    [ -d LibOrbisPkg ] || git clone --depth=1 https://github.com/maxton/LibOrbisPkg
-
-    mkdir -p $PREFIX "$PREFIX/bin" "$PREFIX/include"
-    [ -f "$PREFIX/include/orbis/libkernel.h" ] || cp -r OpenOrbis-PS4-Toolchain/include/* "$PREFIX/include/"
-    mkdir -p $PREFIX/usr
-    [ -L "$PREFIX/usr/include" ] || ln -s $PREFIX/include $PREFIX/usr/include || echo 1
-    [ -L "$PREFIX/usr/share" ] || ln -s $PREFIX/share $PREFIX/usr/share || echo 1
-    [ -L "$PREFIX/usr/lib" ] || ln -s $PREFIX/lib $PREFIX/usr/lib || echo 1
-    [ -L "$PREFIX/usr/bin" ] || ln -s $PREFIX/bin $PREFIX/usr/bin || echo 1
-}
-
-build_musl() {
-    mkdir -p musl-build
-    cd musl-build
-    ../musl/configure --target=$TARGET --disable-shared CC="$CC" CFLAGS="$CFLAGS" --prefix=$PREFIX
-    gmake -j8 && gmake install
-    cd ..
-}
-
-build_llvm() {
-    # Build compiler-rt
-    cmake "$LLVM_ROOT/compiler-rt" -B "$WORK_PATH/llvm-build/compiler-rt" \
-        -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-        -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
-        -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-        -DCMAKE_ASM_COMPILER="$CC" -DCMAKE_ASM_FLAGS="$CFLAGS -x assembler-with-cpp" \
-        -DLLVM_PATH="$LLVM_PATH" -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE="$TARGET" \
-        -DCOMPILER_RT_BAREMETAL_BUILD=YES -DCOMPILER_RT_BUILD_BUILTINS=ON \
-        -DCOMPILER_RT_BUILD_CRT=OFF -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
-        -DCOMPILER_RT_BUILD_XRAY=OFF -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
-        -DCOMPILER_RT_BUILD_PROFILE=OFF -DCOMPILER_RT_STANDALONE_BUILD=ON
-    # Build libunwind
-    cmake "$LLVM_ROOT/libunwind" -B "$WORK_PATH/llvm-build/libunwind" \
-        -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-        -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
-        -DCMAKE_C_FLAGS="$CFLAGS -fcxx-exceptions" -DCMAKE_CXX_FLAGS="$CXXFLAGS -fcxx-exceptions" \
-        -DCMAKE_ASM_COMPILER="$CC" -DCMAKE_ASM_FLAGS="$CFLAGS -x assembler-with-cpp" \
-        -DLLVM_PATH="$LLVM_PATH" -DLIBUNWIND_USE_COMPILER_RT=YES \
-        -DLIBUNWIND_BUILD_32_BITS=NO -DLIBUNWIND_ENABLE_STATIC=ON \
-        -DLIBUNWIND_ENABLE_SHARED=OFF -DLIBUNWIND_IS_BAREMETAL=ON
-    # Build libcxxabi
-    cmake "$LLVM_ROOT/libcxxabi" -B "$WORK_PATH/llvm-build/libcxxabi" \
-        -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-        -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
-        -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE=1 -isysroot $PREFIX -isystem $LLVM_ROOT/libcxx/include -isystem $PREFIX/include -isystem $WORK_PATH/llvm-build/libcxx/include/c++/v1" \
-        -DCMAKE_CXX_FLAGS="$CXXFLAGS -D_GNU_SOURCE=1 -isysroot $PREFIX -isystem $LLVM_ROOT/libcxx/include -isystem $PREFIX/include -isystem $WORK_PATH/llvm-build/libcxx/include/c++/v1" \
-        -DCMAKE_ASM_COMPILER="$CC" -DCMAKE_ASM_FLAGS="$CFLAGS -x assembler-with-cpp" \
-        -DLLVM_PATH="$LLVM_PATH" -DLIBCXXABI_ENABLE_SHARED=NO \
-        -DLLVM_ENABLE_RUNTIMES="rt;libunwind" \
-        -DLIBCXXABI_ENABLE_STATIC=YES -DLIBCXXABI_ENABLE_EXCEPTIONS=YES \
-        -DLIBCXXABI_USE_COMPILER_RT=YES -DLIBCXXABI_USE_LLVM_UNWINDER=YES \
-        -DLIBCXXABI_LIBUNWIND_PATH="$LLVM_ROOT/libunwind" \
-        -DLIBCXXABI_LIBCXX_INCLUDES="$LLVM_ROOT/libcxx/include" \
-        -DLIBCXXABI_ENABLE_PIC=YES
-    # Build libcxx
-    cmake "$LLVM_ROOT/libcxx" -B "$WORK_PATH/llvm-build/libcxx" \
-        -DCMAKE_INSTALL_PREFIX="$PREFIX" \
-        -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
-        -DCMAKE_C_FLAGS="$CFLAGS -D_LIBCPP_HAS_MUSL_LIBC=1 -D_GNU_SOURCE=1 -isysroot $PREFIX -isystem $PREFIX/include/c++/v1 -isystem $PREFIX/include" \
-        -DCMAKE_CXX_FLAGS="$CXXFLAGS -D_LIBCPP_HAS_MUSL_LIBC=1 -D_GNU_SOURCE=1 -isysroot $PREFIX -isystem $PREFIX/include/c++/v1 -isystem $PREFIX/include" \
-        -DCMAKE_ASM_COMPILER="$CC" -DCMAKE_ASM_FLAGS="$CFLAGS -x assembler-with-cpp" \
-        -DLLVM_PATH="$LLVM_PATH" -DLIBCXX_ENABLE_RTTI=YES \
-        -DLIBCXX_HAS_MUSL_LIBC=YES -DLIBCXX_ENABLE_SHARED=NO \
-        -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LLVM_ROOT/libcxxabi/include" \
-        -DLIBCXX_CXX_ABI_LIBRARY_PATH="$LLVM_ROOT/libcxxabi/build/lib"
-    
-    cmake --build "$WORK_PATH/llvm-build/compiler-rt" --parallel
-    cmake --install "$WORK_PATH/llvm-build/compiler-rt"
-
-    cmake --build "$WORK_PATH/llvm-build/libunwind" --parallel
-    cmake --install "$WORK_PATH/llvm-build/libunwind"
-
-    cmake --build "$WORK_PATH/llvm-build/libcxxabi" --parallel
-    cmake --install "$WORK_PATH/llvm-build/libcxxabi"
-
-    touch "$WORK_PATH/llvm-build/libcxx/include/c++/v1/libcxx.imp"
-    cmake --build "$WORK_PATH/llvm-build/libcxx" --parallel
-    cmake --install "$WORK_PATH/llvm-build/libcxx"
-}
-
-build_tools() {
-
-    # Build create-fself
-    cd create-fself/cmd/create-fself
-    cp go-linux.mod go.mod
-    go build -ldflags "-linkmode external -extldflags -static" -o create-fself
-    mv ./create-fself $PREFIX/bin/create-fself
-    cd ../../../
-
-    # Build create-gp4
-    cd create-gp4/cmd/create-gp4
-    go build -ldflags "-linkmode external -extldflags -static" -o create-gp4
-    mv ./create-gp4 $PREFIX/bin/create-gp4
-    cd ../../../
-
-    # Build readoelf
-    cd readoelf/cmd/readoelf
-    go build -ldflags "-linkmode external -extldflags -static" -o readoelf
-    mv ./readoelf $PREFIX/bin/readoelf
-    cd ../../../
-
-    # # Pull maxton's publishing tools (<3)
-    # # Sadly maxton has passed on, we have forked the repository and will continue to update it in the future. RIP <3
-    # cd $PREFIX/bin
-    # [ -f PkgTool.Core-linux-x64-0.2.231.zip ] || wget https://github.com/maxton/LibOrbisPkg/releases/download/v0.2/PkgTool.Core-linux-x64-0.2.231.zip
-    # [ -f PkgTool.Core ] || unzip PkgTool.Core-linux-x64-0.2.231.zip
-    # chmod +x PkgTool.Core
-}
-
-finish_prefix() {
-    as $WORK_PATH/OpenOrbis-PS4-Toolchain/src/crt/crtlib.S -o $PREFIX/lib/crtlib.o
-    cp -a $WORK_PATH/OpenOrbis-PS4-Toolchain/link.x $PREFIX/
-
-    cp -a ~/OpenOrbis/PS4Toolchain/lib/libkernel* $PREFIX/lib/
-    cp -a ~/OpenOrbis/PS4Toolchain/lib/libSce* $PREFIX/lib/
-
-    cp -a ~/OpenOrbis/PS4Toolchain/lib/libSDL* $PREFIX/lib/
-    cp -r ~/OpenOrbis/PS4Toolchain/include/SDL2 $PREFIX/include/SDL2
-
-    cp $WORK_PATH/llvm-build/compiler-rt/lib/freebsd/libclang_rt.builtins-x86_64.a $PREFIX/lib/
-
-    # Combine libc++, libc++abi and libunwind into a single archive
-    cat << EOF >"mri.txt"
-CREATE $PREFIX/lib/libc++M.a
-ADDLIB $PREFIX/lib/libunwind.a
-ADDLIB $PREFIX/lib/libc++abi.a
-ADDLIB $PREFIX/lib/libc++.a
-SAVE
-END
-EOF
-    $AR -M < mri.txt
-    cp $PREFIX/lib/libc++M.a $PREFIX/lib/libc++.a
-    # Merge compiler-rt into libc
-    cat << EOF >"mri.txt"
-CREATE $PREFIX/lib/libcM.a
-ADDLIB $PREFIX/lib/libc.a
-ADDLIB $PREFIX/lib/libclang_rt.builtins-x86_64.a
-SAVE
-END
-EOF
-    $AR -M < mri.txt
-    cp $PREFIX/lib/libcM.a $PREFIX/lib/libc.a
-    rm mri.txt
-}
-
-prepare_prefix
-build_musl
-build_llvm
-build_tools
-finish_prefix
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,3 @@ artifacts
 *.AppImage*
 /install*
 vulkansdk*.exe
-
-# PS4 toolchain stuff
-ps4-toolchain.cmake
--- a/.patch/boost/0004-openorbis.patch
+++ b/.patch/boost/0004-openorbis.patch
@@ -1,17 +0,0 @@
-diff --git a/libs/asio/include/boost/asio/detail/impl/socket_ops.ipp b/libs/asio/include/boost/asio/detail/impl/socket_ops.ipp
-index 0129511c..10fc9b04 100644
--- a/libs/asio/include/boost/asio/detail/impl/socket_ops.ipp
-+++ b/libs/asio/include/boost/asio/detail/impl/socket_ops.ipp
-@@ -15,6 +15,12 @@
- # pragma once
- #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
- 
-+// hacky fix for ps4
-+#if defined(__OPENORBIS__)
-+#  define FIONBIO 0
-+#  define FIONREAD 1
-+#endif
-+
- #include <boost/asio/detail/config.hpp>
- 
- #include <cctype>
--- a/.patch/enet/0001-openorbis.patch
+++ b/.patch/enet/0001-openorbis.patch
@@ -1,13 +0,0 @@
-diff --git a/unix.c b/unix.c
-index 6669216..86a2faa 100644
--- a/unix.c
-+++ b/unix.c
-@@ -53,7 +53,7 @@
- #include <poll.h>
- #endif
- 
-#if !defined(HAS_SOCKLEN_T) && !defined(__socklen_t_defined)
-+#if !defined(__OPENORBIS__) && !defined(HAS_SOCKLEN_T) && !defined(__socklen_t_defined)
- typedef int socklen_t;
- #endif
- 
--- a/.patch/mbedtls/0001-aesni-fix.patch
+++ b/.patch/mbedtls/0001-aesni-fix.patch
@@ -7,7 +7,7 @@ index 754c984c79..59e27afd3e 100644
  * 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__)) && !defined(_LIBCPP_HAS_MUSL_LIBC)
+#if defined(__GNUC__) || defined(__clang__)
 #define MBEDTLS_AESNI_HAVE_INTRINSICS
 #endif
 /* For 32-bit, we only support intrinsics */
@@ -25,7 +25,7 @@ index 2857068..3e104ab 100644
 #pragma GCC target ("pclmul,sse2,aes")
 #define MBEDTLS_POP_TARGET_PRAGMA
 -#elif defined(__clang__) && (__clang_major__ >= 5)
-+#elif defined(__clang__) && !defined(__OPENORBIS__)
+#elif defined(__clang__)
 #pragma clang attribute push (__attribute__((target("pclmul,sse2,aes"))), apply_to=function)
 #define MBEDTLS_POP_TARGET_PRAGMA
 #endif
--- a/.patch/mbedtls/0003-openorbis.patch
+++ b/.patch/mbedtls/0003-openorbis.patch
@@ -1,13 +0,0 @@
-diff --git a/library/entropy_poll.c b/library/entropy_poll.c
-index 611768c..8950ee4 100644
--- a/library/entropy_poll.c
-+++ b/library/entropy_poll.c
-@@ -118,7 +118,7 @@ static int getrandom_wrapper(void *buf, size_t buflen, unsigned int flags)
-  *
-  * Documentation: https://netbsd.gw.com/cgi-bin/man-cgi?sysctl+7
-  */
-#if (defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(HAVE_GETRANDOM)
-+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(HAVE_GETRANDOM) && !defined(__OPENORBIS__)
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #if defined(KERN_ARND)
--- a/.patch/spirv-tools/0002-openorbis.patch
+++ b/.patch/spirv-tools/0002-openorbis.patch
@@ -1,25 +0,0 @@
-diff --git a/source/opt/loop_dependence.cpp b/source/opt/loop_dependence.cpp
-index e41c044..a51b53b 100644
--- a/source/opt/loop_dependence.cpp
-+++ b/source/opt/loop_dependence.cpp
-@@ -12,6 +12,12 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
- 
-+// PS4: issue?
-+#ifdef __PS4__
-+#pragma clang diagnostic ignored "-Wabsolute-value"
-+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
-+#endif
-+
- #include "source/opt/loop_dependence.h"
- 
- #include <functional>
-@@ -19,6 +25,7 @@
- #include <string>
- #include <utility>
- #include <vector>
-+#include <cstdlib>
- 
- #include "source/opt/instruction.h"
- #include "source/opt/scalar_analysis_nodes.h"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ include(DownloadExternals)
 include(CMakeDependentOption)
 include(CTest)
 include(CPMUtil)
-include(OpenOrbis)

 DetectArchitecture()

--- a/CMakeModules/FindSDL2.cmake
+++ b/CMakeModules/FindSDL2.cmake
@@ -1,391 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#  Copyright 2019 Amine Ben Hassouna <amine.benhassouna@gmail.com>
-#  Copyright 2000-2019 Kitware, Inc. and Contributors
-#  All rights reserved.
-
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-
-#  * Neither the name of Kitware, Inc. nor the names of Contributors
-#    may be used to endorse or promote products derived from this
-#    software without specific prior written permission.
-
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#  HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#[=======================================================================[.rst:
-FindSDL2
--------
-
-Locate SDL2 library
-
-This module defines the following 'IMPORTED' targets:
-
-::
-
-  SDL2::Core
-    The SDL2 library, if found.
-    Libraries should link to SDL2::Core
-
-  SDL2::Main
-    The SDL2main library, if found.
-    Applications should link to SDL2::Main instead of SDL2::Core
-
-
-
-This module will set the following variables in your project:
-
-::
-
-  SDL2_LIBRARIES, the name of the library to link against
-  SDL2_INCLUDE_DIRS, where to find SDL.h
-  SDL2_FOUND, if false, do not try to link to SDL2
-  SDL2MAIN_FOUND, if false, do not try to link to SDL2main
-  SDL2_VERSION_STRING, human-readable string containing the version of SDL2
-
-
-
-This module responds to the following cache variables:
-
-::
-
-  SDL2_PATH
-    Set a custom SDL2 Library path (default: empty)
-
-  SDL2_NO_DEFAULT_PATH
-    Disable search SDL2 Library in default path.
-      If SDL2_PATH (default: ON)
-      Else (default: OFF)
-
-  SDL2_INCLUDE_DIR
-    SDL2 headers path.
-
-  SDL2_LIBRARY
-    SDL2 Library (.dll, .so, .a, etc) path.
-
-  SDL2MAIN_LIBRAY
-    SDL2main Library (.a) path.
-
-  SDL2_BUILDING_LIBRARY
-    This flag is useful only when linking to SDL2_LIBRARIES insead of
-    SDL2::Main. It is required only when building a library that links to
-    SDL2_LIBRARIES, because only applications need main() (No need to also
-    link to SDL2main).
-    If this flag is defined, then no SDL2main will be added to SDL2_LIBRARIES
-    and no SDL2::Main target will be created.
-
-
-Don't forget to include SDLmain.h and SDLmain.m in your project for the
-OS X framework based version. (Other versions link to -lSDL2main which
-this module will try to find on your behalf.) Also for OS X, this
-module will automatically add the -framework Cocoa on your behalf.
-
-
-Additional Note: If you see an empty SDL2_LIBRARY in your project
-configuration, it means CMake did not find your SDL2 library
-(SDL2.dll, libsdl2.so, SDL2.framework, etc). Set SDL2_LIBRARY to point
-to your SDL2 library, and  configure again. Similarly, if you see an
-empty SDL2MAIN_LIBRARY, you should set this value as appropriate. These
-values are used to generate the final SDL2_LIBRARIES variable and the
-SDL2::Core and SDL2::Main targets, but when these values are unset,
-SDL2_LIBRARIES, SDL2::Core and SDL2::Main does not get created.
-
-
-$SDL2DIR is an environment variable that would correspond to the
-./configure --prefix=$SDL2DIR used in building SDL2.  l.e.galup 9-20-02
-
-
-
-Created by Amine Ben Hassouna:
-  Adapt FindSDL.cmake to SDL2 (FindSDL2.cmake).
-  Add cache variables for more flexibility:
-    SDL2_PATH, SDL2_NO_DEFAULT_PATH (for details, see doc above).
-  Mark 'Threads' as a required dependency for non-OSX systems.
-  Modernize the FindSDL2.cmake module by creating specific targets:
-    SDL2::Core and SDL2::Main (for details, see doc above).
-
-
-Original FindSDL.cmake module:
-  Modified by Eric Wing.  Added code to assist with automated building
-  by using environmental variables and providing a more
-  controlled/consistent search behavior.  Added new modifications to
-  recognize OS X frameworks and additional Unix paths (FreeBSD, etc).
-  Also corrected the header search path to follow "proper" SDL
-  guidelines.  Added a search for SDLmain which is needed by some
-  platforms.  Added a search for threads which is needed by some
-  platforms.  Added needed compile switches for MinGW.
-
-On OSX, this will prefer the Framework version (if found) over others.
-People will have to manually change the cache value of SDL2_LIBRARY to
-override this selection or set the SDL2_PATH variable or the CMake
-environment CMAKE_INCLUDE_PATH to modify the search paths.
-
-Note that the header path has changed from SDL/SDL.h to just SDL.h
-This needed to change because "proper" SDL convention is #include
-"SDL.h", not <SDL/SDL.h>.  This is done for portability reasons
-because not all systems place things in SDL/ (see FreeBSD).
-#]=======================================================================]
-
-# Define options for searching SDL2 Library in a custom path
-
-set(SDL2_PATH "" CACHE STRING "Custom SDL2 Library path")
-
-set(_SDL2_NO_DEFAULT_PATH OFF)
-if(SDL2_PATH)
-  set(_SDL2_NO_DEFAULT_PATH ON)
-endif()
-
-set(SDL2_NO_DEFAULT_PATH ${_SDL2_NO_DEFAULT_PATH}
-    CACHE BOOL "Disable search SDL2 Library in default path")
-unset(_SDL2_NO_DEFAULT_PATH)
-
-set(SDL2_NO_DEFAULT_PATH_CMD)
-if(SDL2_NO_DEFAULT_PATH)
-  set(SDL2_NO_DEFAULT_PATH_CMD NO_DEFAULT_PATH)
-endif()
-
-# Search for the SDL2 include directory
-find_path(SDL2_INCLUDE_DIR SDL.h
-  HINTS
-    ENV SDL2DIR
-    ${SDL2_NO_DEFAULT_PATH_CMD}
-  PATH_SUFFIXES SDL2
-                # path suffixes to search inside ENV{SDL2DIR}
-                include/SDL2 include
-  PATHS ${SDL2_PATH}
-  DOC "Where the SDL2 headers can be found"
-)
-
-set(SDL2_INCLUDE_DIRS "${SDL2_INCLUDE_DIR}")
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(VC_LIB_PATH_SUFFIX lib/x64)
-else()
-  set(VC_LIB_PATH_SUFFIX lib/x86)
-endif()
-
-# SDL-2.0 is the name used by FreeBSD ports...
-# don't confuse it for the version number.
-find_library(SDL2_LIBRARY
-  NAMES SDL2 SDL-2.0
-  HINTS
-    ENV SDL2DIR
-    ${SDL2_NO_DEFAULT_PATH_CMD}
-  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
-  PATHS ${SDL2_PATH}
-  DOC "Where the SDL2 Library can be found"
-)
-
-set(SDL2_LIBRARIES "${SDL2_LIBRARY}")
-
-if(NOT SDL2_BUILDING_LIBRARY)
-  if(NOT SDL2_INCLUDE_DIR MATCHES ".framework")
-    # Non-OS X framework versions expect you to also dynamically link to
-    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-    # seem to provide SDL2main for compatibility even though they don't
-    # necessarily need it.
-
-    if(SDL2_PATH)
-      set(SDL2MAIN_LIBRARY_PATHS "${SDL2_PATH}")
-    endif()
-
-    if(NOT SDL2_NO_DEFAULT_PATH)
-      set(SDL2MAIN_LIBRARY_PATHS
-            /sw
-            /opt/local
-            /opt/csw
-            /opt
-            "${SDL2MAIN_LIBRARY_PATHS}"
-      )
-    endif()
-
-    find_library(SDL2MAIN_LIBRARY
-      NAMES SDL2main
-      HINTS
-        ENV SDL2DIR
-        ${SDL2_NO_DEFAULT_PATH_CMD}
-      PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
-      PATHS ${SDL2MAIN_LIBRARY_PATHS}
-      DOC "Where the SDL2main library can be found"
-    )
-    unset(SDL2MAIN_LIBRARY_PATHS)
-  endif()
-endif()
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-if(NOT APPLE)
-  find_package(Threads QUIET)
-  if(NOT Threads_FOUND)
-    set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).")
-    if(SDL2_FIND_REQUIRED)
-      message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND})
-    else()
-        if(NOT SDL2_FIND_QUIETLY)
-          message(STATUS ${SDL2_THREADS_NOT_FOUND})
-        endif()
-      return()
-    endif()
-    unset(SDL2_THREADS_NOT_FOUND)
-  endif()
-endif()
-
-# MinGW needs an additional link flag, -mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows
-if(MINGW)
-  set(MINGW32_LIBRARY mingw32 "-mwindows" CACHE STRING "link flags for MinGW")
-endif()
-
-if(SDL2_LIBRARY)
-  # For SDL2main
-  if(SDL2MAIN_LIBRARY AND NOT SDL2_BUILDING_LIBRARY)
-    list(FIND SDL2_LIBRARIES "${SDL2MAIN_LIBRARY}" _SDL2_MAIN_INDEX)
-    if(_SDL2_MAIN_INDEX EQUAL -1)
-      set(SDL2_LIBRARIES "${SDL2MAIN_LIBRARY}" ${SDL2_LIBRARIES})
-    endif()
-    unset(_SDL2_MAIN_INDEX)
-  endif()
-
-  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even
-  # though it actually is there if I modify a pre-used variable.
-  # I think it has something to do with the CACHE STRING.
-  # So I use a temporary variable until the end so I can set the
-  # "real" variable in one-shot.
-  if(APPLE)
-    set(SDL2_LIBRARIES ${SDL2_LIBRARIES} -framework Cocoa)
-  endif()
-
-  # For threads, as mentioned Apple doesn't need this.
-  # In fact, there seems to be a problem if I used the Threads package
-  # and try using this line, so I'm just skipping it entirely for OS X.
-  if(NOT APPLE)
-    set(SDL2_LIBRARIES ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  endif()
-
-  # For MinGW library
-  if(MINGW)
-    set(SDL2_LIBRARIES ${MINGW32_LIBRARY} ${SDL2_LIBRARIES})
-  endif()
-
-endif()
-
-# Read SDL2 version
-if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
-  set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH})
-  unset(SDL2_VERSION_MAJOR_LINE)
-  unset(SDL2_VERSION_MINOR_LINE)
-  unset(SDL2_VERSION_PATCH_LINE)
-  unset(SDL2_VERSION_MAJOR)
-  unset(SDL2_VERSION_MINOR)
-  unset(SDL2_VERSION_PATCH)
-endif()
-
-include(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
-                                  VERSION_VAR SDL2_VERSION_STRING)
-
-if(SDL2MAIN_LIBRARY)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
-                                    REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
-                                    VERSION_VAR SDL2_VERSION_STRING)
-endif()
-
-
-mark_as_advanced(SDL2_PATH
-                 SDL2_NO_DEFAULT_PATH
-                 SDL2_LIBRARY
-                 SDL2MAIN_LIBRARY
-                 SDL2_INCLUDE_DIR
-                 SDL2_BUILDING_LIBRARY)
-
-
-# SDL2:: targets (SDL2::Core and SDL2::Main)
-if(SDL2_FOUND)
-
-  # SDL2::Core target
-  if(SDL2_LIBRARY AND NOT TARGET SDL2::Core)
-    add_library(SDL2::Core UNKNOWN IMPORTED)
-    set_target_properties(SDL2::Core PROPERTIES
-                          IMPORTED_LOCATION "${SDL2_LIBRARY}"
-                          INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}")
-
-    if(APPLE)
-      # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-      # For more details, please see above.
-      set_property(TARGET SDL2::Core APPEND PROPERTY
-                   INTERFACE_LINK_OPTIONS -framework Cocoa)
-    else()
-      # For threads, as mentioned Apple doesn't need this.
-      # For more details, please see above.
-      set_property(TARGET SDL2::Core APPEND PROPERTY
-                   INTERFACE_LINK_LIBRARIES Threads::Threads)
-    endif()
-  endif()
-
-  # SDL2::Main target
-  # Applications should link to SDL2::Main instead of SDL2::Core
-  # For more details, please see above.
-  if(NOT SDL2_BUILDING_LIBRARY AND NOT TARGET SDL2::Main)
-
-    if(SDL2_INCLUDE_DIR MATCHES ".framework" OR NOT SDL2MAIN_LIBRARY)
-      add_library(SDL2::Main INTERFACE IMPORTED)
-      set_property(TARGET SDL2::Main PROPERTY
-                   INTERFACE_LINK_LIBRARIES SDL2::Core)
-    elseif(SDL2MAIN_LIBRARY)
-      # MinGW requires that the mingw32 library is specified before the
-      # libSDL2main.a static library when linking.
-      # The SDL2::MainInternal target is used internally to make sure that
-      # CMake respects this condition.
-      add_library(SDL2::MainInternal UNKNOWN IMPORTED)
-      set_property(TARGET SDL2::MainInternal PROPERTY
-                   IMPORTED_LOCATION "${SDL2MAIN_LIBRARY}")
-      set_property(TARGET SDL2::MainInternal PROPERTY
-                   INTERFACE_LINK_LIBRARIES SDL2::Core)
-
-      add_library(SDL2::Main INTERFACE IMPORTED)
-
-      if(MINGW)
-        # MinGW needs an additional link flag '-mwindows' and link to mingw32
-        set_property(TARGET SDL2::Main PROPERTY
-                     INTERFACE_LINK_LIBRARIES "mingw32" "-mwindows")
-      endif()
-
-      set_property(TARGET SDL2::Main APPEND PROPERTY
-                   INTERFACE_LINK_LIBRARIES SDL2::MainInternal)
-    endif()
-
-  endif()
-endif()
--- a/CMakeModules/GenerateSCMRev.cmake
+++ b/CMakeModules/GenerateSCMRev.cmake
@@ -18,13 +18,10 @@ if (DEFINED GIT_RELEASE)
  set(BUILD_VERSION "${GIT_TAG}")
  set(GIT_REFSPEC "${GIT_RELEASE}")
  set(IS_DEV_BUILD false)
-elseif(DEFINED GIT_COMMIT)
+else()
  string(SUBSTRING ${GIT_COMMIT} 0 10 BUILD_VERSION)
  set(BUILD_VERSION "${BUILD_VERSION}-${GIT_REFSPEC}")
  set(IS_DEV_BUILD true)
-else()
-  set(BUILD_VERSION "NoGitInfo")
-  set(IS_DEV_BUILD true)
 endif()

 set(GIT_DESC ${BUILD_VERSION})
--- a/CMakeModules/OpenOrbis.cmake
+++ b/CMakeModules/OpenOrbis.cmake
@@ -1,33 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-function(create_ps4_pkg project target content_id)
-    set(sce_sys_dir sce_sys)
-    set(sce_sys_param ${sce_sys_dir}/param.sfo)
-    add_custom_command(
-        OUTPUT "${target}.pkg"
-        COMMAND ${CMAKE_SYSROOT}/bin/create-fself -in=bin/${target} -out=${target}.oelf --eboot eboot.bin
-        COMMAND mkdir -p ${sce_sys_dir}
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_new ${sce_sys_param}
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} APP_TYPE --type Integer --maxsize 4 --value 1
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} APP_VER --type Utf8 --maxsize 8 --value 1.03
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} ATTRIBUTE --type Integer --maxsize 4 --value 0
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} CATEGORY --type Utf8 --maxsize 4 --value gd
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} CONTENT_ID --type Utf8 --maxsize 48 --value ${content_id}
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} DOWNLOAD_DATA_SIZE --type Integer --maxsize 4 --value 0
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} SYSTEM_VER --type Integer --maxsize 4 --value 0
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} TITLE --type Utf8 --maxsize 128 --value ${target}
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} TITLE_ID --type Utf8 --maxsize 12 --value BREW00090
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core sfo_setentry ${sce_sys_param} VERSION --type Utf8 --maxsize 8 --value 1.03
-        COMMAND ${CMAKE_SYSROOT}/bin/create-gp4 -out ${target}.gp4 --content-id=${content_id} --files "eboot.bin ${sce_sys_param} sce_module/libc.prx sce_module/libSceFios2.prx"
-        COMMAND ${CMAKE_SYSROOT}/bin/PkgTool.Core pkg_build ${target}.gp4 .
-        VERBATIM
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        DEPENDS ${project}
-    )
-    add_custom_target(${project}_pkg ALL DEPENDS "${target}.pkg")
-endfunction()
-
-if (NOT DEFINED ENV{OO_PS4_TOOLCHAIN})
-    set(ENV{OO_PS4_TOOLCHAIN} ${CMAKE_SYSROOT})
-endif ()
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -19,8 +19,7 @@
        "patches": [
            "0001-clang-cl.patch",
            "0002-use-marmasm.patch",
-            "0003-armasm-options.patch",
-            "0004-openorbis.patch"
+            "0003-armasm-options.patch"
        ]
    },
    "fmt": {
--- a/docs/Caveats.md
+++ b/docs/Caveats.md
@@ -207,10 +207,3 @@ Install [Qt6 compatibility libraries](github.com/ANightly/qt6windows7) specifica
 The package install may randomly hang at times, in which case it has to be restarted. ALWAYS do a `sudo pkg update` or the chances of it hanging will be close to 90%. If "multiple" installs fail at once, try installing 1 by 1 the packages.

 When CMake invokes certain file syscalls - it may sometimes cause crashes or corruptions on the (kernel?) address space - so reboot the system if there is a "hang" in CMake.
-
-## PlayStation 4 (OpenOrbis cross compile)
-
-```sh
-export OO_PS4_TOOLCHAIN="$HOME/OpenOrbis/PS4Toolchain"
-export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-```
--- a/docs/user/Basics.md
+++ b/docs/user/Basics.md
@@ -26,7 +26,6 @@ Eden will store configuration files in the following directories:
 - **Android**: Data is stored internally.
 - **Linux, macOS, FreeBSD, Solaris, OpenBSD**: `$XDG_DATA_HOME`, `$XDG_CACHE_HOME`, `$XDG_CONFIG_HOME`.
 - **HaikuOS**: `/boot/home/config/settings/eden`
- **PlayStation 4**: `/data/eden`

 If a `user` directory is present in the current working directory, that will override all global configuration directories and the emulator will use that instead.

--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -147,11 +147,7 @@ if (ENABLE_SDL2)
        AddJsonPackage(sdl2)
    endif()

-    if (PLATFORM_PS4)
-        set(SDL2_LIBRARY ${CMAKE_SYSROOT}/lib/libSDL2.a)
-        set(SDL2_INCLUDE_DIR ${CMAKE_SYSROOT}/include/SDL2)
-    endif()
-    find_package(SDL2 REQUIRED)
+    find_package(SDL2 2.26.4 REQUIRED)
 endif()

 set(BUILD_SHARED_LIBS OFF)
--- a/externals/cmake-modules/DetectPlatform.cmake
+++ b/externals/cmake-modules/DetectPlatform.cmake
@@ -17,8 +17,6 @@

 if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
    set(PLATFORM_SUN ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenOrbis")
-    set(PLATFORM_PS4 ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
    set(PLATFORM_FREEBSD ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -104,8 +104,7 @@
        "skip_updates": true,
        "patches": [
            "0001-aesni-fix.patch",
-            "0002-arm64-aes-fix.patch",
-            "0003-openorbis.patch"
+            "0002-arm64-aes-fix.patch"
        ]
    },
    "enet": {
@@ -114,10 +113,7 @@
        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
        "version": "1.3",
        "git_version": "1.3.18",
-        "find_args": "MODULE",
-        "patches": [
-            "0001-openorbis.patch"
-        ]
+        "find_args": "MODULE"
    },
    "vulkan-utility-headers": {
        "package": "VulkanUtilityLibraries",
@@ -138,8 +134,7 @@
            "SPIRV_SKIP_EXECUTABLES ON"
        ],
        "patches": [
-            "0001-netbsd-fix.patch",
-            "0002-openorbis.patch"
+            "0001-netbsd-fix.patch"
        ]
    },
    "spirv-headers": {
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -13,106 +13,63 @@ set(FFmpeg_HWACCEL_FLAGS)
 set(FFmpeg_HWACCEL_INCLUDE_DIRS)
 set(FFmpeg_HWACCEL_LDFLAGS)

-if (NOT YUZU_USE_BUNDLED_FFMPEG)
-    set(FFmpeg_CROSS_COMPILE_FLAGS "")
-    if (ANDROID)
-        # TODO: Maybe use CMAKE_SYSROOT? and probably provide a toolchain file for android
-        # I mean isn't that the "proper" way anyways?
-        string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME)
-        set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-        set(SYSROOT "${TOOLCHAIN}/sysroot")
-        set(FFmpeg_CPU "armv8-a")
-        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-            --enable-cross-compile
-            --arch=arm64
-            #--cpu=${FFmpeg_CPU}
-            --cross-prefix="${TOOLCHAIN}/bin/aarch64-linux-android-"
-            --sysroot="${SYSROOT}"
-            --target-os=android
-            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
-            --extra-ldflags="-nostdlib"
-        )
-        set(FFmpeg_IS_CROSS_COMPILING TRUE)
-    # User attempts to do a FFmpeg cross compilation because...
-    # Here we just quickly test against host/system processors not matching
-    # TODO: Test for versions not matching as well?
-    elseif (NOT (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES CMAKE_SYSTEM_PROCESSOR
-    AND CMAKE_HOST_SYSTEM_NAME MATCHES CMAKE_SYSTEM_NAME))
-        string(TOLOWER "${CMAKE_SYSTEM_NAME}" FFmpeg_SYSTEM_NAME)
-        if (FFmpeg_SYSTEM_NAME STREQUAL "openorbis")
-            set(FFmpeg_SYSTEM_NAME "freebsd") # Emulates FBSD :)
-        endif()
-        # TODO: Can we really do better? Auto-detection? Something clever?
-        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-            --enable-cross-compile
-            --arch="${CMAKE_SYSTEM_PROCESSOR}"
-            --target-os="${FFmpeg_SYSTEM_NAME}"
-            --sysroot="${CMAKE_SYSROOT}"
-        )
-        if (DEFINED FFmpeg_CROSS_PREFIX)
-            list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --cross-prefix="${FFmpeg_CROSS_PREFIX}")
-        else()
-            message(WARNING "Please set FFmpeg_CROSS_PREFIX to your cross toolchain prefix, for example: \${CMAKE_STAGING_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}-")
-        endif()
-        set(FFmpeg_IS_CROSS_COMPILING TRUE)
-    endif()
-endif()
-
-if (PLATFORM_PS4)
-    list(APPEND FFmpeg_HWACCEL_FLAGS
-        --disable-vaapi
-    )
-elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
+if (UNIX AND NOT ANDROID)
    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(LIBVA libva)
-    pkg_check_modules(CUDA cuda)
-    pkg_check_modules(FFNVCODEC ffnvcodec)
-    pkg_check_modules(VDPAU vdpau)
+    if (NOT ANDROID)
+        pkg_check_modules(LIBVA libva)
+        pkg_check_modules(CUDA cuda)
+        pkg_check_modules(FFNVCODEC ffnvcodec)
+        pkg_check_modules(VDPAU vdpau)
+    endif()

-    find_package(X11)
-    if(X11_FOUND)
-        if (NOT APPLE)
-            # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
-            if(PLATFORM_SUN)
+    if (NOT APPLE)
+        # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
+        if(PLATFORM_SUN)
+            find_library(LIBDRM_LIB libdrm PATHS /usr/lib/64 /usr/lib/amd64 /usr/lib)
+            if(LIBDRM_LIB)
                list(APPEND FFmpeg_HWACCEL_LIBRARIES
                    X11
-                    "${CMAKE_SYSROOT}/usr/lib/xorg/amd64/libdrm.so")
+                    "${LIBDRM_LIB}")
+                message(STATUS "Found libdrm at: ${LIBDRM_LIB}")
            else()
-                pkg_check_modules(LIBDRM libdrm REQUIRED)
-                list(APPEND FFmpeg_HWACCEL_LIBRARIES
-                    ${LIBDRM_LIBRARIES})
-                list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
-                    ${LIBDRM_INCLUDE_DIRS})
+                message(WARNING "libdrm not found, disabling libdrm support")
+                list(APPEND FFmpeg_HWACCEL_FLAGS
+                    --disable-libdrm)
            endif()
+        else()
+            pkg_check_modules(LIBDRM libdrm REQUIRED)
+            list(APPEND FFmpeg_HWACCEL_LIBRARIES
+                ${LIBDRM_LIBRARIES})
+            list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+                ${LIBDRM_INCLUDE_DIRS})
            list(APPEND FFmpeg_HWACCEL_FLAGS
                --enable-libdrm)
        endif()
-        if(LIBVA_FOUND)
-            pkg_check_modules(LIBVA-DRM libva-drm REQUIRED)
-            pkg_check_modules(LIBVA-X11 libva-x11 REQUIRED)
-            list(APPEND FFmpeg_HWACCEL_LIBRARIES
-                ${X11_LIBRARIES}
-                ${LIBVA-DRM_LIBRARIES}
-                ${LIBVA-X11_LIBRARIES}
-                ${LIBVA_LIBRARIES})
-            list(APPEND FFmpeg_HWACCEL_FLAGS
-                --enable-hwaccel=h264_vaapi
-                --enable-hwaccel=vp8_vaapi
-                --enable-hwaccel=vp9_vaapi)
-            list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
-                ${X11_INCLUDE_DIRS}
-                ${LIBVA-DRM_INCLUDE_DIRS}
-                ${LIBVA-X11_INCLUDE_DIRS}
-                ${LIBVA_INCLUDE_DIRS}
-            )
-            message(STATUS "ffmpeg: va-api libraries version ${LIBVA_VERSION} found")
-        else()
-            list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-            message(WARNING "ffmpeg: libva-dev not found, disabling Video Acceleration API (VA-API)...")
-        endif()
+    endif()
+
+    if(LIBVA_FOUND)
+        find_package(X11 REQUIRED)
+        pkg_check_modules(LIBVA-DRM libva-drm REQUIRED)
+        pkg_check_modules(LIBVA-X11 libva-x11 REQUIRED)
+        list(APPEND FFmpeg_HWACCEL_LIBRARIES
+            ${X11_LIBRARIES}
+            ${LIBVA-DRM_LIBRARIES}
+            ${LIBVA-X11_LIBRARIES}
+            ${LIBVA_LIBRARIES})
+        list(APPEND FFmpeg_HWACCEL_FLAGS
+            --enable-hwaccel=h264_vaapi
+            --enable-hwaccel=vp8_vaapi
+            --enable-hwaccel=vp9_vaapi)
+        list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+            ${X11_INCLUDE_DIRS}
+            ${LIBVA-DRM_INCLUDE_DIRS}
+            ${LIBVA-X11_INCLUDE_DIRS}
+            ${LIBVA_INCLUDE_DIRS}
+        )
+        message(STATUS "ffmpeg: va-api libraries version ${LIBVA_VERSION} found")
    else()
        list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-        message(WARNING "ffmpeg: X11 libraries not found, disabling VA-API...")
+        message(WARNING "ffmpeg: libva-dev not found, disabling Video Acceleration API (VA-API)...")
    endif()

    if (FFNVCODEC_FOUND)
@@ -156,23 +113,6 @@ elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
    endif()
 endif()

-if (PLATFORM_PS4)
-    list(APPEND FFmpeg_CROSS_COMPILE_LIBS
-        -lc
-        -lkernel
-        -lSceUserService
-        -lSceSysmodule
-        -lSceNet
-        -lSceLibcInternal
-    )
-    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-        --disable-pthreads
-        --extra-cflags=${CMAKE_SYSROOT}/usr/include
-        --extra-cxxflags=${CMAKE_SYSROOT}/usr/include
-        --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
-    )
-endif()
-
 if (YUZU_USE_BUNDLED_FFMPEG)
    AddJsonPackage(ffmpeg-ci)

@@ -243,6 +183,24 @@ else()

    find_program(BASH_PROGRAM bash REQUIRED)

+    set(FFmpeg_CROSS_COMPILE_FLAGS "")
+    if (ANDROID)
+        string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME)
+        set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
+        set(SYSROOT "${TOOLCHAIN}/sysroot")
+        set(FFmpeg_CPU "armv8-a")
+        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
+            --arch=arm64
+            #--cpu=${FFmpeg_CPU}
+            --enable-cross-compile
+            --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android-
+            --sysroot=${SYSROOT}
+            --target-os=android
+            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
+            --extra-ldflags="-nostdlib"
+        )
+    endif()
+
    # `configure` parameters builds only exactly what yuzu needs from FFmpeg
    # `--disable-vdpau` is needed to avoid linking issues
    set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER}  ${CMAKE_C_COMPILER})
@@ -265,12 +223,8 @@ else()
                --enable-decoder=vp9
                --enable-filter=yadif,scale
                --enable-pic
-                --cc=${FFmpeg_CC}
-                --cxx=${FFmpeg_CXX}
-                --ld=${CMAKE_LINKER}
-                --extra-cflags=${CMAKE_C_FLAGS}
-                --extra-cxxflags=${CMAKE_CXX_FLAGS}
-                --extra-ldflags=${CMAKE_C_LINK_FLAGS}
+                --cc="${FFmpeg_CC}"
+                --cxx="${FFmpeg_CXX}"
                ${FFmpeg_HWACCEL_FLAGS}
                ${FFmpeg_CROSS_COMPILE_FLAGS}
        WORKING_DIRECTORY
@@ -302,7 +256,7 @@ else()
        OUTPUT
            ${FFmpeg_BUILD_LIBRARIES}
        COMMAND
-            gmake ${FFmpeg_MAKE_ARGS}
+            make ${FFmpeg_MAKE_ARGS}
        WORKING_DIRECTORY
            ${FFmpeg_BUILD_DIR}
    )
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -39,6 +39,7 @@ android {

    buildFeatures {
        viewBinding = true
+        buildConfig = true
    }

    compileOptions {
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
@@ -31,7 +31,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    RENDERER_VERTEX_INPUT_DYNAMIC_STATE("vertex_input_dynamic_state"),
    RENDERER_PROVOKING_VERTEX("provoking_vertex"),
    RENDERER_DESCRIPTOR_INDEXING("descriptor_indexing"),
-    RENDERER_SAMPLE_SHADING("sample_shading"),
    PICTURE_IN_PICTURE("picture_in_picture"),
    USE_CUSTOM_RTC("custom_rtc_enabled"),
    BLACK_BACKGROUNDS("black_backgrounds"),
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -160,13 +160,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.descriptor_indexing_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_SAMPLE_SHADING,
-                    titleId = R.string.sample_shading,
-                    descriptionId = R.string.sample_shading_description
-                )
-            )
            put(
                SliderSetting(
                    IntSetting.RENDERER_SAMPLE_SHADING_FRACTION,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -453,12 +453,11 @@ class SettingsFragmentPresenter(
    private fun addEdenVeilSettings(sl: ArrayList<SettingsItem>) {
        sl.apply {
            add(HeaderSetting(R.string.veil_extensions))
+            add(IntSetting.RENDERER_SAMPLE_SHADING_FRACTION.key)
            add(ByteSetting.RENDERER_DYNA_STATE.key)
            add(BooleanSetting.RENDERER_VERTEX_INPUT_DYNAMIC_STATE.key)
            add(BooleanSetting.RENDERER_PROVOKING_VERTEX.key)
            add(BooleanSetting.RENDERER_DESCRIPTOR_INDEXING.key)
-            add(BooleanSetting.RENDERER_SAMPLE_SHADING.key)
-            add(IntSetting.RENDERER_SAMPLE_SHADING_FRACTION.key)

            add(HeaderSetting(R.string.veil_renderer))
            add(IntSetting.DMA_ACCURACY.key)
--- a/src/android/app/src/main/res/values-ar/strings.xml
+++ b/src/android/app/src/main/res/values-ar/strings.xml
@@ -96,8 +96,6 @@
    <string name="provoking_vertex_description">يحسن الإضاءة ومعالجة الرؤوس في بعض الألعاب. مدعوم فقط على وحدات معالجة الرسومات Vulkan 1.0+.</string>
    <string name="descriptor_indexing">فهرسة الوصف</string>
    <string name="descriptor_indexing_description">يحسن معالجة النسيج والمخزن المؤقت، بالإضافة إلى طبقة الترجمة Maxwell. مدعوم من بعض وحدات معالجة الرسومات Vulkan 1.1 وجميع وحدات معالجة الرسومات Vulkan 1.2+.</string>
-    <string name="sample_shading">تظليل العينة</string>
-    <string name="sample_shading_description">يسمح لتظلل الأجزاء بتنفيذ كل عينة في جزء متعدد العينات بدلاً من مرة واحدة لكل جزء. يحسن جودة الرسومات على حساب بعض الأداء. لا تدعم هذه الإضافة سوى أجهزة Vulkan 1.1+ فقط.</string>
    <string name="sample_shading_fraction">نسبة التظليل النموذجية</string>
    <string name="sample_shading_fraction_description">كثافة تمرير تظليل العينة. تؤدي القيم الأعلى إلى تحسين الجودة بشكل أكبر، ولكنها تقلل أيضًا من الأداء إلى حد كبير.</string>

--- a/src/android/app/src/main/res/values-ckb/strings.xml
+++ b/src/android/app/src/main/res/values-ckb/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">يحسن الإضاءة ومعالجة الرؤوس في بعض الألعاب. مدعوم فقط على وحدات معالجة الرسومات التي تدعم فولكان 1.0+.</string>
    <string name="descriptor_indexing">فهرسة الواصفات</string>
    <string name="descriptor_indexing_description">يحسن معالجة القوام والمخازن المؤقتة، بالإضافة إلى طبقة ترجمة ماكسويل. مدعوم من قبل بعض وحدات معالجة الرسومات التي تدعم فولكان 1.1 وجميع وحدات معالجة الرسومات التي تدعم فولكان 1.2+.</string>
-    <string name="sample_shading">سێبەندی نمونە</string>
-    <string name="sample_shading_description">ڕێگە بە شێدەری پارچە دەدات کە بۆ هەر نمونەیەک لە پارچەی فرە نمونەیدا جێبەجێ بکات لە جیاتی جێبەجێکردنی بۆ هەر پارچەیەک. جۆرایی گرافیک باشتر دەکات بە بەهای هەندێک لە کارایی. تەنها ئامێرەکانی Vulkan 1.1+ پشتگیری ئەم درێژکراوە دەکەن.</string>
    <string name="sample_shading_fraction">پێکهاتەی سێبەرکردنی نموونە</string>
    <string name="sample_shading_fraction_description">چڕی تێپەڕاندنی سێبەرکردنی نموونە. بەهای زیاتر کوالێتی باشتر دەکات بەڵام کارایی زیاتر کەم دەکاتەوە.</string>

--- a/src/android/app/src/main/res/values-cs/strings.xml
+++ b/src/android/app/src/main/res/values-cs/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">Zlepšuje osvětlení a zpracování vertexů v některých hrách. Podporováno pouze na GPU s Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Indexování deskriptorů</string>
    <string name="descriptor_indexing_description">Zlepšuje zpracování textur a bufferů, stejně jako Maxwell překladovou vrstvu. Podporováno některými GPU s Vulkan 1.1 a všemi GPU s Vulkan 1.2+.</string>
-    <string name="sample_shading">Vzorkovací stínování</string>
-    <string name="sample_shading_description">Umožňuje fragment shaderu provádět výpočty pro každý vzorek ve fragmentu s více vzorky namísto jednou pro fragment. Zlepšuje kvalitu grafiky na úkor výkonu. Tuto funkci podporují pouze zařízení s Vulkan 1.1+.</string>
    <string name="sample_shading_fraction">Podíl stínování vzorku</string>
    <string name="sample_shading_fraction_description">Intenzita průchodu stínování vzorku. Vyšší hodnoty zlepšují kvalitu, ale také výrazněji snižují výkon.</string>

--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@@ -78,8 +78,6 @@
    <string name="provoking_vertex_description">Verbessert die Beleuchtung und die Vertex-Verarbeitung in einigen Spielen. Wird nur von GPUs mit Vulkan 1.0+ unterstützt.</string>
    <string name="descriptor_indexing">Deskriptor-Indizierung</string>
    <string name="descriptor_indexing_description">Verbessert die Textur- und Puffer-Verarbeitung sowie die Maxwell-Übersetzungsschicht. Wird von einigen Vulkan 1.1-GPUs und allen Vulkan 1.2+-GPUs unterstützt.</string>
-    <string name="sample_shading">Sample Shading</string>
-    <string name="sample_shading_description">Ermöglicht dem Fragment-Shader, pro Sample in einem mehrfach gesampleten Fragment ausgeführt zu werden, anstatt einmal pro Fragment. Verbessert die Grafikqualität auf Kosten der Leistung. Nur Vulkan 1.1+-Geräte unterstützen diese Erweiterung.</string>
    <string name="sample_shading_fraction">Sample-Shading-Anteil</string>
    <string name="sample_shading_fraction_description">Die Intensität des Sample-Shading-Durchgangs. Höhere Werte verbessern die Qualität stärker, beeinträchtigen aber auch die Leistung stärker.</string>

--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@@ -91,8 +91,6 @@
    <string name="provoking_vertex_description">Mejora la iluminación y el manejo de vértices en ciertos juegos. Solo es compatible con las GPU Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Indexación del descriptor</string>
    <string name="descriptor_indexing_description">Mejora la textura y el manejo del búfer, así como la capa de traducción Maxwell. Compatible con algunas GPU Vulkan 1.1 y todas las GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Sombreado de muestra</string>
-    <string name="sample_shading_description">Permite que el sombreador de fragmentos se ejecute por muestra en un fragmento de múltiples muestras en lugar de una vez por fragmento. Mejora la calidad gráfica a costa de algo de rendimiento. Solo los dispositivos Vulkan 1.1+ admiten esta extensión.</string>
    <string name="sample_shading_fraction">Fracción de sombreado de muestra</string>
    <string name="sample_shading_fraction_description">La intensidad del paso de sombreado de la muestra. Los valores más altos mejoran más la calidad, pero también reducen el rendimiento en mayor medida.</string>

--- a/src/android/app/src/main/res/values-fa/strings.xml
+++ b/src/android/app/src/main/res/values-fa/strings.xml
@@ -104,8 +104,6 @@
    <string name="fast_cpu_time_description">از Boost (1700MHz) برای کار با بالاترین سرعت کلاک بومی سوئیچ یا Fast (2000MHz) برای کار با دو برابر سرعت استفاده کنید.</string>
    <string name="memory_layout">چیدمان حافظه</string>
    <string name="memory_layout_description">(آزمایشی) چیدمان حافظه شبیه‌سازی شده را تغییر می‌دهد. این تنظیم عملکرد را افزایش نمی‌دهد، اما ممکن است به بازی‌هایی که از رزولوشن بالا با استفاده از مادها استفاده می‌کنند کمک کند. در تلفن‌های با 8 گیگابایت رم یا کمتر استفاده نشود.</string>
-    <string name="sample_shading">سایه‌زنی نمونه</string>
-    <string name="sample_shading_description">اجازه می‌دهد شیدر قطعه در هر نمونه از یک قطعه چندنمونه‌ای اجرا شود به جای یک بار برای هر قطعه. کیفیت گرافیک را به بهای کاهش عملکرد بهبود می‌بخشد. فقط دستگاه‌های Vulkan 1.1+ از این افزونه پشتیبانی می‌کنند.</string>
    <string name="sample_shading_fraction">کسر سایه‌زنی نمونه</string>
    <string name="sample_shading_fraction_description">شدت مرحله سایه‌زنی نمونه. مقادیر بالاتر کیفیت را بیشتر بهبود می‌بخشد اما عملکرد را نیز به میزان بیشتری کاهش می‌دهد.</string>
    <string name="custom_cpu_ticks">تیک‌های CPU سفارشی</string>
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@@ -93,8 +93,6 @@
    <string name="provoking_vertex_description">Améliore l`éclairage et la gestion des vertex dans certains jeux. Pris en charge uniquement par les GPU Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Indexation des descripteurs</string>
    <string name="descriptor_indexing_description">Améliore la gestion des textures et des tampons, ainsi que la couche de traduction Maxwell. Pris en charge par certains GPU Vulkan 1.1 et tous les GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Échantillonnage de shading</string>
-    <string name="sample_shading_description">Permet au fragment shader de s\'exécuter par échantillon dans un fragment multi-échantillonné au lieu d\'une fois par fragment. Améliore la qualité graphique au détriment des performances. Seuls les appareils Vulkan 1.1+ prennent en charge cette extension.</string>
    <string name="sample_shading_fraction">Fraction d\'ombrage d\'échantillon</string>
    <string name="sample_shading_fraction_description">L\'intensité de la passe d\'ombrage d\'échantillon. Des valeurs plus élevées améliorent davantage la qualité mais réduisent aussi plus fortement les performances.</string>

--- a/src/android/app/src/main/res/values-he/strings.xml
+++ b/src/android/app/src/main/res/values-he/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">משפר תאורה וטיפול בקודקודים במשחקים מסוימים. נתמך רק בכרטיסי מסך עם Vulkan 1.0+.</string>
    <string name="descriptor_indexing">אינדוקס תיאורים</string>
    <string name="descriptor_indexing_description">משפר טיפול במרקמים ומאגרים, כמו גם בשכבת התרגום של Maxwell. נתמך בחלק מכרטיסי ה-Vulkan 1.1 ובכל כרטיסי ה-Vulkan 1.2+.</string>
-    <string name="sample_shading">דגימת צל</string>
-    <string name="sample_shading_description">מאפשר לשברי הצללה לרוץ לכל דגימה בקטע רב-דגימות במקום פעם אחת לקטע. משפר את איכות הגרפיקה במחיר של ביצועים. רק מכשירי Vulkan 1.1+ תומכים בהרחבה זו.</string>
    <string name="sample_shading_fraction">שבר הצללה לדוגמה</string>
    <string name="sample_shading_fraction_description">עוצמת מעבר ההצללה לדוגמה. ערכים גבוהים יותר משפרים את האיכות יותר אך גם מפחיתים את הביצועים במידה רבה יותר.</string>

--- a/src/android/app/src/main/res/values-hu/strings.xml
+++ b/src/android/app/src/main/res/values-hu/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">Javítja a világítást és a csúcskezelést bizonyos játékokban. Csak Vulkan 1.0+ GPU-kon támogatott.</string>
    <string name="descriptor_indexing">Deskriptor Indexelés</string>
    <string name="descriptor_indexing_description">Javítja a textúrák és pufferek kezelését, valamint a Maxwell fordítási réteget. Néhány Vulkan 1.1 GPU és minden Vulkan 1.2+ GPU támogatja.</string>
-    <string name="sample_shading">Mintavételezés árnyékolás</string>
-    <string name="sample_shading_description">Lehetővé teszi, hogy a fragment shader mintánként fusson egy többmintás fragmentben a fragmentenkénti futtatás helyett. Javítja a grafikai minőséget a teljesítmény rovására. Csak Vulkan 1.1+ eszközök támogatják ezt a kiterjesztést.</string>
    <string name="sample_shading_fraction">Mintavételezés árnyékolási hányad</string>
    <string name="sample_shading_fraction_description">A mintavételezés árnyékolási lépés intenzitása. A magasabb értékek jobb minőséget eredményeznek, de nagyobb mértékben csökkentik a teljesítményt.</string>

--- a/src/android/app/src/main/res/values-id/strings.xml
+++ b/src/android/app/src/main/res/values-id/strings.xml
@@ -91,8 +91,6 @@
    <string name="provoking_vertex_description">Meningkatkan pencahayaan dan penanganan vertex di beberapa game. Hanya didukung di GPU Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Pengindeks Deskriptor</string>
    <string name="descriptor_indexing_description">Meningkatkan penanganan tekstur dan buffer, serta lapisan terjemahan Maxwell. Didukung oleh beberapa GPU Vulkan 1.1 dan semua GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Pencahayaan Sampel</string>
-    <string name="sample_shading_description">Memungkinkan fragment shader dieksekusi per sampel dalam fragmen multisampel alih-alih sekali per fragmen. Meningkatkan kualitas grafis dengan mengorbankan kinerja. Hanya perangkat Vulkan 1.1+ yang mendukung ekstensi ini.</string>
    <string name="sample_shading_fraction">Fraksi Pencahayaan Sampel</string>
    <string name="sample_shading_fraction_description">Intensitas proses pencahayaan sampel. Nilai lebih tinggi meningkatkan kualitas lebih baik tetapi juga mengurangi performa lebih besar.</string>

--- a/src/android/app/src/main/res/values-it/strings.xml
+++ b/src/android/app/src/main/res/values-it/strings.xml
@@ -91,8 +91,6 @@
    <string name="provoking_vertex_description">Migliora illuminazione e gestione dei vertici in alcuni giochi. Supportato solo su GPU Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Indicizzazione descrittori</string>
    <string name="descriptor_indexing_description">Migliora la gestione di texture e buffer, nonché il livello di traduzione Maxwell. Supportato da alcune GPU Vulkan 1.1 e tutte le GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Shading campione</string>
-    <string name="sample_shading_description">Permette al fragment shader di eseguire per campione in un frammento multi-campione invece che una volta per frammento. Migliora la qualità grafica a scapito delle prestazioni. Solo i dispositivi Vulkan 1.1+ supportano questa estensione.</string>
    <string name="sample_shading_fraction">Frazione di ombreggiatura campione</string>
    <string name="sample_shading_fraction_description">L\'intensità della passata di ombreggiatura campione. Valori più alti migliorano la qualità ma riducono maggiormente le prestazioni.</string>

--- a/src/android/app/src/main/res/values-ja/strings.xml
+++ b/src/android/app/src/main/res/values-ja/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">特定のゲームで照明と頂点処理を改善します。Vulkan 1.0+ GPUでのみサポートされています。</string>
    <string name="descriptor_indexing">ディスクリプタインデキシング</string>
    <string name="descriptor_indexing_description">テクスチャとバッファの処理、およびMaxwell翻訳レイヤーを改善します。一部のVulkan 1.1 GPUとすべてのVulkan 1.2+ GPUでサポートされています。</string>
-    <string name="sample_shading">サンプルシェーディング</string>
-    <string name="sample_shading_description">マルチサンプルフラグメントでフラグメントシェーダーをフラグメントごとではなくサンプルごとに実行できるようにします。パフォーマンスを犠牲にしてグラフィック品質を向上させます。Vulkan 1.1+デバイスのみがこの拡張機能をサポートしています。</string>
    <string name="sample_shading_fraction">サンプルシェーディング率</string>
    <string name="sample_shading_fraction_description">サンプルシェーディング処理の強度。高い値ほど品質は向上しますが、パフォーマンスも大きく低下します。</string>

--- a/src/android/app/src/main/res/values-ko/strings.xml
+++ b/src/android/app/src/main/res/values-ko/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">일부 게임에서 조명과 버텍스 처리를 개선합니다. Vulkan 1.0+ GPU에서만 지원됩니다.</string>
    <string name="descriptor_indexing">디스크립터 인덱싱</string>
    <string name="descriptor_indexing_description">텍스처 및 버퍼 처리와 Maxwell 변환 레이어를 개선합니다. 일부 Vulkan 1.1 GPU 및 모든 Vulkan 1.2+ GPU에서 지원됩니다.</string>
-    <string name="sample_shading">샘플 쉐이딩</string>
-    <string name="sample_shading_description">멀티샘플 프래그먼트에서 프래그먼트 쉐이더가 프래그먼트당 한 번이 아니라 샘플당 실행되도록 합니다. 성능을 희생하여 그래픽 품질을 향상시킵니다. Vulkan 1.1+ 장치만 이 확장을 지원합니다.</string>
    <string name="sample_shading_fraction">샘플 쉐이딩 비율</string>
    <string name="sample_shading_fraction_description">샘플 쉐이딩 패스의 강도. 값이 높을수록 품질이 더 향상되지만 성능도 더 크게 저하됩니다.</string>

--- a/src/android/app/src/main/res/values-nb/strings.xml
+++ b/src/android/app/src/main/res/values-nb/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">Forbedrer belysning og vertexhåndtering i enkelte spill. Støttes kun på Vulkan 1.0+ GPU-er.</string>
    <string name="descriptor_indexing">Beskrivelsesindeksering</string>
    <string name="descriptor_indexing_description">Forbedrer tekstur- og bufferhåndtering, samt Maxwell-oversettelseslaget. Støttes av noen Vulkan 1.1 GPU-er og alle Vulkan 1.2+ GPU-er.</string>
-    <string name="sample_shading">Prøvegjengivelse</string>
-    <string name="sample_shading_description">Lar fragment-shaderen kjøres per prøve i et flerprøvefragment i stedet for en gang per fragment. Forbedrer grafikkvaliteten på bekostning av ytelse. Bare Vulkan 1.1+-enheter støtter denne utvidelsen.</string>
    <string name="sample_shading_fraction">Prøveskyggebrøk</string>
    <string name="sample_shading_fraction_description">Intensiteten til prøveskyggepasseringen. Høyere verdier forbedrer kvaliteten mer, men reduserer også ytelsen i større grad.</string>

--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@@ -96,8 +96,6 @@
    <string name="provoking_vertex_description">Poprawia oświetlenie i obsługę wierzchołków w niektórych grach. Obsługiwane tylko przez GPU Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Indeksowanie deskryptorów</string>
    <string name="descriptor_indexing_description">Poprawia obsługę tekstur i buforów oraz warstwę tłumaczenia Maxwell. Obsługiwane przez niektóre GPU Vulkan 1.1 i wszystkie GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Cieniowanie próbek</string>
-    <string name="sample_shading_description">Pozwala shaderowi fragmentów wykonywać się na próbkę w fragmencie wielopróbkowym zamiast raz na fragment. Poprawia jakość grafiki kosztem wydajności. Tylko urządzenia Vulkan 1.1+ obsługują to rozszerzenie.</string>
    <string name="sample_shading_fraction">Ułamek cieniowania próbki</string>
    <string name="sample_shading_fraction_description">Intensywność przebiegu cieniowania próbki. Wyższe wartości poprawiają jakość, ale także w większym stopniu zmniejszają wydajność.</string>

--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -91,8 +91,6 @@
    <string name="provoking_vertex_description">Vértice Provocante: Melhora a iluminação e o processamento de vértices em certos jogos. Suportado apenas em GPUs com Vulkan 1.0 ou superior.</string>
    <string name="descriptor_indexing">Descriptor Indexing</string>
    <string name="descriptor_indexing_description">Indexação de Descritores: Melhora o processamento de texturas e buffers, assim como a camada de tradução Maxwell. Suportado por algumas GPUs Vulkan 1.1 e todas as GPUs Vulkan 1.2 ou superiores.</string>
-    <string name="sample_shading">Sample Shading</string>
-    <string name="sample_shading_description">Amostragem de Sombreamento: Permite que o shader de fragmento seja processado por cada amostra em fragmentos multiamostrados, em vez de executar uma vez por fragmento, melhorando a qualidade gráfica, porém impactando levemente o desempenho. Funciona apenas em dispositivos Vulkan 1.1 ou superiores.</string>
    <string name="sample_shading_fraction">Sample Shading Fraction</string>
    <string name="sample_shading_fraction_description">Fração de Sombreamento de Amostra: Define a intensidade do sample shading. Quanto maior, melhor a qualidade, mas maior o impacto no desempenho.</string>

--- a/src/android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">Melhora a iluminação e o tratamento de vértices em certos jogos. Suportado apenas em GPUs Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Indexação de descritores</string>
    <string name="descriptor_indexing_description">Melhora o tratamento de texturas e buffers, assim como a camada de tradução Maxwell. Suportado por algumas GPUs Vulkan 1.1 e todas Vulkan 1.2+.</string>
-    <string name="sample_shading">Amostragem de sombreamento</string>
-    <string name="sample_shading_description">Permite que o fragment shader seja executado por amostra num fragmento multi-amostrado em vez de uma vez por fragmento. Melhora a qualidade gráfica à custa de desempenho. Apenas dispositivos Vulkan 1.1+ suportam esta extensão.</string>
    <string name="sample_shading_fraction">Fração de Sombreamento de Amostra</string>
    <string name="sample_shading_fraction_description">A intensidade da passagem de sombreamento de amostra. Valores mais elevados melhoram a qualidade, mas também reduzem o desempenho numa maior medida.</string>

--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@@ -96,8 +96,6 @@
    <string name="provoking_vertex_description">Улучшает освещение и обработку вершин в некоторых играх. Поддерживается только ГПУ с Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Индексирование дескрипторов</string>
    <string name="descriptor_indexing_description">Улучшает обработку текстур и буферов, а также слой перевода Maxwell. Поддерживается некоторыми ГПУ Vulkan 1.1 и всеми ГПУ Vulkan 1.2+.</string>
-    <string name="sample_shading">Сэмпловый шейдинг</string>
-    <string name="sample_shading_description">Позволяет шейдеру фрагментов выполняться на каждый сэмпл в мультисэмпловом фрагменте вместо одного раза на фрагмент. Улучшает качество графики ценой производительности. Только устройства с Vulkan 1.1+ поддерживают это расширение.</string>
    <string name="sample_shading_fraction">Доля сэмплового затенения</string>
    <string name="sample_shading_fraction_description">Интенсивность прохода сэмплового затенения. Более высокие значения улучшают качество, но и сильнее снижают производительность.</string>

--- a/src/android/app/src/main/res/values-sr/strings.xml
+++ b/src/android/app/src/main/res/values-sr/strings.xml
@@ -68,8 +68,6 @@
    <string name="provoking_vertex_description">Побољшава осветљење и вертификат руковања у одређеним играма. Подржан само на Вулкану 1.0+ ГПУ-у.</string>
    <string name="descriptor_indexing">Индексирање дескриптора</string>
    <string name="descriptor_indexing_description">Побољшава текстуру и руковање међуспремника, као и преводилачки слој Маквелл. Подржани од стране неких Вулкана 1.1 ГПУ-а и сви Вулкан 1.2+ ГПУ.</string>
-    <string name="sample_shading">Семпловање сенчења</string>
-    <string name="sample_shading_description">Омогућава фрагмент шејдеру да се извршава по узорку у вишеузорачном фрагменту уместо једном по фрагменту. Побољшава квалитет графике на рачун перформанси. Само Vulkan 1.1+ уређаји подржавају ову екстензију.</string>
    <string name="sample_shading_fraction">Удео сенчења узорка</string>
    <string name="sample_shading_fraction_description">Интензитет проласка сенчења узорка. Веће вредности побољшавају квалитет више, али такође више смањују перформансе.</string>

--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@@ -96,8 +96,6 @@
    <string name="provoking_vertex_description">Покращує освітлення та взаємодію з вершинами у деяких іграх. Лише для ГП з підтримкою Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Індексація дескрипторів</string>
    <string name="descriptor_indexing_description">Покращує обробку текстур та буферів, а також шар перекладу Maxwell. Підтримується деякими GPU Vulkan 1.1 та всіма GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Шейдинг зразків</string>
-    <string name="sample_shading_description">Дозволяє шейдеру фрагментів виконуватися на кожен семпл у багатосемпловому фрагменті замість одного разу на фрагмент. Покращує якість графіки за рахунок продуктивності. Лише пристрої з Vulkan 1.1+ підтримують це розширення.</string>
    <string name="sample_shading_fraction">Частка затінення зразка</string>
    <string name="sample_shading_fraction_description">Інтенсивність проходу затінення зразка. Вищі значення покращують якість, але й сильніше знижують продуктивність.</string>

--- a/src/android/app/src/main/res/values-vi/strings.xml
+++ b/src/android/app/src/main/res/values-vi/strings.xml
@@ -70,8 +70,6 @@
    <string name="provoking_vertex_description">Cải thiện ánh sáng và xử lý đỉnh trong một số trò chơi. Chỉ được hỗ trợ trên GPU Vulkan 1.0+.</string>
    <string name="descriptor_indexing">Lập chỉ mục bộ mô tả</string>
    <string name="descriptor_indexing_description">Cải thiện xử lý kết cấu và bộ đệm, cũng như lớp dịch Maxwell. Được hỗ trợ bởi một số GPU Vulkan 1.1 và tất cả GPU Vulkan 1.2+.</string>
-    <string name="sample_shading">Tô bóng mẫu</string>
-    <string name="sample_shading_description">Cho phép fragment shader thực thi trên mỗi mẫu trong một fragment đa mẫu thay vì một lần mỗi fragment. Cải thiện chất lượng đồ họa với chi phí hiệu suất. Chỉ thiết bị Vulkan 1.1+ hỗ trợ tiện ích mở rộng này.</string>
    <string name="sample_shading_fraction">Phần trăm tô bóng mẫu</string>
    <string name="sample_shading_fraction_description">Cường độ của bước tô bóng mẫu. Giá trị cao hơn cải thiện chất lượng tốt hơn nhưng cũng giảm hiệu suất nhiều hơn.</string>

--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -93,8 +93,6 @@
    <string name="provoking_vertex_description">改善某些游戏中的光照和顶点处理。仅支持Vulkan 1.0+ GPU。</string>
    <string name="descriptor_indexing">描述符索引</string>
    <string name="descriptor_indexing_description">改进纹理和缓冲区处理以及Maxwell转换层。部分Vulkan 1.1 GPU和所有Vulkan 1.2+ GPU支持。</string>
-    <string name="sample_shading">采样着色</string>
-    <string name="sample_shading_description">允许片段着色器在多采样片段中每个样本执行一次，而不是每个片段执行一次。以提高性能为代价改善图形质量。仅Vulkan 1.1+设备支持此扩展。</string>
    <string name="sample_shading_fraction">采样着色比例</string>
    <string name="sample_shading_fraction_description">采样着色处理的强度。值越高，质量改善越多，但性能降低也越明显。</string>

--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -96,8 +96,6 @@
    <string name="provoking_vertex_description">改善某些遊戲中的光照和頂點處理。僅支援Vulkan 1.0+ GPU。</string>
    <string name="descriptor_indexing">描述符索引</string>
    <string name="descriptor_indexing_description">改進紋理和緩衝區處理以及Maxwell轉換層。部分Vulkan 1.1 GPU和所有Vulkan 1.2+ GPU支援。</string>
-    <string name="sample_shading">取樣著色</string>
-    <string name="sample_shading_description">允許片段著色器在多取樣片段中每個樣本執行一次，而不是每個片段執行一次。以提高效能為代價改善圖形品質。僅Vulkan 1.1+裝置支援此擴充功能。</string>
    <string name="sample_shading_fraction">採樣著色比例</string>
    <string name="sample_shading_fraction_description">採樣著色處理的強度。數值越高，品質改善越多，但效能降低也越明顯。</string>

--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -101,10 +101,8 @@
    <string name="provoking_vertex_description">Improves lighting and vertex handling in certain games. Only supported on Vulkan 1.0+ GPUs.</string>
    <string name="descriptor_indexing">Descriptor Indexing</string>
    <string name="descriptor_indexing_description">Improves texture and buffer handling, as well as the Maxwell translation layer. Supported by some Vulkan 1.1 GPUs and all Vulkan 1.2+ GPUs.</string>
-    <string name="sample_shading">Sample Shading</string>
-    <string name="sample_shading_description">Allows the fragment shader to execute per sample in a multi-sampled fragment instead once per fragment. Improves graphics quality at the cost of some performance. Only Vulkan 1.1+ devices support this extension.</string>
    <string name="sample_shading_fraction">Sample Shading Fraction</string>
-    <string name="sample_shading_fraction_description">The intensity of the sample shading pass. Higher values improve quality more but also reduce performance to a greater extent.</string>
+    <string name="sample_shading_fraction_description">Allows the fragment shader to execute per sample in a multi-sampled fragment instead of once per fragment. Improves graphics quality at the cost of performance. Higher values improve quality but degrade performance.</string>

    <string name="veil_renderer">Renderer</string>
    <string name="sync_memory_operations">Sync Memory Operations</string>
--- a/src/android/gradle.properties
+++ b/src/android/gradle.properties
@@ -14,8 +14,6 @@ android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 kotlin.parallel.tasks.in.project=true
-android.defaults.buildfeatures.buildconfig=true
-
 # Android Gradle plugin 8.0.2
 android.suppressUnsupportedCompileSdk=34
 android.native.buildOutput=verbose
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -251,8 +251,8 @@ if (ENABLE_SDL2)
        sink/sdl2_sink.cpp
        sink/sdl2_sink.h
    )
-    target_include_directories(audio_core PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-    target_link_libraries(audio_core PRIVATE SDL2)
+
+    target_link_libraries(audio_core PRIVATE SDL2::SDL2)
    target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
 endif()

--- a/src/common/announce_multiplayer_room.h
+++ b/src/common/announce_multiplayer_room.h
@@ -34,8 +34,8 @@ struct Member {
 struct RoomInformation {
    std::string name;          ///< Name of the server
    std::string description;   ///< Server description
-    u32 member_slots{};        ///< Maximum number of members in this room
-    u16 port{};                ///< The port of this room
+    u32 member_slots;          ///< Maximum number of members in this room
+    u16 port;                  ///< The port of this room
    GameInfo preferred_game;   ///< Game to advertise that you want to play
    std::string host_username; ///< Forum username of the host
 };
@@ -46,8 +46,8 @@ struct Room {
    std::string id;
    std::string verify_uid; ///< UID used for verification
    std::string ip;
-    u32 net_version{};
-    bool has_password = false;
+    u32 net_version;
+    bool has_password;

    std::vector<Member> members;
 };
--- a/src/common/fs/fs.cpp
+++ b/src/common/fs/fs.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -174,14 +171,11 @@ bool CreateDir(const fs::path& path) {
        return false;
    }

-    // TODO: Maybe this is what causes death?
-#ifndef __OPENORBIS__
    if (!Exists(path.parent_path())) {
        LOG_ERROR(Common_Filesystem, "Parent directory of path={} does not exist",
                  PathToUTF8String(path));
        return false;
    }
-#endif

    if (IsDir(path)) {
        LOG_DEBUG(Common_Filesystem, "Filesystem object at path={} exists and is a directory",
--- a/src/common/fs/path_util.cpp
+++ b/src/common/fs/path_util.cpp
@@ -130,10 +130,6 @@ public:
        ASSERT(!eden_path.empty());
        eden_path_cache = eden_path / CACHE_DIR;
        eden_path_config = eden_path / CONFIG_DIR;
-#elif defined(__OPENORBIS__)
-        eden_path = "/data/eden";
-        eden_path_cache = eden_path / CACHE_DIR;
-        eden_path_config = eden_path / CONFIG_DIR;
 #else
        eden_path = GetCurrentDir() / PORTABLE_DIR;
        if (!Exists(eden_path) || !IsDir(eden_path)) {
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -30,21 +30,19 @@
 #include <sys/random.h>
 #include <mach/vm_map.h>
 #include <mach/mach.h>
-#elif defined(__OPENORBIS__)
-#include <orbis/libkernel.h>
 #endif

 // FreeBSD
 #ifndef MAP_NORESERVE
-#   define MAP_NORESERVE 0
+#define MAP_NORESERVE 0
 #endif
 // Solaris 11 and illumos
 #ifndef MAP_ALIGNED_SUPER
-#   define MAP_ALIGNED_SUPER 0
+#define MAP_ALIGNED_SUPER 0
 #endif
 // macOS
 #ifndef MAP_ANONYMOUS
-#   define MAP_ANONYMOUS MAP_ANON
+#define MAP_ANONYMOUS MAP_ANON
 #endif

 #endif // ^^^ POSIX ^^^
@@ -70,8 +68,8 @@ static int memfd_create(const char* name, unsigned int flags) {

 namespace Common {

-[[maybe_unused]] constexpr size_t PageAlignment = 0x1000;
-[[maybe_unused]] constexpr size_t HugePageSize = 0x200000;
+constexpr size_t PageAlignment = 0x1000;
+constexpr size_t HugePageSize = 0x200000;

 #ifdef _WIN32

@@ -440,15 +438,13 @@ static void* ChooseVirtualBase(size_t virtual_size) {

 #else

-static void* ChooseVirtualBase(size_t size) {
+static void* ChooseVirtualBase(size_t virtual_size) {
 #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun__) || defined(__HAIKU__) || defined(__managarm__) || defined(__AIX__)
-    void* virtual_base = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_ALIGNED_SUPER, -1, 0);
+    void* virtual_base = mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_ALIGNED_SUPER, -1, 0);
    if (virtual_base != MAP_FAILED)
        return virtual_base;
-    return mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
-#else
-    return mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
 #endif
+    return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
 }

 #endif
@@ -504,12 +500,9 @@ class HostMemory::Impl {
 public:
    explicit Impl(size_t backing_size_, size_t virtual_size_)
        : backing_size{backing_size_}, virtual_size{virtual_size_} {
-#ifdef __OPENORBIS__
-
-#else
        long page_size = sysconf(_SC_PAGESIZE);
-        ASSERT_MSG(page_size == 0x1000, "page size {:#x} is incompatible with 4K paging", page_size);
-#endif
+        ASSERT_MSG(page_size == 0x1000, "page size {:#x} is incompatible with 4K paging",
+                   page_size);
        // Backing memory initialization
 #if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
        fd = shm_open_anon(O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
@@ -699,25 +692,31 @@ private:

 #endif // ^^^ POSIX ^^^

-HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_) : backing_size(backing_size_), virtual_size(virtual_size_) {
-#ifdef __OPENORBIS__
-    Common::InitSwap();
-    LOG_WARNING(HW_Memory, "Platform doesn't support fastmem");
-    fallback_buffer.emplace(backing_size);
-    backing_base = fallback_buffer->data();
-    virtual_base = nullptr;
-#else
-    // Try to allocate a fastmem arena.
-    // The implementation will fail with std::bad_alloc on errors.
-    impl = std::make_unique<HostMemory::Impl>(AlignUp(backing_size, PageAlignment), AlignUp(virtual_size, PageAlignment) + HugePageSize);
-    backing_base = impl->backing_base;
-    virtual_base = impl->virtual_base;
-    if (virtual_base) {
-        // Ensure the virtual base is aligned to the L2 block size.
-        virtual_base = reinterpret_cast<u8*>(Common::AlignUp(uintptr_t(virtual_base), HugePageSize));
-        virtual_base_offset = virtual_base - impl->virtual_base;
+HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_)
+    : backing_size(backing_size_), virtual_size(virtual_size_) {
+    try {
+        // Try to allocate a fastmem arena.
+        // The implementation will fail with std::bad_alloc on errors.
+        impl =
+            std::make_unique<HostMemory::Impl>(AlignUp(backing_size, PageAlignment),
+                                               AlignUp(virtual_size, PageAlignment) + HugePageSize);
+        backing_base = impl->backing_base;
+        virtual_base = impl->virtual_base;
+
+        if (virtual_base) {
+            // Ensure the virtual base is aligned to the L2 block size.
+            virtual_base = reinterpret_cast<u8*>(
+                Common::AlignUp(reinterpret_cast<uintptr_t>(virtual_base), HugePageSize));
+            virtual_base_offset = virtual_base - impl->virtual_base;
+        }
+
+    } catch (const std::bad_alloc&) {
+        LOG_CRITICAL(HW_Memory,
+                     "Fastmem unavailable, falling back to VirtualBuffer for memory allocation");
+        fallback_buffer = std::make_unique<Common::VirtualBuffer<u8>>(backing_size);
+        backing_base = fallback_buffer->data();
+        virtual_base = nullptr;
    }
-#endif
 }

 HostMemory::~HostMemory() = default;
--- a/src/common/host_memory.h
+++ b/src/common/host_memory.h
@@ -1,13 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once

 #include <memory>
-#include <optional>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/virtual_buffer.h"
@@ -85,7 +81,7 @@ private:
    size_t virtual_base_offset{};

    // Fallback if fastmem is not supported on this platform
-    std::optional<Common::VirtualBuffer<u8>> fallback_buffer;
+    std::unique_ptr<Common::VirtualBuffer<u8>> fallback_buffer;
 };

 } // namespace Common
--- a/src/common/memory_detect.cpp
+++ b/src/common/memory_detect.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -11,7 +8,7 @@
 // clang-format on
 #else
 #include <sys/types.h>
-#if defined(__APPLE__) || (defined(__FreeBSD__) && !defined(__OPENORBIS__))
+#if defined(__APPLE__) || defined(__FreeBSD__)
 #include <sys/sysctl.h>
 #elif defined(__linux__)
 #include <sys/sysinfo.h>
@@ -46,8 +43,6 @@ static MemoryInfo Detect() {
    sysctlbyname("vm.swapusage", &vmusage, &sizeof_vmusage, nullptr, 0);
    mem_info.TotalPhysicalMemory = ramsize;
    mem_info.TotalSwapMemory = vmusage.xsu_total;
-#elif defined(__OPENORBIS__)
-    mem_info.TotalPhysicalMemory = mem_info.TotalSwapMemory = 0;
 #elif defined(__FreeBSD__)
    u_long physmem, swap_total;
    std::size_t sizeof_u_long = sizeof(u_long);
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -196,14 +196,7 @@ struct Values {
                                             linkage, false, "dump_audio_commands", Category::Audio, Specialization::Default, false};

    // Core
-    SwitchableSetting<bool> use_multi_core{linkage,
-#ifdef __OPENORBIS__
-        // Re-enable once proper TLS support is added
-        false,
-#else
-        true,
-#endif
-        "use_multi_core", Category::Core};
+    SwitchableSetting<bool> use_multi_core{linkage, true, "use_multi_core", Category::Core};
    SwitchableSetting<MemoryLayout, true> memory_layout_mode{linkage,
                                                             MemoryLayout::Memory_4Gb,
                                                             "memory_layout_mode",
@@ -325,14 +318,14 @@ struct Values {

    // Renderer
    SwitchableSetting<RendererBackend, true> renderer_backend{linkage,
-#if defined(__sun__) || defined(__managarm__) || defined(__OPENORBIS__)
+#if defined(__sun__) || defined(__managarm__)
                                                              RendererBackend::OpenGL,
 #else
                                                              RendererBackend::Vulkan,
 #endif
                                                              "backend", Category::Renderer};
    SwitchableSetting<ShaderBackend, true> shader_backend{linkage,
-#if defined(__sun__) || defined(__managarm__) || defined(__OPENORBIS__)
+#if defined(__sun__) || defined(__managarm__)
                                                          ShaderBackend::Glsl,
 #else
                                                          ShaderBackend::SpirV,
@@ -521,6 +514,7 @@ struct Values {
    SwitchableSetting<bool> barrier_feedback_loops{linkage, true, "barrier_feedback_loops",
                                                   Category::RendererAdvanced};

+    SwitchableSetting<u32, true> sample_shading_fraction{linkage, 0, 0, 100, "sample_shading_fraction", Category::RendererExtensions, Specialization::Scalar, true};
    SwitchableSetting<u8, true> dyna_state{linkage,
 #if defined (_WIN32)
                                           3,
@@ -542,17 +536,6 @@ struct Values {
    SwitchableSetting<bool> vertex_input_dynamic_state{linkage, true, "vertex_input_dynamic_state", Category::RendererExtensions};
    SwitchableSetting<bool> provoking_vertex{linkage, false, "provoking_vertex", Category::RendererExtensions};
    SwitchableSetting<bool> descriptor_indexing{linkage, false, "descriptor_indexing", Category::RendererExtensions};
-    SwitchableSetting<bool> sample_shading{linkage, false, "sample_shading", Category::RendererExtensions, Specialization::Paired};
-    SwitchableSetting<u32, true> sample_shading_fraction{linkage,
-                                                         50,
-                                                         0,
-                                                         100,
-                                                         "sample_shading_fraction",
-                                                         Category::RendererExtensions,
-                                                         Specialization::Scalar,
-                                                         true,
-                                                         false,
-                                                         &sample_shading};

    Setting<bool> renderer_debug{linkage, false, "debug", Category::RendererDebug};
    Setting<bool> renderer_shader_feedback{linkage, false, "shader_feedback",
--- a/src/common/virtual_buffer.cpp
+++ b/src/common/virtual_buffer.cpp
@@ -10,147 +10,30 @@
 #include <sys/mman.h>
 #endif

-#ifdef __OPENORBIS__
-#include <ranges>
-#include <csignal>
-#include <boost/container/static_vector.hpp>
-#include <orbis/SystemService.h>
-typedef void (*SceKernelExceptionHandler)(int32_t, void*);
-extern "C" int32_t sceKernelInstallExceptionHandler(int32_t signum, SceKernelExceptionHandler handler);
-#endif
-
 #include "common/assert.h"
 #include "common/virtual_buffer.h"
-#include "common/logging/log.h"
-
-// PlayStation 4
-// Flag needs to be undef-ed on non PS4 since it has different semantics
-// on some platforms.
-#ifdef __OPENORBIS__
-#   ifndef MAP_SYSTEM
-#       define MAP_SYSTEM 0x2000
-#   endif
-#   ifndef MAP_VOID
-#       define MAP_VOID 0x100
-#   endif
-// sigaction(2) has a motherfucking bug on musl where the thing isnt even properly prefixed
-#   undef sa_sigaction
-#   define sa_sigaction __sa_handler.__sa_sigaction
-#endif

 namespace Common {

-#ifdef __OPENORBIS__
-
-namespace Orbis {
-struct Ucontext {
-    struct Sigset {
-        u64 bits[2];
-    } uc_sigmask;
-    int field1_0x10[12];
-    struct Mcontext {
-        u64 mc_onstack;
-        u64 mc_rdi;
-        u64 mc_rsi;
-        u64 mc_rdx;
-        u64 mc_rcx;
-        u64 mc_r8;
-        u64 mc_r9;
-        u64 mc_rax;
-        u64 mc_rbx;
-        u64 mc_rbp;
-        u64 mc_r10;
-        u64 mc_r11;
-        u64 mc_r12;
-        u64 mc_r13;
-        u64 mc_r14;
-        u64 mc_r15;
-        int mc_trapno;
-        u16 mc_fs;
-        u16 mc_gs;
-        u64 mc_addr;
-        int mc_flags;
-        u16 mc_es;
-        u16 mc_ds;
-        u64 mc_err;
-        u64 mc_rip;
-        u64 mc_cs;
-        u64 mc_rflags;
-        u64 mc_rsp;
-        u64 mc_ss;
-        u64 mc_len;
-        u64 mc_fpformat;
-        u64 mc_ownedfp;
-        u64 mc_lbrfrom;
-        u64 mc_lbrto;
-        u64 mc_aux1;
-        u64 mc_aux2;
-        u64 mc_fpstate[104];
-        u64 mc_fsbase;
-        u64 mc_gsbase;
-        u64 mc_spare[6];
-    } uc_mcontext;
-    struct Ucontext* uc_link;
-    struct ExStack {
-        void* ss_sp;
-        std::size_t ss_size;
-        int ss_flags;
-        int _align;
-    } uc_stack;
-    int uc_flags;
-    int __spare[4];
-    int field7_0x4f4[3];
-};
-}
-
-static boost::container::static_vector<std::pair<void*, size_t>, 16> swap_regions;
-extern "C" int sceKernelRemoveExceptionHandler(s32 sig_num);
-static void SwapHandler(int sig, void* raw_context) {
-    auto& mctx = ((Orbis::Ucontext*)raw_context)->uc_mcontext;
-    if (std::ranges::find_if(swap_regions, [addr = mctx.mc_addr](auto const& e) {
-        return uintptr_t(addr) >= uintptr_t(e.first) && uintptr_t(addr) < uintptr_t(e.first) + e.second;
-    }) != swap_regions.end()) {
-        size_t const page_size = 4096;
-        size_t const page_mask = ~0xfff;
-        // should replace the existing mapping... ugh
-        void* aligned_addr = reinterpret_cast<void*>(uintptr_t(mctx.mc_addr) & page_mask);
-        void* res = mmap(aligned_addr, page_size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
-        ASSERT(res != MAP_FAILED);
-    } else {
-        LOG_ERROR(HW_Memory, "fault in addr {:#x} at {:#x}", mctx.mc_addr, mctx.mc_rip); // print caller address
-        sceKernelRemoveExceptionHandler(SIGSEGV); // to not catch the next signal
-    }
-}
-void InitSwap() noexcept {
-    sceKernelInstallExceptionHandler(SIGSEGV, &SwapHandler);
-}
-#else
-void InitSwap() noexcept {}
-#endif
-
 void* AllocateMemoryPages(std::size_t size) noexcept {
 #ifdef _WIN32
-    void* addr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
-    ASSERT(addr != nullptr);
-#elif defined(__OPENORBIS__)
-    void* addr = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_VOID | MAP_PRIVATE, -1, 0);
-    ASSERT(addr != MAP_FAILED);
-    swap_regions.emplace_back(addr, size);
+    void* base = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
 #else
-    void* addr = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
-    ASSERT(addr != MAP_FAILED);
+    void* base = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+    if (base == MAP_FAILED)
+        base = nullptr;
 #endif
-    return addr;
+    ASSERT(base);
+    return base;
 }

-void FreeMemoryPages(void* addr, [[maybe_unused]] std::size_t size) noexcept {
-    if (!addr)
+void FreeMemoryPages(void* base, [[maybe_unused]] std::size_t size) noexcept {
+    if (!base)
        return;
 #ifdef _WIN32
-    VirtualFree(addr, 0, MEM_RELEASE);
+    ASSERT(VirtualFree(base, 0, MEM_RELEASE));
 #else
-    int rc = munmap(addr, size);
-    ASSERT(rc == 0);
+    ASSERT(munmap(base, size) == 0);
 #endif
 }

--- a/src/common/virtual_buffer.h
+++ b/src/common/virtual_buffer.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -12,7 +9,6 @@ namespace Common {

 void* AllocateMemoryPages(std::size_t size) noexcept;
 void FreeMemoryPages(void* base, std::size_t size) noexcept;
-void InitSwap() noexcept;

 template <typename T>
 class VirtualBuffer final {
@@ -36,10 +32,9 @@ public:
    VirtualBuffer(const VirtualBuffer&) = delete;
    VirtualBuffer& operator=(const VirtualBuffer&) = delete;

-    VirtualBuffer(VirtualBuffer&& other) noexcept {
-        alloc_size = std::exchange(other.alloc_size, 0);
-        base_ptr = std::exchange(other.base_ptr, nullptr);
-    }
+    VirtualBuffer(VirtualBuffer&& other) noexcept
+        : alloc_size{std::exchange(other.alloc_size, 0)}, base_ptr{std::exchange(other.base_ptr),
+                                                                   nullptr} {}

    VirtualBuffer& operator=(VirtualBuffer&& other) noexcept {
        alloc_size = std::exchange(other.alloc_size, 0);
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -295,7 +295,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* pa
    // Curated optimizations
    case Settings::CpuAccuracy::Auto:
        config.unsafe_optimizations = true;
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__) || defined(__HAIKU__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OPENORBIS__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__) || defined(__HAIKU__) || defined(__DragonFly__) || defined(__NetBSD__)
        config.fastmem_pointer = std::nullopt;
        config.fastmem_exclusive_access = false;
 #endif
--- a/src/core/device_memory.h
+++ b/src/core/device_memory.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -29,22 +26,27 @@ public:

    template <typename T>
    Common::PhysicalAddress GetPhysicalAddr(const T* ptr) const {
-        return (uintptr_t(ptr) - uintptr_t(buffer.BackingBasePointer())) + DramMemoryMap::Base;
+        return (reinterpret_cast<uintptr_t>(ptr) -
+                reinterpret_cast<uintptr_t>(buffer.BackingBasePointer())) +
+               DramMemoryMap::Base;
    }

    template <typename T>
    PAddr GetRawPhysicalAddr(const T* ptr) const {
-        return PAddr(uintptr_t(ptr) - uintptr_t(buffer.BackingBasePointer()));
+        return static_cast<PAddr>(reinterpret_cast<uintptr_t>(ptr) -
+                                  reinterpret_cast<uintptr_t>(buffer.BackingBasePointer()));
    }

    template <typename T>
    T* GetPointer(Common::PhysicalAddress addr) {
-        return reinterpret_cast<T*>(buffer.BackingBasePointer() + (GetInteger(addr) - DramMemoryMap::Base));
+        return reinterpret_cast<T*>(buffer.BackingBasePointer() +
+                                    (GetInteger(addr) - DramMemoryMap::Base));
    }

    template <typename T>
    const T* GetPointer(Common::PhysicalAddress addr) const {
-        return reinterpret_cast<T*>(buffer.BackingBasePointer() + (GetInteger(addr) - DramMemoryMap::Base));
+        return reinterpret_cast<T*>(buffer.BackingBasePointer() +
+                                    (GetInteger(addr) - DramMemoryMap::Base));
    }

    template <typename T>
--- a/src/core/device_memory_manager.inc
+++ b/src/core/device_memory_manager.inc
@@ -161,7 +161,7 @@ struct DeviceMemoryManagerAllocator {

 template <typename Traits>
 DeviceMemoryManager<Traits>::DeviceMemoryManager(const DeviceMemory& device_memory_)
-    : physical_base{uintptr_t(device_memory_.buffer.BackingBasePointer())},
+    : physical_base{reinterpret_cast<const uintptr_t>(device_memory_.buffer.BackingBasePointer())},
      device_inter{nullptr}, compressed_physical_ptr(device_as_size >> Memory::YUZU_PAGEBITS),
      compressed_device_addr(1ULL << ((Settings::values.memory_layout_mode.GetValue() ==
                                               Settings::MemoryLayout::Memory_4Gb
--- a/src/core/frontend/applets/cabinet.h
+++ b/src/core/frontend/applets/cabinet.h
@@ -21,7 +21,7 @@ namespace Core::Frontend {
 struct CabinetParameters {
    Service::NFP::TagInfo tag_info;
    Service::NFP::RegisterInfo register_info;
-    Service::NFP::CabinetMode mode{};
+    Service::NFP::CabinetMode mode;
 };

 using CabinetCallback = std::function<void(bool, const std::string&)>;
--- a/src/core/frontend/applets/software_keyboard.h
+++ b/src/core/frontend/applets/software_keyboard.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -23,9 +20,9 @@ struct KeyboardInitializeParameters {
    std::u16string initial_text;
    char16_t left_optional_symbol_key;
    char16_t right_optional_symbol_key;
-    u32 max_text_length{};
-    u32 min_text_length{};
-    s32 initial_cursor_position{};
+    u32 max_text_length;
+    u32 min_text_length;
+    s32 initial_cursor_position;
    Service::AM::Frontend::SwkbdType type;
    Service::AM::Frontend::SwkbdPasswordMode password_mode;
    Service::AM::Frontend::SwkbdTextDrawType text_draw_type;
@@ -37,12 +34,12 @@ struct KeyboardInitializeParameters {
 };

 struct InlineAppearParameters {
-    u32 max_text_length{};
-    u32 min_text_length{};
-    f32 key_top_scale_x{};
-    f32 key_top_scale_y{};
-    f32 key_top_translate_x{};
-    f32 key_top_translate_y{};
+    u32 max_text_length;
+    u32 min_text_length;
+    f32 key_top_scale_x;
+    f32 key_top_scale_y;
+    f32 key_top_translate_x;
+    f32 key_top_translate_y;
    Service::AM::Frontend::SwkbdType type;
    Service::AM::Frontend::SwkbdKeyDisableFlags key_disable_flags;
    bool key_top_as_floating;
@@ -53,7 +50,7 @@ struct InlineAppearParameters {

 struct InlineTextParameters {
    std::u16string input_text;
-    s32 cursor_position{};
+    s32 cursor_position;
 };

 class SoftwareKeyboardApplet : public Applet {
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -69,9 +69,7 @@ struct KernelCore::Impl {
        global_object_list_container = std::make_unique<KAutoObjectWithListContainer>(kernel);
        global_scheduler_context = std::make_unique<Kernel::GlobalSchedulerContext>(kernel);

-#ifndef __OPENORBIS__
        is_phantom_mode_for_singlecore = false;
-#endif

        // Derive the initial memory layout from the emulated board
        Init::InitializeSlabResourceCounts(kernel);
@@ -358,11 +356,7 @@ struct KernelCore::Impl {
        application_process->Open();
    }

-#ifdef __OPENORBIS__
-    static inline u8 host_thread_id = UINT8_MAX;
-#else
    static inline thread_local u8 host_thread_id = UINT8_MAX;
-#endif

    /// Sets the host thread ID for the caller.
    u32 SetHostThreadId(std::size_t core_id) {
@@ -386,14 +380,8 @@ struct KernelCore::Impl {
            ASSERT(KThread::InitializeDummyThread(thread, nullptr).IsSuccess());
            return thread;
        }};
-#ifdef __OPENORBIS__
-        // No proper TLS yet
-        static KThread raw_thread{system.Kernel()};
-        static KThread* thread = existing_thread ? existing_thread : initialize(&raw_thread);
-#else
        thread_local KThread raw_thread{system.Kernel()};
        thread_local KThread* thread = existing_thread ? existing_thread : initialize(&raw_thread);
-#endif
        return thread;
    }

@@ -419,33 +407,22 @@ struct KernelCore::Impl {
        return this_id;
    }

-#ifdef __OPENORBIS__
-    bool IsPhantomModeForSingleCore() const {
-        return true;
-    }
-    void SetIsPhantomModeForSingleCore(bool value) {}
-#else
-    // Forces singlecore
    static inline thread_local bool is_phantom_mode_for_singlecore{false};
+
    bool IsPhantomModeForSingleCore() const {
        return is_phantom_mode_for_singlecore;
    }
+
    void SetIsPhantomModeForSingleCore(bool value) {
        ASSERT(!is_multicore);
        is_phantom_mode_for_singlecore = value;
    }
-#endif

    bool IsShuttingDown() const {
        return is_shutting_down.load(std::memory_order_relaxed);
    }

-#ifdef __OPENORBIS__
-    // PS4 doesn't have proper TLS handling
-    static inline KThread* current_thread{nullptr};
-#else
    static inline thread_local KThread* current_thread{nullptr};
-#endif

    KThread* GetCurrentEmuThread() {
        if (!current_thread) {
--- a/src/core/hle/service/nfc/nfc_types.h
+++ b/src/core/hle/service/nfc/nfc_types.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -82,7 +79,7 @@ using DeviceHandle = u64;

 // This is nn::nfc::TagInfo
 struct TagInfo {
-    UniqueSerialNumber uuid{};
+    UniqueSerialNumber uuid;
    u8 uuid_length;
    INSERT_PADDING_BYTES(0x15);
    NfcProtocol protocol;
--- a/src/core/hle/service/nfp/nfp_types.h
+++ b/src/core/hle/service/nfp/nfp_types.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -318,7 +315,7 @@ static_assert(sizeof(ModelInfo) == 0x40, "ModelInfo is an invalid size");
 // This is nn::nfp::RegisterInfo
 struct RegisterInfo {
    Service::Mii::CharInfo mii_char_info;
-    WriteDate creation_date{};
+    WriteDate creation_date;
    AmiiboName amiibo_name;
    u8 font_region;
    INSERT_PADDING_BYTES(0x7A);
--- a/src/core/hle/service/ns/platform_service_manager.cpp
+++ b/src/core/hle/service/ns/platform_service_manager.cpp
@@ -164,7 +164,7 @@ IPlatformServiceManager::IPlatformServiceManager(Core::System& system_, const ch
    // Rebuild shared fonts from data ncas or synthesize

    impl->shared_font = std::make_shared<Kernel::PhysicalMemory>(SHARED_FONT_MEM_SIZE);
-    for (auto& font : SHARED_FONTS) {
+    for (auto font : SHARED_FONTS) {
        FileSys::VirtualFile romfs;
        const auto nca =
            nand->GetEntry(static_cast<u64>(font.first), FileSys::ContentRecordType::Data);
@@ -261,7 +261,7 @@ Result IPlatformServiceManager::GetSharedFontInOrderOfPriority(
                                    out_font_sizes.size(), impl->shared_font_regions.size()});

    for (size_t i = 0; i < max_size; i++) {
-        auto& region = impl->GetSharedFontRegion(i);
+        auto region = impl->GetSharedFontRegion(i);

        out_font_codes[i] = static_cast<u32>(i);
        out_font_offsets[i] = region.offset;
--- a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
+++ b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
@@ -59,16 +59,12 @@ public:
        signal_stack_size = std::max<size_t>(SIGSTKSZ, 2 * 1024 * 1024);
        signal_stack_memory = mmap(nullptr, signal_stack_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);

-#ifdef __OPENORBIS__
-        fmt::print(stderr, "no fastmem on PS4\n");
-        supports_fast_mem = false;
-#else
        stack_t signal_stack{};
        signal_stack.ss_sp = signal_stack_memory;
        signal_stack.ss_size = signal_stack_size;
        signal_stack.ss_flags = 0;
        if (sigaltstack(&signal_stack, nullptr) != 0) {
-            fmt::print(stderr, "POSIX SigHandler: init failure at sigaltstack\n");
+            fmt::print(stderr, "dynarmic: POSIX SigHandler: init failure at sigaltstack\n");
            supports_fast_mem = false;
            return;
        }
@@ -79,17 +75,16 @@ public:
        sa.sa_flags = SA_SIGINFO | SA_ONSTACK | SA_RESTART;
        sigemptyset(&sa.sa_mask);
        if (sigaction(SIGSEGV, &sa, &old_sa_segv) != 0) {
-            fmt::print(stderr, "POSIX SigHandler: could not set SIGSEGV handler\n");
+            fmt::print(stderr, "dynarmic: POSIX SigHandler: could not set SIGSEGV handler\n");
            supports_fast_mem = false;
            return;
        }
-#   ifdef __APPLE__
+#ifdef __APPLE__
        if (sigaction(SIGBUS, &sa, &old_sa_bus) != 0) {
-            fmt::print(stderr, "POSIX SigHandler: could not set SIGBUS handler\n");
+            fmt::print(stderr, "dynarmic: POSIX SigHandler: could not set SIGBUS handler\n");
            supports_fast_mem = false;
            return;
        }
-#   endif
 #endif
    }

@@ -150,9 +145,6 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) {
 #    error "Invalid architecture"
 #endif

-#ifdef __OPENORBIS__
-    // No fastmem
-#else
    struct sigaction* retry_sa = sig == SIGSEGV ? &sig_handler->old_sa_segv : &sig_handler->old_sa_bus;
    if (retry_sa->sa_flags & SA_SIGINFO) {
        retry_sa->sa_sigaction(sig, info, raw_context);
@@ -166,7 +158,6 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) {
        return;
    }
    retry_sa->sa_handler(sig);
-#endif
 }

 }  // anonymous namespace
--- a/src/dynarmic/src/dynarmic/common/context.h
+++ b/src/dynarmic/src/dynarmic/common/context.h
@@ -60,7 +60,7 @@
 #    elif defined(__linux__)
 #        define CTX_RIP (mctx.gregs[REG_RIP])
 #        define CTX_RSP (mctx.gregs[REG_RSP])
-#    elif defined(__FreeBSD__) || defined(__DragonFly__)
+#    elif defined(__FreeBSD__)
 #        define CTX_RIP (mctx.mc_rip)
 #        define CTX_RSP (mctx.mc_rsp)
 #    elif defined(__NetBSD__)
@@ -72,9 +72,9 @@
 #    elif defined(__sun__)
 #        define CTX_RIP (mctx.gregs[REG_RIP])
 #        define CTX_RSP (mctx.gregs[REG_RSP])
-#    elif defined(__OPENORBIS__)
-#        define CTX_RIP (mctx.gregs[REG_RIP])
-#        define CTX_RSP (mctx.gregs[REG_RSP])
+#    elif defined(__DragonFly__)
+#        define CTX_RIP (mctx.mc_rip)
+#        define CTX_RSP (mctx.mc_rsp)
 #    else
 #        error "Unknown platform"
 #    endif
@@ -97,7 +97,7 @@
 #        define CTX_Q(i) (fpctx->vregs[i])
 #        define CTX_FPSR (fpctx->fpsr)
 #        define CTX_FPCR (fpctx->fpcr)
-#    elif defined(__FreeBSD__) || defined(__DragonFly__)
+#    elif defined(__FreeBSD__)
 #        define CTX_PC (mctx.mc_gpregs.gp_elr)
 #        define CTX_SP (mctx.mc_gpregs.gp_sp)
 #        define CTX_LR (mctx.mc_gpregs.gp_lr)
--- a/src/frontend_common/play_time_manager.h
+++ b/src/frontend_common/play_time_manager.h
@@ -48,7 +48,7 @@ private:
    void Save();

    PlayTimeDatabase database;
-    u64 running_program_id{};
+    u64 running_program_id;
    std::jthread play_time_thread;
 };

--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -75,8 +75,7 @@ if (ENABLE_SDL2)
        helpers/joycon_protocol/rumble.cpp
        helpers/joycon_protocol/rumble.h
    )
-    target_include_directories(input_common PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-    target_link_libraries(input_common PRIVATE SDL2)
+    target_link_libraries(input_common PRIVATE SDL2::SDL2)
    target_compile_definitions(input_common PRIVATE HAVE_SDL2)
 endif()

--- a/src/input_common/drivers/joycon.cpp
+++ b/src/input_common/drivers/joycon.cpp
@@ -23,14 +23,12 @@ Joycons::Joycons(const std::string& input_engine_) : InputEngine(input_engine_)
        return;
    }
    LOG_INFO(Input, "Joycon driver Initialization started");
-#if SDL_VERSION_ATLEAST(2, 26, 4)
-    int const res = SDL_hid_init();
-    if (res == 0) {
+    const int init_res = SDL_hid_init();
+    if (init_res == 0) {
        Setup();
    } else {
-        LOG_ERROR(Input, "Hidapi could not be initialized. failed with error = {}", res);
+        LOG_ERROR(Input, "Hidapi could not be initialized. failed with error = {}", init_res);
    }
-#endif
 }

 Joycons::~Joycons() {
@@ -57,9 +55,7 @@ void Joycons::Reset() {
        }
        device->Stop();
    }
-#if SDL_VERSION_ATLEAST(2, 26, 4)
    SDL_hid_exit();
-#endif
 }

 void Joycons::Setup() {
@@ -84,9 +80,9 @@ void Joycons::Setup() {
 }

 void Joycons::ScanThread(std::stop_token stop_token) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
    constexpr u16 nintendo_vendor_id = 0x057e;
    Common::SetCurrentThreadName("JoyconScanThread");
+
    do {
        SDL_hid_device_info* devs = SDL_hid_enumerate(nintendo_vendor_id, 0x0);
        SDL_hid_device_info* cur_dev = devs;
@@ -102,7 +98,6 @@ void Joycons::ScanThread(std::stop_token stop_token) {

        SDL_hid_free_enumeration(devs);
    } while (Common::StoppableTimedWait(stop_token, std::chrono::seconds{5}));
-#endif
 }

 bool Joycons::IsDeviceNew(SDL_hid_device_info* device_info) const {
--- a/src/input_common/drivers/joycon.h
+++ b/src/input_common/drivers/joycon.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -9,14 +6,7 @@
 #include <array>
 #include <span>
 #include <thread>
-
-#include <SDL.h>
-#if SDL_VERSION_ATLEAST(2, 26, 4)
-#   include <SDL_hidapi.h>
-#else
-struct SDL_hid_device;
-struct SDL_hid_device_info;
-#endif
+#include <SDL_hidapi.h>

 #include "input_common/input_engine.h"

--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -42,7 +42,6 @@ public:
    }

    void EnableMotion() {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
        if (!sdl_controller) {
            return;
        }
@@ -59,14 +58,12 @@ public:
        if (has_gyro) {
            SDL_GameControllerSetSensorEnabled(controller, SDL_SENSOR_GYRO, SDL_TRUE);
        }
-#endif
    }

    bool HasMotion() const {
        return has_gyro || has_accel;
    }

-#if SDL_VERSION_ATLEAST(2, 26, 4)
    bool UpdateMotion(SDL_ControllerSensorEvent event) {
        constexpr float gravity_constant = 9.80665f;
        std::scoped_lock lock{mutex};
@@ -108,7 +105,6 @@ public:
        motion.delta_timestamp = time_difference * 1000;
        return true;
    }
-#endif

    const BasicMotion& GetMotion() const {
        return motion;
@@ -153,15 +149,13 @@ public:
    }

    bool HasHDRumble() const {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
        if (sdl_controller) {
-            auto const type = SDL_GameControllerGetType(sdl_controller.get());
+            const auto type = SDL_GameControllerGetType(sdl_controller.get());
            return (type == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO) ||
                   (type == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT) ||
                   (type == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT) ||
                   (type == SDL_CONTROLLER_TYPE_PS5);
        }
-#endif
        return false;
    }

@@ -258,21 +252,26 @@ public:
    }

    std::string GetControllerName() const {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
        if (sdl_controller) {
            switch (SDL_GameControllerGetType(sdl_controller.get())) {
-            case SDL_CONTROLLER_TYPE_XBOX360: return "Xbox 360 Controller";
-            case SDL_CONTROLLER_TYPE_XBOXONE: return "Xbox One Controller";
-            case SDL_CONTROLLER_TYPE_PS3: return "DualShock 3 Controller";
-            case SDL_CONTROLLER_TYPE_PS4: return "DualShock 4 Controller";
-            case SDL_CONTROLLER_TYPE_PS5: return "DualSense Controller";
+            case SDL_CONTROLLER_TYPE_XBOX360:
+                return "Xbox 360 Controller";
+            case SDL_CONTROLLER_TYPE_XBOXONE:
+                return "Xbox One Controller";
+            case SDL_CONTROLLER_TYPE_PS3:
+                return "DualShock 3 Controller";
+            case SDL_CONTROLLER_TYPE_PS4:
+                return "DualShock 4 Controller";
+            case SDL_CONTROLLER_TYPE_PS5:
+                return "DualSense Controller";
            default:
-                if (auto const name = SDL_GameControllerName(sdl_controller.get()); name)
-                    return name;
                break;
            }
+            const auto name = SDL_GameControllerName(sdl_controller.get());
+            if (name) {
+                return name;
+            }
        }
-#endif

        if (sdl_joystick) {
            const auto name = SDL_JoystickName(sdl_joystick.get());
@@ -457,7 +456,6 @@ void SDLDriver::HandleGameControllerEvent(const SDL_Event& event) {
        }
        break;
    }
-#if SDL_VERSION_ATLEAST(2, 26, 4)
    case SDL_CONTROLLERSENSORUPDATE: {
        if (auto joystick = GetSDLJoystickBySDLID(event.csensor.which)) {
            if (joystick->UpdateMotion(event.csensor)) {
@@ -474,7 +472,6 @@ void SDLDriver::HandleGameControllerEvent(const SDL_Event& event) {
        }
        break;
    }
-#endif
    case SDL_JOYDEVICEREMOVED:
        LOG_DEBUG(Input, "Controller removed with Instance_ID {}", event.jdevice.which);
        CloseJoystick(SDL_JoystickFromInstanceID(event.jdevice.which));
@@ -492,7 +489,6 @@ void SDLDriver::CloseJoysticks() {
 }

 SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
    // Set our application name. Currently passed to DBus by SDL and visible to the user through
    // their desktop environment.
    SDL_SetHint(SDL_HINT_APP_NAME, "Eden");
@@ -535,7 +531,6 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
    // Disable hidapi driver for xbox. Already default on Windows, this causes conflict with native
    // driver on Linux.
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_XBOX, "0");
-#endif

    // If the frontend is going to manage the event loop, then we don't start one here
    start_thread = SDL_WasInit(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) == 0;
@@ -840,7 +835,6 @@ ButtonBindings SDLDriver::GetDefaultButtonBinding(
    auto slr_button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
    auto srr_button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;

-#if SDL_VERSION_ATLEAST(2, 26, 4)
    if (joystick->IsJoyconLeft()) {
        sll_button = SDL_CONTROLLER_BUTTON_PADDLE2;
        srl_button = SDL_CONTROLLER_BUTTON_PADDLE4;
@@ -849,7 +843,6 @@ ButtonBindings SDLDriver::GetDefaultButtonBinding(
        slr_button = SDL_CONTROLLER_BUTTON_PADDLE3;
        srr_button = SDL_CONTROLLER_BUTTON_PADDLE1;
    }
-#endif

    return {
        std::pair{Settings::NativeButton::A, SDL_CONTROLLER_BUTTON_B},
@@ -871,9 +864,7 @@ ButtonBindings SDLDriver::GetDefaultButtonBinding(
        {Settings::NativeButton::SLRight, slr_button},
        {Settings::NativeButton::SRRight, srr_button},
        {Settings::NativeButton::Home, SDL_CONTROLLER_BUTTON_GUIDE},
-#if SDL_VERSION_ATLEAST(2, 26, 4)
        {Settings::NativeButton::Screenshot, SDL_CONTROLLER_BUTTON_MISC1},
-#endif
    };
 }

--- a/src/input_common/helpers/joycon_driver.cpp
+++ b/src/input_common/helpers/joycon_driver.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -41,8 +38,8 @@ Common::Input::DriverResult JoyconDriver::RequestDeviceAccess(SDL_hid_device_inf
        return Common::Input::DriverResult::UnsupportedControllerType;
    }

-#if SDL_VERSION_ATLEAST(2, 26, 4)
-    hidapi_handle->handle = SDL_hid_open(device_info->vendor_id, device_info->product_id, device_info->serial_number);
+    hidapi_handle->handle =
+        SDL_hid_open(device_info->vendor_id, device_info->product_id, device_info->serial_number);
    std::memcpy(&handle_serial_number, device_info->serial_number, 15);
    if (!hidapi_handle->handle) {
        LOG_ERROR(Input, "Yuzu can't gain access to this device: ID {:04X}:{:04X}.",
@@ -51,9 +48,6 @@ Common::Input::DriverResult JoyconDriver::RequestDeviceAccess(SDL_hid_device_inf
    }
    SDL_hid_set_nonblocking(hidapi_handle->handle, 1);
    return Common::Input::DriverResult::Success;
-#else
-    return Common::Input::DriverResult::UnsupportedControllerType;
-#endif
 }

 Common::Input::DriverResult JoyconDriver::InitializeDevice() {
@@ -144,6 +138,8 @@ void JoyconDriver::InputThread(std::stop_token stop_token) {
    Common::SetCurrentThreadName("JoyconInput");
    input_thread_running = true;

+    // Max update rate is 5ms, ensure we are always able to read a bit faster
+    constexpr int ThreadDelay = 3;
    std::vector<u8> buffer(MaxBufferSize);

    while (!stop_token.stop_requested()) {
@@ -154,17 +150,14 @@ void JoyconDriver::InputThread(std::stop_token stop_token) {
            continue;
        }

-#if SDL_VERSION_ATLEAST(2, 26, 4)
-        // Max update rate is 5ms, ensure we are always able to read a bit faster
-        int constexpr thread_delay = 3;
        // By disabling the input thread we can ensure custom commands will succeed as no package is
        // skipped
        if (!disable_input_thread) {
-            status = SDL_hid_read_timeout(hidapi_handle->handle, buffer.data(), buffer.size(), thread_delay);
+            status = SDL_hid_read_timeout(hidapi_handle->handle, buffer.data(), buffer.size(),
+                                          ThreadDelay);
        } else {
-            std::this_thread::sleep_for(std::chrono::milliseconds(thread_delay));
+            std::this_thread::sleep_for(std::chrono::milliseconds(ThreadDelay));
        }
-#endif

        if (IsPayloadCorrect(status, buffer)) {
            OnNewData(buffer);
@@ -697,18 +690,19 @@ void JoyconDriver::SetCallbacks(const JoyconCallbacks& callbacks) {
    joycon_poller->SetCallbacks(callbacks);
 }

-Common::Input::DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info, ControllerType& controller_type) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
+Common::Input::DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info,
+                                                        ControllerType& controller_type) {
    static constexpr std::array<std::pair<u32, ControllerType>, 6> supported_devices{
        std::pair<u32, ControllerType>{0x2006, ControllerType::Left},
        {0x2007, ControllerType::Right},
        {0x2009, ControllerType::Pro},
    };
-
    constexpr u16 nintendo_vendor_id = 0x057e;
+
    controller_type = ControllerType::None;
-    if (device_info->vendor_id != nintendo_vendor_id)
+    if (device_info->vendor_id != nintendo_vendor_id) {
        return Common::Input::DriverResult::UnsupportedControllerType;
+    }

    for (const auto& [product_id, type] : supported_devices) {
        if (device_info->product_id == static_cast<u16>(product_id)) {
@@ -716,20 +710,16 @@ Common::Input::DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* dev
            return Common::Input::DriverResult::Success;
        }
    }
-#endif
    return Common::Input::DriverResult::UnsupportedControllerType;
 }

-Common::Input::DriverResult JoyconDriver::GetSerialNumber(SDL_hid_device_info* device_info, SerialNumber& serial_number) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
+Common::Input::DriverResult JoyconDriver::GetSerialNumber(SDL_hid_device_info* device_info,
+                                                          SerialNumber& serial_number) {
    if (device_info->serial_number == nullptr) {
        return Common::Input::DriverResult::Unknown;
    }
    std::memcpy(&serial_number, device_info->serial_number, 15);
    return Common::Input::DriverResult::Success;
-#else
-    return Common::Input::DriverResult::Unknown;
-#endif
 }

 } // namespace InputCommon::Joycon
--- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp
+++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -18,15 +15,11 @@ u8 JoyconCommonProtocol::GetCounter() {
 }

 void JoyconCommonProtocol::SetBlocking() {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
    SDL_hid_set_nonblocking(hidapi_handle->handle, 0);
-#endif
 }

 void JoyconCommonProtocol::SetNonBlocking() {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
    SDL_hid_set_nonblocking(hidapi_handle->handle, 1);
-#endif
 }

 Common::Input::DriverResult JoyconCommonProtocol::GetDeviceType(ControllerType& controller_type) {
@@ -42,23 +35,26 @@ Common::Input::DriverResult JoyconCommonProtocol::GetDeviceType(ControllerType&
    return result;
 }

-Common::Input::DriverResult JoyconCommonProtocol::CheckDeviceAccess(SDL_hid_device_info* device_info) {
+Common::Input::DriverResult JoyconCommonProtocol::CheckDeviceAccess(
+    SDL_hid_device_info* device_info) {
    ControllerType controller_type{ControllerType::None};
    const auto result = GetDeviceType(controller_type);
+
    if (result != Common::Input::DriverResult::Success || controller_type == ControllerType::None) {
        return Common::Input::DriverResult::UnsupportedControllerType;
    }
-#if SDL_VERSION_ATLEAST(2, 26, 4)
-    hidapi_handle->handle = SDL_hid_open(device_info->vendor_id, device_info->product_id, device_info->serial_number);
+
+    hidapi_handle->handle =
+        SDL_hid_open(device_info->vendor_id, device_info->product_id, device_info->serial_number);
+
    if (!hidapi_handle->handle) {
-        LOG_ERROR(Input, "Yuzu can't gain access to this device: ID {:04X}:{:04X}.", device_info->vendor_id, device_info->product_id);
+        LOG_ERROR(Input, "Yuzu can't gain access to this device: ID {:04X}:{:04X}.",
+                  device_info->vendor_id, device_info->product_id);
        return Common::Input::DriverResult::HandleInUse;
    }
+
    SetNonBlocking();
    return Common::Input::DriverResult::Success;
-#else
-    return Common::Input::DriverResult::UnsupportedControllerType;
-#endif
 }

 Common::Input::DriverResult JoyconCommonProtocol::SetReportMode(ReportMode report_mode) {
@@ -67,21 +63,21 @@ Common::Input::DriverResult JoyconCommonProtocol::SetReportMode(ReportMode repor
 }

 Common::Input::DriverResult JoyconCommonProtocol::SendRawData(std::span<const u8> buffer) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
-    auto const result = SDL_hid_write(hidapi_handle->handle, buffer.data(), buffer.size());
-    if (result == -1)
+    const auto result = SDL_hid_write(hidapi_handle->handle, buffer.data(), buffer.size());
+
+    if (result == -1) {
        return Common::Input::DriverResult::ErrorWritingData;
+    }
+
    return Common::Input::DriverResult::Success;
-#else
-    return Common::Input::DriverResult::ErrorWritingData;
-#endif
 }

-Common::Input::DriverResult JoyconCommonProtocol::GetSubCommandResponse(SubCommand sc, SubCommandResponse& output) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
+Common::Input::DriverResult JoyconCommonProtocol::GetSubCommandResponse(
+    SubCommand sc, SubCommandResponse& output) {
    constexpr int timeout_mili = 66;
    constexpr int MaxTries = 10;
    int tries = 0;
+
    do {
        int result = SDL_hid_read_timeout(hidapi_handle->handle, reinterpret_cast<u8*>(&output),
                                          sizeof(SubCommandResponse), timeout_mili);
@@ -92,8 +88,9 @@ Common::Input::DriverResult JoyconCommonProtocol::GetSubCommandResponse(SubComma
        if (tries++ > MaxTries) {
            return Common::Input::DriverResult::Timeout;
        }
-    } while (output.input_report.report_mode != ReportMode::SUBCMD_REPLY && output.sub_command != sc);
-#endif
+    } while (output.input_report.report_mode != ReportMode::SUBCMD_REPLY &&
+             output.sub_command != sc);
+
    return Common::Input::DriverResult::Success;
 }

@@ -221,11 +218,12 @@ Common::Input::DriverResult JoyconCommonProtocol::ConfigureMCU(const MCUConfig&
    return result;
 }

-Common::Input::DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode, MCUCommandResponse& output) {
-#if SDL_VERSION_ATLEAST(2, 26, 4)
+Common::Input::DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode report_mode,
+                                                                     MCUCommandResponse& output) {
    constexpr int TimeoutMili = 200;
    constexpr int MaxTries = 9;
    int tries = 0;
+
    do {
        int result = SDL_hid_read_timeout(hidapi_handle->handle, reinterpret_cast<u8*>(&output),
                                          sizeof(MCUCommandResponse), TimeoutMili);
@@ -236,8 +234,9 @@ Common::Input::DriverResult JoyconCommonProtocol::GetMCUDataResponse(ReportMode
        if (tries++ > MaxTries) {
            return Common::Input::DriverResult::Timeout;
        }
-    } while (output.input_report.report_mode != report_mode || output.mcu_report == MCUReport::EmptyAwaitingCmd);
-#endif
+    } while (output.input_report.report_mode != report_mode ||
+             output.mcu_report == MCUReport::EmptyAwaitingCmd);
+
    return Common::Input::DriverResult::Success;
 }

--- a/src/input_common/helpers/joycon_protocol/joycon_types.h
+++ b/src/input_common/helpers/joycon_protocol/joycon_types.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -13,14 +10,7 @@

 #include <array>
 #include <functional>
-
-#include <SDL.h>
-#if SDL_VERSION_ATLEAST(2, 26, 4)
-#   include <SDL_hidapi.h>
-#else
-struct SDL_hid_device;
-struct SDL_hid_device_info;
-#endif
+#include <SDL_hidapi.h>

 #include "common/bit_field.h"
 #include "common/common_funcs.h"
--- a/src/input_common/helpers/joycon_protocol/poller.cpp
+++ b/src/input_common/helpers/joycon_protocol/poller.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -82,10 +82,7 @@ struct InputSubsystem::Impl {
 #ifdef ENABLE_LIBUSB
        RegisterEngine("gcpad", gcadapter);
 #endif
-#ifndef __OPENORBIS__
-        // TODO: Issue in PS4, crash for UDP_client
        RegisterEngine("cemuhookudp", udp_client);
-#endif
        RegisterEngine("tas", tas_input);
        RegisterEngine("camera", camera);
 #ifdef ANDROID
@@ -119,9 +116,7 @@ struct InputSubsystem::Impl {
 #ifdef ENABLE_LIBUSB
        UnregisterEngine(gcadapter);
 #endif
-#ifndef __OPENORBIS__
        UnregisterEngine(udp_client);
-#endif
        UnregisterEngine(tas_input);
        UnregisterEngine(camera);
 #ifdef ANDROID
@@ -157,10 +152,8 @@ struct InputSubsystem::Impl {
        auto gcadapter_devices = gcadapter->GetInputDevices();
        devices.insert(devices.end(), gcadapter_devices.begin(), gcadapter_devices.end());
 #endif
-#ifndef __OPENORBIS__
        auto udp_devices = udp_client->GetInputDevices();
        devices.insert(devices.end(), udp_devices.begin(), udp_devices.end());
-#endif
 #ifdef HAVE_SDL2
        auto joycon_devices = joycon->GetInputDevices();
        devices.insert(devices.end(), joycon_devices.begin(), joycon_devices.end());
@@ -193,11 +186,9 @@ struct InputSubsystem::Impl {
            return gcadapter;
        }
 #endif
-#ifndef __OPENORBIS__
        if (engine == udp_client->GetEngineName()) {
            return udp_client;
        }
-#endif
 #ifdef HAVE_SDL2
        if (engine == sdl->GetEngineName()) {
            return sdl;
@@ -280,11 +271,9 @@ struct InputSubsystem::Impl {
            return true;
        }
 #endif
-#ifndef __OPENORBIS__
        if (engine == udp_client->GetEngineName()) {
            return true;
        }
-#endif
        if (engine == tas_input->GetEngineName()) {
            return true;
        }
@@ -311,9 +300,7 @@ struct InputSubsystem::Impl {
 #ifdef ENABLE_LIBUSB
        gcadapter->BeginConfiguration();
 #endif
-#ifndef __OPENORBIS__
        udp_client->BeginConfiguration();
-#endif
 #ifdef HAVE_SDL2
        sdl->BeginConfiguration();
        joycon->BeginConfiguration();
@@ -329,9 +316,7 @@ struct InputSubsystem::Impl {
 #ifdef ENABLE_LIBUSB
        gcadapter->EndConfiguration();
 #endif
-#ifndef __OPENORBIS__
        udp_client->EndConfiguration();
-#endif
 #ifdef HAVE_SDL2
        sdl->EndConfiguration();
        joycon->EndConfiguration();
@@ -356,9 +341,7 @@ struct InputSubsystem::Impl {
    std::shared_ptr<Mouse> mouse;
    std::shared_ptr<TouchScreen> touch_screen;
    std::shared_ptr<TasInput::Tas> tas_input;
-#ifndef __OPENORBIS__
    std::shared_ptr<CemuhookUDP::UDPClient> udp_client;
-#endif
    std::shared_ptr<Camera> camera;
    std::shared_ptr<VirtualAmiibo> virtual_amiibo;
    std::shared_ptr<VirtualGamepad> virtual_gamepad;
@@ -487,9 +470,7 @@ bool InputSubsystem::IsStickInverted(const Common::ParamPackage& params) const {
 }

 void InputSubsystem::ReloadInputDevices() {
-#ifndef __OPENORBIS__
    impl->udp_client.get()->ReloadSockets();
-#endif
 }

 void InputSubsystem::BeginMapping(Polling::InputType type) {
--- a/src/network/room_member.h
+++ b/src/network/room_member.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -56,7 +53,7 @@ struct ChatEntry {

 /// Represents a system status message.
 struct StatusMessageEntry {
-    StatusMessageTypes type{}; ///< Type of the message
+    StatusMessageTypes type; ///< Type of the message
    /// Subject of the message. i.e. the user who is joining/leaving/being banned, etc.
    std::string nickname;
    std::string username;
--- a/src/qt_common/config/shared_translation.cpp
+++ b/src/qt_common/config/shared_translation.cpp
@@ -324,6 +324,13 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
           tr("Improves rendering of transparency effects in specific games."));

    // Renderer (Extensions)
+    INSERT(Settings,
+           sample_shading_fraction,
+           tr("Sample Shading"),
+           tr("Allows the fragment shader to execute per sample in a multi-sampled fragment "
+           "instead of once per fragment. Improves graphics quality at the cost of performance.\n"
+           "Higher values improve quality but degrade performance."));
+
    INSERT(Settings,
           dyna_state,
           tr("Extended Dynamic State"),
@@ -346,15 +353,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
           tr("Improves texture & buffer handling and the Maxwell translation layer.\n"
              "Some Vulkan 1.1+ and all 1.2+ devices support this extension."));

-    INSERT(Settings, sample_shading, QString(), QString());
-
-    INSERT(Settings,
-           sample_shading_fraction,
-           tr("Sample Shading"),
-           tr("Allows the fragment shader to execute per sample in a multi-sampled fragment "
-              "instead of once per fragment. Improves graphics quality at the cost of performance.\n"
-              "Higher values improve quality but degrade performance."));
-
    // Renderer (Debug)

    // System
--- a/src/qt_common/config/uisettings.h
+++ b/src/qt_common/config/uisettings.h
@@ -159,13 +159,7 @@ struct Values {
    Setting<bool> enable_discord_presence{linkage, false, "enable_discord_presence", Category::Ui};

    // logging
-    Setting<bool> show_console{linkage,
-#ifdef __OPENORBIS__
-        true,
-#else
-        false,
-#endif
-        "showConsole", Category::Ui};
+    Setting<bool> show_console{linkage, false, "showConsole", Category::Ui};

    // Screenshots
    Setting<bool> enable_screenshot_save_as{linkage, true, "enable_screenshot_save_as",
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -1705,26 +1705,21 @@ Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
        return NULL_BINDING;
    }

-    // xbzk: New size logic. Fixes MCI.
-    // If ever the * comment below prove wrong, the 'if' block may be removed.
    const auto size = [&]() {
        const bool is_nvn_cbuf = cbuf_index == 0;
+        // The NVN driver buffer (index 0) is known to pack the SSBO address followed by its size.
        if (is_nvn_cbuf) {
-            // * The NVN driver buffer (index 0) is known to pack the SSBO address followed by its size.
-            const u64 next_qword = gpu_memory->Read<u64>(ssbo_addr + 8);
-            const u32 upper_32 = static_cast<u32>(next_qword >> 32);
-            // Hardware-based detection: GPU addresses have non-zero upper bits
-            if (upper_32 == 0) {
-                // This is a size field, not a GPU address
-                return static_cast<u32>(next_qword);  // Return lower_32
+            const u32 ssbo_size = gpu_memory->Read<u32>(ssbo_addr + 8);
+            if (ssbo_size != 0) {
+                return ssbo_size;
            }
        }
-        // Fall through: either not NVN cbuf (Doom Eternal & +), or NVN but ssbo_addr+8 is a GPU address (MCI)
+        // Other titles (notably Doom Eternal) may use STG/LDG on buffer addresses in custom defined
+        // cbufs, which do not store the sizes adjacent to the addresses, so use the fully
+        // mapped buffer size for now.
        const u32 memory_layout_size = static_cast<u32>(gpu_memory->GetMemoryLayoutSize(gpu_addr));
-        // Cap at 8MB to prevent allocator overflow from misinterpreted addresses
        return (std::min)(memory_layout_size, static_cast<u32>(8_MiB));
    }();
-
    // Alignment only applies to the offset of the buffer
    const u32 alignment = runtime.GetStorageBufferAlignment();
    const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment);
--- a/src/video_core/control/scheduler.cpp
+++ b/src/video_core/control/scheduler.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -20,7 +17,7 @@ void Scheduler::Push(s32 channel, CommandList&& entries) {
    std::unique_lock lk(scheduling_guard);
    auto it = channels.find(channel);
    ASSERT(it != channels.end());
-    auto& channel_state = it->second;
+    auto channel_state = it->second;
    gpu.BindChannel(channel_state->bind_id);
    channel_state->dma_pusher->Push(std::move(entries));
    channel_state->dma_pusher->DispatchCalls();
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -744,8 +744,8 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
        .pNext = nullptr,
        .flags = 0,
        .rasterizationSamples = MaxwellToVK::MsaaMode(key.state.msaa_mode),
-        .sampleShadingEnable = Settings::values.sample_shading.GetValue() ? VK_TRUE : VK_FALSE,
-        .minSampleShading = static_cast<float>(Settings::values.sample_shading_fraction.GetValue()) / 100.0f,
+        .sampleShadingEnable = Settings::values.sample_shading_fraction.GetValue() > 0 ? VK_TRUE : VK_FALSE,
+        .minSampleShading = float(Settings::values.sample_shading_fraction.GetValue()) / 100.0f,
        .pSampleMask = nullptr,
        .alphaToCoverageEnable = key.state.alpha_to_coverage_enabled != 0 ? VK_TRUE : VK_FALSE,
        .alphaToOneEnable = key.state.alpha_to_one_enabled != 0 ? VK_TRUE : VK_FALSE,
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -108,7 +108,7 @@ VkViewport GetViewportState(const Device& device, const Maxwell& regs, size_t in

 VkRect2D GetScissorState(const Maxwell& regs, size_t index, u32 up_scale = 1, u32 down_shift = 0) {
    const auto& src = regs.scissor_test[index];
-    VkRect2D scissor{};
+    VkRect2D scissor;
    const auto scale_up = [&](s32 value) -> s32 {
        if (value == 0) {
            return 0U;
@@ -374,7 +374,7 @@ void RasterizerVulkan::Clear(u32 layer_count) {
    }
    UpdateViewportsState(regs);

-    VkRect2D default_scissor{};
+    VkRect2D default_scissor;
    default_scissor.offset.x = 0;
    default_scissor.offset.y = 0;
    default_scissor.extent.width = (std::numeric_limits<s32>::max)();
--- a/src/video_core/vulkan_common/vulkan.h
+++ b/src/video_core/vulkan_common/vulkan.h
@@ -15,8 +15,6 @@
 #define VK_USE_PLATFORM_ANDROID_KHR
 #elif defined(__HAIKU__)
 #define VK_USE_PLATFORM_XCB_KHR
-#elif defined(__OPENORBIS__)
-// No fucking vulkan on the PlayStation 4
 #else
 #define VK_USE_PLATFORM_XLIB_KHR
 #define VK_USE_PLATFORM_WAYLAND_KHR
--- a/src/video_core/vulkan_common/vulkan_instance.cpp
+++ b/src/video_core/vulkan_common/vulkan_instance.cpp
@@ -57,8 +57,6 @@ namespace {
    case Core::Frontend::WindowSystemType::Xcb:
        extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
        break;
-#elif defined(__OPENORBIS__)
-    // No vulkan
 #else
    case Core::Frontend::WindowSystemType::X11:
        extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
--- a/src/video_core/vulkan_common/vulkan_surface.cpp
+++ b/src/video_core/vulkan_common/vulkan_surface.cpp
@@ -74,8 +74,6 @@ vk::SurfaceKHR CreateSurface(
            throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
        }
    }
-#elif defined(__OPENORBIS__)
-    // No native
 #else
    if (window_info.type == Core::Frontend::WindowSystemType::X11) {
        const VkXlibSurfaceCreateInfoKHR xlib_ci{
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -435,8 +435,7 @@ if (YUZU_USE_BUNDLED_QT)
 endif()

 if (ENABLE_SDL2)
-    target_include_directories(yuzu PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-    target_link_libraries(yuzu PRIVATE SDL2)
+    target_link_libraries(yuzu PRIVATE SDL2::SDL2)
    target_compile_definitions(yuzu PRIVATE HAVE_SDL2)
 endif()

--- a/src/yuzu/configuration/configure_input.h
+++ b/src/yuzu/configuration/configure_input.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2016 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -74,11 +71,11 @@ private:

    std::unique_ptr<InputProfiles> profiles;

-    std::array<ConfigureInputPlayer*, 8> player_controllers{};
-    std::array<QWidget*, 8> player_tabs{};
+    std::array<ConfigureInputPlayer*, 8> player_controllers;
+    std::array<QWidget*, 8> player_tabs;
    // Checkboxes representing the "Connected Controllers".
-    std::array<QCheckBox*, 8> connected_controller_checkboxes{};
-    ConfigureInputAdvanced* advanced = nullptr;
+    std::array<QCheckBox*, 8> connected_controller_checkboxes;
+    ConfigureInputAdvanced* advanced;

    Core::System& system;
 };
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -692,10 +689,10 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen
    {
        // Draw joysticks
        using namespace Settings::NativeAnalog;
-        const auto& l_stick = QPointF(stick_values[LStick].x.value, stick_values[LStick].y.value);
-        const auto& l_button = button_values[Settings::NativeButton::LStick];
-        const auto& r_stick = QPointF(stick_values[RStick].x.value, stick_values[RStick].y.value);
-        const auto& r_button = button_values[Settings::NativeButton::RStick];
+        const auto l_stick = QPointF(stick_values[LStick].x.value, stick_values[LStick].y.value);
+        const auto l_button = button_values[Settings::NativeButton::LStick];
+        const auto r_stick = QPointF(stick_values[RStick].x.value, stick_values[RStick].y.value);
+        const auto r_button = button_values[Settings::NativeButton::RStick];

        DrawJoystick(p, center + QPointF(-171, -41) + (l_stick * 4), 1.0f, l_button);
        DrawJoystick(p, center + QPointF(171, 8) + (r_stick * 4), 1.0f, r_button);
--- a/src/yuzu/configuration/configure_input_player_widget.h
+++ b/src/yuzu/configuration/configure_input_player_widget.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -217,7 +214,7 @@ private:

    bool mapping_active{};
    int blink_counter{};
-    int callback_key{};
+    int callback_key;
    QColor button_color{};
    ColorMapping colors{};
    Core::HID::LedPattern led_pattern{0, 0, 0, 0};
--- a/src/yuzu/main_window.cpp
+++ b/src/yuzu/main_window.cpp
@@ -1495,7 +1495,7 @@ void MainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
            (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) {
            auto_paused = true;
            OnPauseGame();
-        } else if (!emu_thread->IsRunning() && auto_paused && (state & Qt::ApplicationActive)) {
+        } else if (!emu_thread->IsRunning() && auto_paused && state == Qt::ApplicationActive) {
            auto_paused = false;
            OnStartGame();
        }
@@ -1505,7 +1505,7 @@ void MainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
            (state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) {
            Settings::values.audio_muted = true;
            auto_muted = true;
-        } else if (auto_muted && (state & Qt::ApplicationActive)) {
+        } else if (auto_muted && state == Qt::ApplicationActive) {
            Settings::values.audio_muted = false;
            auto_muted = false;
        }
--- a/src/yuzu/main_window.h
+++ b/src/yuzu/main_window.h
@@ -482,13 +482,13 @@ private:

    MultiplayerState* multiplayer_state = nullptr;

-    GRenderWindow* render_window = nullptr;
-    GameList* game_list = nullptr;
-    LoadingScreen* loading_screen = nullptr;
+    GRenderWindow* render_window;
+    GameList* game_list;
+    LoadingScreen* loading_screen;
    QTimer shutdown_timer;
    OverlayDialog* shutdown_dialog{};

-    GameListPlaceholder* game_list_placeholder = nullptr;
+    GameListPlaceholder* game_list_placeholder;

    std::vector<VkDeviceInfo::Record> vk_device_records;

@@ -531,7 +531,7 @@ private:
    QString startup_icon_theme;

    // Debugger panes
-    ControllerDialog* controller_dialog = nullptr;
+    ControllerDialog* controller_dialog;

    QAction* actions_recent_files[max_recent_files_item];

@@ -543,7 +543,7 @@ private:
    QTranslator translator;

    // Install progress dialog
-    QProgressDialog* install_progress = nullptr;
+    QProgressDialog* install_progress;

    // Last game booted, used for multi-process apps
    QString last_filename_booted;
--- a/src/yuzu/multiplayer/lobby_p.h
+++ b/src/yuzu/multiplayer/lobby_p.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -178,7 +175,7 @@ public:
 private:
    QString username;
    QString nickname;
-    u64 title_id{};
+    u64 title_id;
    QString game_name;
 };

--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -34,16 +34,13 @@ target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common
 target_link_libraries(yuzu-cmd PRIVATE glad)
 if (MSVC)
    target_link_libraries(yuzu-cmd PRIVATE getopt)
-elseif(PLATFORM_PS4)
-    target_link_libraries(yuzu-cmd PRIVATE SceVideoOut SceAudioOut ScePad SceSystemService)
 endif()
 target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)

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

-target_include_directories(yuzu-cmd PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-target_link_libraries(yuzu-cmd PRIVATE SDL2)
+target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2)

 if(UNIX AND NOT APPLE)
    install(TARGETS yuzu-cmd)
@@ -68,7 +65,3 @@ if (NOT MSVC)
        -Wno-unused-parameter
        -Wno-missing-field-initializers)
 endif()
-
-if (PLATFORM_PS4)
-    create_ps4_pkg(yuzu-cmd eden-cli IV0000-BREW00090_00-EDENEMULAT000000)
-endif()
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -77,12 +74,6 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
        window_info.type = Core::Frontend::WindowSystemType::Android;
        window_info.render_surface = reinterpret_cast<void*>(wm.info.android.window);
        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_DIRECTFB
-    case SDL_SYSWM_TYPE::SDL_SYSWM_DIRECTFB:
-        window_info.type = Core::Frontend::WindowSystemType::Headless;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.dfb.window);
-        break;
 #endif
    default:
        LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem);
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -51,20 +51,7 @@
 #include <unistd.h>
 #endif

-#ifdef __OPENORBIS__
-#include <orbis/SystemService.h>
-#include <cxxabi.h>
-#include <__thread/support.h>
-#   define STUB_WEAK(name) extern "C" void name() { printf("called " #name); asm volatile("ud2"); }
-void *__cxa_thread_atexit_impl = nullptr;
-STUB_WEAK(__assert)
-STUB_WEAK(ZSTD_trace_compress_begin)
-STUB_WEAK(ZSTD_trace_compress_end)
-STUB_WEAK(ZSTD_trace_decompress_begin)
-STUB_WEAK(ZSTD_trace_decompress_end)
-FILE* __stderrp = stdout;
-#   undef STUB_WEAK
-#elif defined(_WIN32)
+#ifdef _WIN32
 extern "C" {
 // tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable
 // graphics
@@ -237,11 +224,7 @@ int main(int argc, char** argv) {
        {0, 0, 0, 0},
        // clang-format on
    };
-#ifdef __OPENORBIS__
-    // PS4 will use this path by default UNLESS overriden; this is so users
-    // can quickly launch whatever they want.
-    filepath = "/data/eden/games/test.nro";
-#endif
+
    while (optind < argc) {
        int arg = getopt_long(argc, argv, "g:fhvp::c:u:d:", long_options, &option_index);
        if (arg != -1) {
@@ -436,20 +419,10 @@ int main(int argc, char** argv) {
            [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
    }

-    auto const exit_fn = [&] {
-#ifdef __OPENORBIS__
-        sceSystemServiceLoadExec("EXIT", nullptr);
-#else
+    system.RegisterExitCallback([&] {
        // Just exit right away.
        exit(0);
-#endif
-    };
-    system.RegisterExitCallback(exit_fn);
-
-#ifdef __linux__
-    Common::Linux::StartGamemode();
-#endif
-
+    });
    void(system.Run());
    if (system.DebuggerEnabled()) {
        system.InitializeDebugger();
@@ -461,7 +434,6 @@ int main(int argc, char** argv) {
    void(system.Pause());
    system.ShutdownMainProcess();
    detached_tasks.WaitForAllTasks();
-    exit_fn();
    return 0;
 }
Author	SHA1	Message	Date
Caio Oliveira	a443a815a3	updates Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>	2025-12-25 23:44:07 -03:00
lizzie	82338a464c	fx	2025-12-25 23:34:05 -03:00
lizzie	65054c33e9	[vk] remove redundant "enable" of sample shading	2025-12-25 23:34:05 -03:00