Date: Sat, 20 Apr 2024 14:24:34 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 39dd48012d92 - main - emulators/mupen64plus-video-glide64mk2: fix build with clang 18 Message-ID: <202404201424.43KEOYCs005110@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=39dd48012d9233d058e7622db3e45d0f2f5e28e3 commit 39dd48012d9233d058e7622db3e45d0f2f5e28e3 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-03-27 20:16:09 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-04-20 14:23:09 +0000 emulators/mupen64plus-video-glide64mk2: fix build with clang 18 I am unsure if clang 18 actually has anything to do with it, but whatever the case, emulators/mupen64plus-video-glide64mk2 does not build: CXX _obj/Glide64/rdp.o ../../src/Glide64/rdp.cpp:1863:11: error: use of undeclared identifier 'bswap32' 1863 | *v5 = bswap32(v12); | ^ And a bunch more of these. Fix it by including <sys/endian.h> in the __FreeBSD__ case in src/Glide64/Util.h. PR: 278001 Approved by: maintainer timeout (2 weeks) MFH: 2024Q2 --- .../mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h index 1b60d58f5f26..30529e17c6f7 100644 --- a/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h +++ b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h @@ -1,14 +1,16 @@ --- src/Glide64/Util.h.orig 2024-01-06 03:12:23 UTC +++ src/Glide64/Util.h -@@ -94,6 +94,7 @@ float ScaleZ(float z); +@@ -94,6 +94,9 @@ float ScaleZ(float z); #include <stdlib.h> #define bswap32(x) _byteswap_ulong(x) #else -+#if !defined __FreeBSD__ ++#if defined __FreeBSD__ ++#include <sys/endian.h> ++#else static inline uint32_t bswap32(uint32_t val) { return (((val & 0xff000000) >> 24) | -@@ -101,6 +102,7 @@ static inline uint32_t bswap32(uint32_t val) +@@ -101,6 +104,7 @@ static inline uint32_t bswap32(uint32_t val) ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404201424.43KEOYCs005110>