0ad: remove two obsolete patches, fix whitespace in third

diff --git a/0ad/distinfo b/0ad/distinfo
index eb9e71da4e90cdd3a46ee4acb127b25d194f01f0..b28d78d7dc956d23eaa74ff0b1fdaaac42be3479 100644 (file)
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -4,17 +4,15 @@ SHA1 (0ad-0.0.25b-alpha-unix-build.tar.xz) = 130444c15e29c7fa1333b8719ae7c7da367
 RMD160 (0ad-0.0.25b-alpha-unix-build.tar.xz) = 295ad0f386df10cc95cee7dea889ccd43224dd1e
 SHA512 (0ad-0.0.25b-alpha-unix-build.tar.xz) = e8069897b97b381099ab5ec5868d27e96c699105b3307054d1bc7bf9236a537f02625ba9034892d91f3e951b4f95c9ce5fb75ed0a7c14b8a294882482fd9c1b4
 Size (0ad-0.0.25b-alpha-unix-build.tar.xz) = 75579956 bytes
-SHA1 (patch-build_premake_extern__libs5.lua) = 4a0c97a89945d0818fcb22ab09aa329160e727e8
 SHA1 (patch-build_workspaces_clean-workspaces.sh) = fed7e867eb8e24e37860599269f9feb4d30c5a43
 SHA1 (patch-build_workspaces_update-workspaces.sh) = 3e92f823e3204451522055a5f4cd2ee1d5819b2f
 SHA1 (patch-libraries_source_fcollada_include_FCDocument_FCDocument.h) = 96aef76c02ae4a3f47fdb7c31bf7d11490ba5d09
-SHA1 (patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h) = 285fa6568c5ec0ab26364ca2674e9d3e4171ed6b
+SHA1 (patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h) = 956ba6c19b0f3ea2a35f686bf1825efc07169b89
 SHA1 (patch-libraries_source_fcollada_include_FUtils_Platforms.h) = 32308e3fe673903b4b1a17c364840818136411b9
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FCDocument_FCDocument.h) = ae1edd27218707be0ea77456569fcd262d9230d2
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUCriticalSection.h) = fd181f746bba33ceb917a5de4794296c229213fc
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) = f71f1f361601b2ce561c00a811d33bce6735a06d
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
-SHA1 (patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp) = 631a927c2aeba0a0aa7842402232420beb7eebd9
 SHA1 (patch-source_graphics_TextureConverter.cpp) = d4e3920cd507468adc37dc92e27e6cbb50b5c5e2
 SHA1 (patch-source_lib_secure__crt.cpp) = 1e56aa627c8f2343884968ab4ebd4b4eec73b777
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332

diff --git a/0ad/patches/patch-build_premake_extern__libs5.lua b/0ad/patches/patch-build_premake_extern__libs5.lua
deleted file mode 100644 (file)
index de40e02..0000000
--- a/0ad/patches/patch-build_premake_extern__libs5.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- build/premake/extern_libs5.lua.orig        2016-03-12 18:15:04.000000000 +0000
-+++ build/premake/extern_libs5.lua
-@@ -347,7 +347,7 @@ extern_lib_defs = {
-                       elseif os.is("macosx") then
-                               add_default_include_paths("iconv")
-                               defines { "LIBICONV_STATIC" }
--                      elseif os.getversion().description == "FreeBSD" then
-+                      elseif os.getversion().description == "NetBSD" then
-                               defines { "HAVE_ICONV_CONST" }
-                               defines { "ICONV_CONST=const" }
-                       end

diff --git a/0ad/patches/patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h b/0ad/patches/patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h
index 870d66a68964e98099f03e01eafadacdd0eae04d..e1e33ceac1bc86e18358ebb043d13d66eb74691d 100644 (file)
--- a/0ad/patches/patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h
+++ b/0ad/patches/patch-libraries_source_fcollada_include_FUtils_FUCriticalSection.h
@@ -1,11 +1,11 @@
 $NetBSD$
 
---- libraries/source/fcollada/include/FUtils/FUCriticalSection.h.orig  2012-06-04 21:33:15.000000000 +0000
+--- libraries/source/fcollada/include/FUtils/FUCriticalSection.h.orig  2021-08-25 14:44:15.000000000 +0000
 +++ libraries/source/fcollada/include/FUtils/FUCriticalSection.h
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ private:
  #elif defined(__APPLE__)
-        //Do something here.
-        MPCriticalRegionID criticalSection;
+       //Do something here.
+       MPCriticalRegionID criticalSection;
 -#elif defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
 +#elif defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
  #else

diff --git a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp b/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
deleted file mode 100644 (file)
index 605dca7..0000000
--- a/0ad/patches/patch-libraries_source_nvtt_src_src_nvcore_Debug.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- libraries/source/nvtt/src/src/nvcore/Debug.cpp.orig        2015-07-21 15:53:21.000000000 +0000
-+++ libraries/source/nvtt/src/src/nvcore/Debug.cpp
-@@ -213,6 +213,14 @@ namespace 
-                       ucontext_t * ucp = (ucontext_t *)secret;
-                       return (void *)ucp->uc_mcontext.mc_eip;
- #             endif
-+#     elif NV_OS_NETBSD
-+#             if NV_CPU_X86_64
-+                      ucontext_t * ucp = (ucontext_t *)secret;
-+                      return (void *)ucp->uc_mcontext.__gregs[_REG_RIP];
-+#             elif NV_CPU_X86
-+                      ucontext_t * ucp = (ucontext_t *)secret;
-+                      return (void *)ucp->uc_mcontext.__gregs[_REG_EIP];
-+#             endif
- #     elif NV_OS_OPENBSD
- #             if NV_CPU_X86_64
-                       ucontext_t * ucp = (ucontext_t *)secret;
-@@ -559,4 +567,3 @@ void debug::disableSigHandler()
-       
- #endif
- }
--