git: a20b29fff507 - main - games/diaspora: fix architecture detection on 64-bit non-amd64 and unbreak aarch64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 01 Dec 2023 10:55:33 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a20b29fff507590850a6dcce1331f0ad203f43da
commit a20b29fff507590850a6dcce1331f0ad203f43da
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-12-01 10:53:02 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-12-01 10:55:30 +0000
games/diaspora: fix architecture detection on 64-bit non-amd64 and unbreak aarch64
---
games/diaspora/Makefile | 2 --
games/diaspora/files/patch-code_globalincs_pstypes.h | 11 +++++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/games/diaspora/Makefile b/games/diaspora/Makefile
index afebc8c14662..93a0d3da557a 100644
--- a/games/diaspora/Makefile
+++ b/games/diaspora/Makefile
@@ -23,8 +23,6 @@ LICENSE_FILE_VOLITION= ${WRKSRC}/COPYING
LICENSE_FILE_GPLv2= ${WRKDIR_DIASPORA}/wxlauncher/GPLv2.txt
LICENSE_PERMS_VOLITION= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
-BROKEN_aarch64= Fails to compile: cast from pointer to smaller type loses information
-
LIB_DEPENDS= libjansson.so:devel/jansson \
libpng.so:graphics/png \
libogg.so:audio/libogg \
diff --git a/games/diaspora/files/patch-code_globalincs_pstypes.h b/games/diaspora/files/patch-code_globalincs_pstypes.h
new file mode 100644
index 000000000000..e6ed2652858a
--- /dev/null
+++ b/games/diaspora/files/patch-code_globalincs_pstypes.h
@@ -0,0 +1,11 @@
+--- code/globalincs/pstypes.h.orig 2023-11-24 00:40:45 UTC
++++ code/globalincs/pstypes.h
+@@ -18,7 +18,7 @@
+ #include <memory.h>
+ #include <string.h>
+
+-#if defined( __x86_64__ ) || defined( _WIN64 )
++#if defined( __LP64__ ) || defined( _WIN64 )
+ #define IAM_64BIT 1
+ #endif
+