gentoo auto-resync : 17:09:2024 - 12:11:34

6 files changed, 2 insertions, 300 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index bdb4942b7fbd..5b6a01bf12e6 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,8 +1,4 @@
 AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797
-AUX odamex-10.4.0-backport-pr928.patch 2485 BLAKE2B 50219598fd899548148642b97af7cf228a28f0717b44c01fd0cad724a72a7183bbd223e4d65ab22b1581fef395b4dd5142e65787eec9748865e1d46681a4dbad SHA512 6a791b4736375e0cd3158a3c65a3f2ab83b96196fd3b4510bddf80aaedac1827f8914f528bdf5e520a891423edc5cdce72675f66a6dce0e50f4c3970c744fd8d
-AUX odamex-lto.patch 1570 BLAKE2B 9284ff378e543b26a9871a21017ee93c5b0b426c1b3eb813fcc23b990ea1712993cf932a6c0beedbe2a6eddc9c908533470b7334c7167a265ef3170df6f5d995 SHA512 865b136f47f07ecebb94771435d9fba2b8768ad989713492242f71720a023863e71c23561afd101ff19075d8d5df0c6e4d30851a6a6366d77620b8ea30d4785c
-AUX odamex-musl.patch 2693 BLAKE2B 3bb517aeeb7bb3ba38ad83f8cfb973c171a713874ca694b821ed0267da5d796ae3ab6f4d904b8dcf3c2d844e2fe71f4ba34a3d54dcf312fc2c23c8fb54e46fc0 SHA512 80065d86fc1f671baaa920a40c787158eba68fb218f164c810e3dcbd8b601aeb1da545de3b2da8a6a47927a3f4c83a5903898f3e87d06413adda8837ccf12775
-AUX odamex-odalaunch-prefix.patch 1890 BLAKE2B 948054a8b66aacc68b000635a15c17544cf745ba87c71a89b230e76e5b316d41c929fbe792904c76ca2d474d810ac6880a99ba28bed07b04b039b0496af0d7e7 SHA512 8de4a39999af6a1e1f040d26d2c0ed4f1bc100b6c5c407fd6b75408e21cdea3b94a7052432f3e1229816ed7094ce95a7b2f2b8467a2aa8df5a1cf4ccb8c0e7f4
-DIST odamex-src-10.4.0.tar.xz 17255540 BLAKE2B bdfb357424bd1712cf763f5e6109b67910e518703e8a29fa3b071f73302beea2d3e7ed63a4e7195c367a01947ad829a78967cc77acfe3455a6e2094ca33b6590 SHA512 bea6a2e70e6bdab6a1d6b5beccf981b7570142cdabc6e54935601c5fd966e1a0e7935aa6b492185165440b31899fa6240f038a75d4741a92520e6e9be935ef7b
-EBUILD odamex-10.4.0-r3.ebuild 2459 BLAKE2B 423075cfc05891f42ec22bf49d73772a9ddafeae06b3c828643b3d979924ea96637123e65423c256ca78a36b3d940777ccf69e82fae7e01a11ab63a5460a8a18 SHA512 a4d441521029f2169273df3bf8fa56620abdd4c3b58afdc459e2a0f929043fae0401c0a46d70661dcfa19012c96fc146f2765126f607ebdc7596f09c6b5664cb
+DIST odamex-src-10.6.0.tar.xz 17560572 BLAKE2B eeb9742b587a7e45fa5d33ae7a96b767a4d6517732ffc82a58c68557edfd43305413667fdcc24f7256613c05421da85a81db2c5d36d7ad09b91e4b2d76fa1693 SHA512 c1269a9047199af16c64aee5d0520070cfa36c7a2488628bb19744024f13e083a6841b65f8dc18b930d3b0ef39cdebddfcf028ea44af98b4418319c364e806c0
+EBUILD odamex-10.6.0.ebuild 2303 BLAKE2B 64c65fa0fd3dea072adfdd119513b39e60619e6a6743d97bfb900530016646f8469a2020d7372c8d72ea51abf7424b47eecda5fe451f424a2172e3196afa7b24 SHA512 b7a670c1bbe4bc8ab6b22e5958567e12f328935070ef3bd27035e4e718c39a7365def360928b3424325278bfbc62516d3312564a87e17e5a824a7d1e4546546b
 MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch b/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch
deleted file mode 100644
index 7d6871847814..000000000000
--- a/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/849866
-https://github.com/odamex/odamex/pull/928
-
-From b952137ac487a6558e1796c86d8fd55b8b3c9025 Mon Sep 17 00:00:00 2001
-From: matoro <matoro@users.noreply.github.com>
-Date: Wed, 6 Dec 2023 01:01:29 -0500
-Subject: [PATCH] Fix auto-SIMD for i386+sse2, ppc+altivec
-
-Only Darwin ever used -faltivec, gcc uses -maltivec since at least 2007:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=30254#c1
-
-Similarly, recent versions of gcc define __APPLE_ALTIVEC__ for
-compatibility, so just unconditionally include altivec.h.
-
-Canonical way to enable specific extensions is e.g. -msse2, use that
-instead of optimizing for a specific CPU.
-
-Finally, cmake uses target_compile_options to add arbitrary flags.
-target_compile_definitions assumes you want a preprocessor definition,
-which was adding "-D-faltivec" to the command line which gcc doesn't
-like; this is what originally prompted this change.
----
- client/CMakeLists.txt          | 11 +++++++----
- client/src/r_drawt_altivec.cpp |  2 --
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 646164916..56caf04f8 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -169,14 +169,17 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
-       message(STATUS "Default SIMD flags not touched for AMD64")
-     elseif(ODAMEX_TARGET_ARCH STREQUAL "i386")
-       if(NOT MSVC)
--        # Pentium M has SSE2.
--        target_compile_definitions(odamex PRIVATE -march=pentium-m)
-+        target_compile_options(odamex PRIVATE -msse2)
-       else()
--        target_compile_definitions(odamex PRIVATE /arch:SSE2)
-+        target_compile_options(odamex PRIVATE /arch:SSE2)
-       endif()
-       message(STATUS "Default SIMD flags set to SSE2")
-     elseif(ODAMEX_TARGET_ARCH MATCHES "ppc")
--      target_compile_definitions(odamex PRIVATE -faltivec)
-+      if(APPLE)
-+        target_compile_options(odamex PRIVATE -faltivec)
-+      else()
-+        target_compile_options(odamex PRIVATE -maltivec)
-+      endif()
-       message(STATUS "Default SIMD flags set to AltiVec")
-     endif()
-   else()
-diff --git a/client/src/r_drawt_altivec.cpp b/client/src/r_drawt_altivec.cpp
-index eea758733..5a0cdf95e 100644
---- a/client/src/r_drawt_altivec.cpp
-+++ b/client/src/r_drawt_altivec.cpp
-@@ -36,9 +36,7 @@
- #include "r_main.h"
- #include "i_video.h"
- 
--#if !defined(__APPLE_ALTIVEC__)
- #include <altivec.h>
--#endif
- 
- #define ALTIVEC_ALIGNED(x) x __attribute__((aligned(16)))
- 
diff --git a/games-engines/odamex/files/odamex-lto.patch b/games-engines/odamex/files/odamex-lto.patch
deleted file mode 100644
index 20d9d88c002b..000000000000
--- a/games-engines/odamex/files/odamex-lto.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/odamex/odamex/pull/942
-
-diff --git a/client/src/cl_parse.cpp b/client/src/cl_parse.cpp
-index cdadbbdf2..e15c45edc 100644
---- a/client/src/cl_parse.cpp
-+++ b/client/src/cl_parse.cpp
-@@ -2354,7 +2354,7 @@ static void CL_SectorProperties(const odaproto::svc::SectorProperties* msg)
- 			break;
- 		}
- 		case SPC_Gravity:
--			*(int*)&sector->gravity = msg->sector().gravity();
-+			*&sector->gravity = msg->sector().gravity();
- 			break;
- 		case SPC_Panning:
- 			sector->ceiling_xoffs = msg->sector().ceiling_offs().x();
-diff --git a/common/p_spec.cpp b/common/p_spec.cpp
-index df1a42a6a..d0a5af419 100644
---- a/common/p_spec.cpp
-+++ b/common/p_spec.cpp
-@@ -465,7 +465,7 @@ void DPusher::Serialize (FArchive &arc)
- 	else
- 	{
- 		arc >> m_Type;
--		arc.ReadObject((DObject*&)m_Source, DPusher::StaticType());
-+		arc.ReadObject((DObject*&)*m_Source, DPusher::StaticType());
- 		arc >> m_Xmag >> m_Ymag >> m_Magnitude >> m_Radius >> m_X >> m_Y >> m_Affectee;
- 	}
- }
-diff --git a/odalpapi/net_io.cpp b/odalpapi/net_io.cpp
-index d6dd666fe..16f136374 100644
---- a/odalpapi/net_io.cpp
-+++ b/odalpapi/net_io.cpp
-@@ -194,7 +194,7 @@ void BufferedSocket::SetRemoteAddress(const string& Address, const uint16_t& Por
-
- 	m_RemoteAddress.sin_family = PF_INET;
- 	m_RemoteAddress.sin_port = htons(Port);
--	m_RemoteAddress.sin_addr.s_addr = *((unsigned long*)&(((sockaddr_in*)result->ai_addr)->sin_addr));
-+	m_RemoteAddress.sin_addr = ((sockaddr_in*)result->ai_addr)->sin_addr;
- 	memset(m_RemoteAddress.sin_zero, '\0', sizeof m_RemoteAddress.sin_zero);
-
- 	freeaddrinfo(result);
diff --git a/games-engines/odamex/files/odamex-musl.patch b/games-engines/odamex/files/odamex-musl.patch
deleted file mode 100644
index bf6f2999ba49..000000000000
--- a/games-engines/odamex/files/odamex-musl.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From deb113e672588879697ae3343c5d3f1616d13503 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 30 Mar 2024 22:39:14 +0000
-Subject: [PATCH] Include <ctime> wherever time_t is used to fix musl
-
----
- client/src/m_menu.cpp       | 2 ++
- client/src/v_screenshot.cpp | 2 ++
- common/c_dispatch.cpp       | 1 +
- common/cmdlib.h             | 1 +
- common/p_user.cpp           | 2 ++
- server/src/c_console.cpp    | 2 ++
- server/src/sv_banlist.cpp   | 1 +
- server/src/sv_banlist.h     | 1 +
- 8 files changed, 12 insertions(+)
-
-diff --git a/client/src/m_menu.cpp b/client/src/m_menu.cpp
-index 6268e1819..f82cbf40d 100644
---- a/client/src/m_menu.cpp
-+++ b/client/src/m_menu.cpp
-@@ -25,6 +25,8 @@
- 
- #include "odamex.h"
- 
-+#include <ctime>
-+
- #include "gstrings.h"
- #include "c_console.h"
- #include "c_dispatch.h"
-diff --git a/client/src/v_screenshot.cpp b/client/src/v_screenshot.cpp
-index 2f24cb184..375de5b9d 100644
---- a/client/src/v_screenshot.cpp
-+++ b/client/src/v_screenshot.cpp
-@@ -24,6 +24,8 @@
- 
- #include "odamex.h"
- 
-+#include <ctime>
-+
- #include <SDL.h>
- 
- #include <stdlib.h>
-diff --git a/common/c_dispatch.cpp b/common/c_dispatch.cpp
-index 504379aad..d30dd4e24 100644
---- a/common/c_dispatch.cpp
-+++ b/common/c_dispatch.cpp
-@@ -26,6 +26,7 @@
- 
- #include <sstream>
- #include <algorithm>
-+#include <ctime>
- 
- #include "cmdlib.h"
- #include "c_console.h"
-diff --git a/common/cmdlib.h b/common/cmdlib.h
-index c7041837b..a20be7c4c 100644
---- a/common/cmdlib.h
-+++ b/common/cmdlib.h
-@@ -24,6 +24,7 @@
- #pragma once
- 
- #include <algorithm>
-+#include <ctime>
- 
- #ifdef _MSC_VER
- #pragma warning(disable : 4244)     // MIPS
-diff --git a/common/p_user.cpp b/common/p_user.cpp
-index d9a4bb965..461a3ef03 100644
---- a/common/p_user.cpp
-+++ b/common/p_user.cpp
-@@ -26,6 +26,8 @@
- 
- #include "odamex.h"
- 
-+#include <ctime>
-+
- #include <limits.h>
- 
- #include "cmdlib.h"
-diff --git a/server/src/c_console.cpp b/server/src/c_console.cpp
-index 34fcd19d9..57d7e71e2 100644
---- a/server/src/c_console.cpp
-+++ b/server/src/c_console.cpp
-@@ -24,6 +24,8 @@
- 
- #include "odamex.h"
- 
-+#include <ctime>
-+
- #include <stdarg.h>
- 
- #include "m_memio.h"
-diff --git a/server/src/sv_banlist.cpp b/server/src/sv_banlist.cpp
-index c271fe68c..36cdf9b63 100644
---- a/server/src/sv_banlist.cpp
-+++ b/server/src/sv_banlist.cpp
-@@ -24,6 +24,7 @@
- 
- #include "odamex.h"
- 
-+#include <ctime>
- #include <sstream>
- 
- #include "win32inc.h"
-diff --git a/server/src/sv_banlist.h b/server/src/sv_banlist.h
-index 6096f73fc..f4d686071 100644
---- a/server/src/sv_banlist.h
-+++ b/server/src/sv_banlist.h
-@@ -23,6 +23,7 @@
- 
- #pragma once
- 
-+#include <ctime>
- #include <sstream>
- 
- #include "json/json.h"
--- 
-2.44.0
-
diff --git a/games-engines/odamex/files/odamex-odalaunch-prefix.patch b/games-engines/odamex/files/odamex-odalaunch-prefix.patch
deleted file mode 100644
index cf293e60f9e1..000000000000
--- a/games-engines/odamex/files/odamex-odalaunch-prefix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 04e38b9fcb8a71a7b0b1b5bc1c1f229f2ff7a0a8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 18 Mar 2024 22:54:16 +0000
-Subject: [PATCH] Always define INSTALL_PREFIX to fix paths for odalaunch
-
-Without INSTALL_PREFIX, it was falling back to the current directory and
-failing to launch the game.
----
- CMakeLists.txt        | 5 +++++
- client/CMakeLists.txt | 5 -----
- server/CMakeLists.txt | 5 -----
- 3 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 147060cb1..97c447424 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,11 @@ include(GNUInstallDirs OPTIONAL)
- add_definitions(-DINSTALL_BINDIR="${CMAKE_INSTALL_BINDIR}")

- add_definitions(-DINSTALL_DATADIR="${CMAKE_INSTALL_DATADIR}")

- 

-+# Set up FHS installation path

-+if(NOT APPLE AND NOT WIN32)

-+  add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")

-+endif()

-+

- if(WIN32)

-   set(USE_INTERNAL_LIBS 1)

- else()

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 56caf04f8..0559564c7 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -128,11 +128,6 @@ if(APPLE)
-     ${AUDIOUNIT_LIBRARY})
- endif()
- 
--# Set up FHS installation path
--if(NOT APPLE AND NOT WIN32)
--  add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
--endif()
--
- # Client target
- if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
- 
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index e5b54d8de..9afc6c2c6 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -37,11 +37,6 @@ if(WIN32 AND NOT MSVC)
-   add_definitions(-DWINVER=0x0500)
- endif()
- 
--# Set up FHS installation path
--if(NOT APPLE AND NOT WIN32)
--  add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
--endif()
--
- add_executable(odasrv
-   ${COMMON_SOURCES} ${SERVER_SOURCES} ${SERVER_WIN32_SOURCES})
- odamex_target_settings(odasrv)
--- 
-2.43.2
-
diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.6.0.ebuild
index 2b88ef70989c..4a70b03acc25 100644
--- a/games-engines/odamex/odamex-10.4.0-r3.ebuild
+++ b/games-engines/odamex/odamex-10.6.0.ebuild
@@ -42,10 +42,6 @@ BDEPEND="games-util/deutex"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
-	"${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch
-	"${FILESDIR}"/${PN}-odalaunch-prefix.patch
-	"${FILESDIR}"/${PN}-lto.patch
-	"${FILESDIR}"/${PN}-musl.patch
 )
 
 src_prepare() {