From ccd735ec8a7c7667401682be6e4aca8e89d941e2 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Wed, 19 Jun 2024 12:54:57 -0600
Subject: [PATCH 1/2] hardware_composer.cpp: Add missing includes

---
 src/core/hle/service/nvnflinger/hardware_composer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/core/hle/service/nvnflinger/hardware_composer.cpp b/src/core/hle/service/nvnflinger/hardware_composer.cpp
index f2dfe85a96..2433f5017e 100644
--- a/src/core/hle/service/nvnflinger/hardware_composer.cpp
+++ b/src/core/hle/service/nvnflinger/hardware_composer.cpp
@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <boost/container/small_vector.hpp>
+#include <optional>
 
+#include "common/common_types.h"
 #include "common/microprofile.h"
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvnflinger/buffer_item.h"

From c432641245701beb61f61c4b02e42ff07f6c9178 Mon Sep 17 00:00:00 2001
From: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Tue, 18 Jun 2024 18:34:59 -0600
Subject: [PATCH 2/2] MacOS: Fix Debugger namespace naming confilct

---
 src/yuzu/configuration/configure_debug.cpp | 2 +-
 src/yuzu/debugger/console.cpp              | 4 ++--
 src/yuzu/debugger/console.h                | 4 ++--
 src/yuzu/main.cpp                          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp
index 1010038b76..469a33079c 100644
--- a/src/yuzu/configuration/configure_debug.cpp
+++ b/src/yuzu/configuration/configure_debug.cpp
@@ -111,7 +111,7 @@ void ConfigureDebug::ApplyConfiguration() {
     Settings::values.extended_logging = ui->extended_logging->isChecked();
     Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
     UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
-    Debugger::ToggleConsole();
+    DebuggerYuzu::ToggleConsole();
     Common::Log::Filter filter;
     filter.ParseFilterString(Settings::values.log_filter.GetValue());
     Common::Log::SetGlobalFilter(filter);
diff --git a/src/yuzu/debugger/console.cpp b/src/yuzu/debugger/console.cpp
index 1c1342ff18..7e52dfdac9 100644
--- a/src/yuzu/debugger/console.cpp
+++ b/src/yuzu/debugger/console.cpp
@@ -11,7 +11,7 @@
 #include "yuzu/debugger/console.h"
 #include "yuzu/uisettings.h"
 
-namespace Debugger {
+namespace DebuggerYuzu {
 void ToggleConsole() {
     static bool console_shown = false;
     if (console_shown == UISettings::values.show_console.GetValue()) {
@@ -46,4 +46,4 @@ void ToggleConsole() {
     SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue());
 #endif
 }
-} // namespace Debugger
+} // namespace DebuggerYuzu
diff --git a/src/yuzu/debugger/console.h b/src/yuzu/debugger/console.h
index 2491d1ec14..fa40d48ec5 100644
--- a/src/yuzu/debugger/console.h
+++ b/src/yuzu/debugger/console.h
@@ -3,11 +3,11 @@
 
 #pragma once
 
-namespace Debugger {
+namespace DebuggerYuzu {
 
 /**
  * Uses the WINAPI to hide or show the stderr console. This function is a placeholder until we can
  * get a real qt logging window which would work for all platforms.
  */
 void ToggleConsole();
-} // namespace Debugger
+} // namespace DebuggerYuzu
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 5fc77ed6bf..4b160223cd 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1420,7 +1420,7 @@ void GMainWindow::RestoreUIState() {
 
     ui->action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar.GetValue());
     statusBar()->setVisible(ui->action_Show_Status_Bar->isChecked());
-    Debugger::ToggleConsole();
+    DebuggerYuzu::ToggleConsole();
 }
 
 void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {