make a bit more mergeable

.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

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()
 

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);
     }