Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-09-16 21:48:49 +00:00
6 changed files with 1 additions and 295 deletions
+1 -1
View File
@@ -1 +1 @@
DIST odamex-src-10.4.0.tar.xz 17255540 BLAKE2B bdfb357424bd1712cf763f5e6109b67910e518703e8a29fa3b071f73302beea2d3e7ed63a4e7195c367a01947ad829a78967cc77acfe3455a6e2094ca33b6590 SHA512 bea6a2e70e6bdab6a1d6b5beccf981b7570142cdabc6e54935601c5fd966e1a0e7935aa6b492185165440b31899fa6240f038a75d4741a92520e6e9be935ef7b
DIST odamex-src-10.6.0.tar.xz 17560572 BLAKE2B eeb9742b587a7e45fa5d33ae7a96b767a4d6517732ffc82a58c68557edfd43305413667fdcc24f7256613c05421da85a81db2c5d36d7ad09b91e4b2d76fa1693 SHA512 c1269a9047199af16c64aee5d0520070cfa36c7a2488628bb19744024f13e083a6841b65f8dc18b930d3b0ef39cdebddfcf028ea44af98b4418319c364e806c0
@@ -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)))
@@ -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);
@@ -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
@@ -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
@@ -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() {