Thirdparty: Harmonize patches to document downstream changes

Author: akien-mga

COPYRIGHT.txt

@@ -411,6 +411,11 @@ Comment: FastLZ
 Copyright: 2005-2020, Ariya Hidayat
 License: Expat
 
+Files: thirdparty/misc/FastNoiseLite.h
+Comment: FastNoise Lite
+Copyright: 2023, Jordan Peck and contributors
+License: Expat
+
 Files: thirdparty/misc/ifaddrs-android.cc
  thirdparty/misc/ifaddrs-android.h
 Comment: libjingle
@@ -423,17 +428,17 @@ Comment: Tangent Space Normal Maps implementation
 Copyright: 2011, Morten S. Mikkelsen
 License: Zlib
 
+Files: thirdparty/misc/nvapi_minimal.h
+Comment: NVIDIA NVAPI (minimal excerpt)
+Copyright: 2019-2022, NVIDIA Corporation
+License: Expat
+
 Files: thirdparty/misc/ok_color.h
  thirdparty/misc/ok_color_shader.h
 Comment: OK Lab color space
 Copyright: 2021, Björn Ottosson
 License: Expat
 
-Files: thirdparty/noise/FastNoiseLite.h
-Comment: FastNoise Lite
-Copyright: 2023, Jordan Peck and contributors
-License: Expat
-
 Files: thirdparty/misc/pcg.cpp
  thirdparty/misc/pcg.h
 Comment: Minimal PCG32 implementation
@@ -484,11 +489,6 @@ Comment: Multi-channel signed distance field generator
 Copyright: 2014-2024, Viktor Chlumsky
 License: Expat
 
-Files: thirdparty/nvapi/nvapi_minimal.h
-Comment: Stripped down version of "nvapi.h" from the NVIDIA NVAPI SDK
-Copyright: 2019-2022, NVIDIA Corporation
-License: Expat
-
 Files: thirdparty/openxr/*
 Comment: OpenXR Loader
 Copyright: 2020-2023, The Khronos Group Inc.

misc/error_suppressions/ubsan.txt

@@ -57,7 +57,7 @@ nonnull-attribute:thirdparty/spirv-reflect/spirv_reflect.c
 pointer-overflow:thirdparty/libogg/framing.c
 shift-base:thirdparty/libogg/bitwise.c
 shift-base:thirdparty/libvorbis/sharedbook.c
-shift-base:thirdparty/noise/FastNoiseLite.h
+shift-base:thirdparty/misc/FastNoiseLite.h
 shift-base:thirdparty/tinyexr/tinyexr.h
 shift-exponent:thirdparty/misc/mikktspace.c
-signed-integer-overflow:thirdparty/noise/FastNoiseLite.h
+signed-integer-overflow:thirdparty/misc/FastNoiseLite.h

modules/enet/SCsub

@@ -13,7 +13,7 @@ thirdparty_obj = []
 if env["builtin_enet"]:
     thirdparty_dir = "#thirdparty/enet/"
     thirdparty_sources = [
-        "godot.cpp",
+        "enet_godot.cpp",
         "callbacks.c",
         "compress.c",
         "host.c",

modules/noise/fastnoise_lite.h

@@ -33,7 +33,7 @@
 
 #include "noise.h"
 
-#include <thirdparty/noise/FastNoiseLite.h>
+#include "thirdparty/misc/FastNoiseLite.h"
 
 typedef fastnoiselite::FastNoiseLite _FastNoiseLite;
 

platform/windows/gl_manager_windows_native.cpp

@@ -35,7 +35,7 @@
 #include "core/config/project_settings.h"
 #include "core/version.h"
 
-#include "thirdparty/nvapi/nvapi_minimal.h"
+#include "thirdparty/misc/nvapi_minimal.h"
 
 #include <dwmapi.h>
 #include <stdio.h>