From 6353a7c597790e78173e50d78e200098de6629da Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Sat, 24 Jan 2026 20:02:12 +0000
Subject: [PATCH] make a bit more mergeable

---
 .ci/ps4/build.sh                     | 1 +
 src/audio_core/CMakeLists.txt        | 6 +++---
 src/hid_core/resources/npad/npad.cpp | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ci/ps4/build.sh b/.ci/ps4/build.sh
index b167b65ef5..2fdcd01c68 100755
--- a/.ci/ps4/build.sh
+++ b/.ci/ps4/build.sh
@@ -52,6 +52,7 @@ cmake -S . -B build -G "Unix Makefiles" \
     -DCPMUTIL_FORCE_BUNDLED=ON \
     -DYUZU_USE_EXTERNAL_FFMPEG=ON \
     -DYUZU_USE_CPM=ON \
+    -DDYNARMIC_ENABLE_NO_EXECUTE_SUPPORT=OFF \
     -DDYNARMIC_TESTS=ON \
     -DYUZU_USE_EXTERNAL_SDL2=ON \
     "${EXTRA_CMAKE_FLAGS[@]}" || exit
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index 9dbedce574..90ee460b55 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
@@ -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()
 
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index 63ffd90d04..a0f72ab298 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -1340,6 +1340,7 @@ void NPad::UpdateHandheldAbstractState() {
 void NPad::EnableAppletToGetInput(u64 aruid) {
     std::scoped_lock lock{mutex};
     std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
+
     for (auto& abstract_pad : abstracted_pads) {
         abstract_pad.EnableAppletToGetInput(aruid);
     }