From 5511f7a0c4409000d349ffe4d0e0423704bbb3ec Mon Sep 17 00:00:00 2001
From: Dave Lane <42013603+ReenigneArcher@users.noreply.github.com>
Date: Wed, 8 Jul 2026 18:59:03 -0400
Subject: [PATCH] chore: move nanors to moonlight-common-c submodule (#5393)

---
 .gitmodules                            |  4 ----
 cmake/compile_definitions/common.cmake | 10 +++++-----
 third-party/nanors                     |  1 -
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 160000 third-party/nanors

diff --git a/.gitmodules b/.gitmodules
index e1b90b926..308be2aa5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,10 +29,6 @@
 	path = third-party/moonlight-common-c
 	url = https://github.com/moonlight-stream/moonlight-common-c.git
 	branch = master
-[submodule "third-party/nanors"]
-	path = third-party/nanors
-	url = https://github.com/sleepybishop/nanors.git
-	branch = master
 [submodule "third-party/nv-codec-headers"]
 	path = third-party/nv-codec-headers
 	url = https://github.com/FFmpeg/nv-codec-headers.git
diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake
index e3d521fc2..924f2f5fa 100644
--- a/cmake/compile_definitions/common.cmake
+++ b/cmake/compile_definitions/common.cmake
@@ -62,9 +62,9 @@ set(SUNSHINE_TARGET_FILES
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Rtsp.h"
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/RtspParser.c"
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Video.h"
-        "${CMAKE_SOURCE_DIR}/third-party/nanors/deps/obl/oblas_common.c"
-        "${CMAKE_SOURCE_DIR}/third-party/nanors/deps/obl/oblas_lite.c"
-        "${CMAKE_SOURCE_DIR}/third-party/nanors/rs.c"
+        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/deps/obl/oblas_common.c"
+        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/deps/obl/oblas_lite.c"
+        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/rs.c"
         "${CMAKE_SOURCE_DIR}/src/upnp.cpp"
         "${CMAKE_SOURCE_DIR}/src/upnp.h"
         "${CMAKE_SOURCE_DIR}/src/cbs.cpp"
@@ -138,8 +138,8 @@ include_directories(
         SYSTEM
         "${CMAKE_SOURCE_DIR}/third-party"
         "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/enet/include"
-        "${CMAKE_SOURCE_DIR}/third-party/nanors"
-        "${CMAKE_SOURCE_DIR}/third-party/nanors/deps/obl"
+        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors"
+        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/deps/obl"
         ${OPENSSL_INCLUDE_DIR}
         ${Opus_INCLUDE_DIR}
         ${FFMPEG_INCLUDE_DIRS}
diff --git a/third-party/nanors b/third-party/nanors
deleted file mode 160000
index c3529fda5..000000000
--- a/third-party/nanors
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3529fda520f53cd007328ba30b6ad3f89947722