From 4103f574041a8c442be5d638596b435ac3527c58 Mon Sep 17 00:00:00 2001 From: lizzie Date: Fri, 17 Oct 2025 23:25:07 +0000 Subject: [PATCH] even more wattOS fixes Signed-off-by: lizzie --- src/audio_core/in/audio_in_system.cpp | 3 +++ src/audio_core/out/audio_out_system.cpp | 3 +++ src/core/hle/service/nvnflinger/hardware_composer.cpp | 4 ++++ src/core/hle/service/nvnflinger/parcel.h | 7 +++++++ src/input_common/drivers/udp_client.cpp | 1 + src/tests/input_common/calibration_configuration_job.cpp | 4 ++++ src/video_core/shader_cache.cpp | 3 +++ 7 files changed, 25 insertions(+) diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cpp index ac842f9e9e..44fd5ce7b6 100644 --- a/src/audio_core/in/audio_in_system.cpp +++ b/src/audio_core/in/audio_in_system.cpp @@ -1,3 +1,6 @@ +// 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 diff --git a/src/audio_core/out/audio_out_system.cpp b/src/audio_core/out/audio_out_system.cpp index 0c01dc010f..d65f445b6a 100644 --- a/src/audio_core/out/audio_out_system.cpp +++ b/src/audio_core/out/audio_out_system.cpp @@ -1,3 +1,6 @@ +// 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 diff --git a/src/core/hle/service/nvnflinger/hardware_composer.cpp b/src/core/hle/service/nvnflinger/hardware_composer.cpp index 5c0515d473..85634b591b 100644 --- a/src/core/hle/service/nvnflinger/hardware_composer.cpp +++ b/src/core/hle/service/nvnflinger/hardware_composer.cpp @@ -48,7 +48,11 @@ HardwareComposer::~HardwareComposer() = default; u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, Display& display, Nvidia::Devices::nvdisp_disp0& nvdisp) { +#if BOOST_VERSION >= 108100 || __GNUC__ > 12 boost::container::small_vector composition_stack; +#else //TODO: debian stable + std::vector composition_stack; +#endif // Set default speed limit to 100%. *out_speed_scale = 1.0f; diff --git a/src/core/hle/service/nvnflinger/parcel.h b/src/core/hle/service/nvnflinger/parcel.h index e2c9bbd50f..4567942016 100644 --- a/src/core/hle/service/nvnflinger/parcel.h +++ b/src/core/hle/service/nvnflinger/parcel.h @@ -1,3 +1,6 @@ +// 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-3.0-or-later @@ -180,7 +183,11 @@ private: private: boost::container::small_vector m_data_buffer; boost::container::small_vector m_object_buffer; +#if BOOST_VERSION >= 108100 || __GNUC__ > 12 boost::container::small_vector m_output_buffer; +#else //TODO: debian stable + std::vector m_output_buffer; +#endif }; } // namespace Service::android diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index fea33335ae..9e29d56cba 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -5,6 +5,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include +#include #include #include diff --git a/src/tests/input_common/calibration_configuration_job.cpp b/src/tests/input_common/calibration_configuration_job.cpp index 8f5466253c..d67d1cbbb4 100644 --- a/src/tests/input_common/calibration_configuration_job.cpp +++ b/src/tests/input_common/calibration_configuration_job.cpp @@ -1,9 +1,13 @@ +// 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 #include #include #include +#include #include #include #include diff --git a/src/video_core/shader_cache.cpp b/src/video_core/shader_cache.cpp index ef20540dbd..8a349bfe2a 100644 --- a/src/video_core/shader_cache.cpp +++ b/src/video_core/shader_cache.cpp @@ -1,3 +1,6 @@ +// 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