git: 46295812c6a4 - main - games/egl: unbreak the port's build against Clang 15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Feb 2023 04:40:12 UTC
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=46295812c6a411741c04ba87345e08216ff0c6c3 commit 46295812c6a411741c04ba87345e08216ff0c6c3 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-02-15 04:39:32 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-02-15 04:39:32 +0000 games/egl: unbreak the port's build against Clang 15 Add #include "x11_linux.h" to obtain the prototype for the X11_GetAuxKeyRemapName() function, otherwise compiler does not know its return value and defaults to `int': unix/unix_glimp.c:117:5: error: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion] Reported by: pkg-fallout --- games/egl/files/patch-unix__unix_glimp.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/games/egl/files/patch-unix__unix_glimp.c b/games/egl/files/patch-unix__unix_glimp.c index 82e220eb6db9..3fe1860452ba 100644 --- a/games/egl/files/patch-unix__unix_glimp.c +++ b/games/egl/files/patch-unix__unix_glimp.c @@ -1,6 +1,18 @@ ---- unix/unix_glimp.c.orig Mon Jul 24 16:42:03 2006 -+++ unix/unix_glimp.c Mon Jul 24 16:47:48 2006 -@@ -41,6 +41,9 @@ +--- unix/unix_glimp.c.orig 2006-06-03 19:24:54 UTC ++++ unix/unix_glimp.c +@@ -31,16 +31,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, + #include <signal.h> + #include <dlfcn.h> + +-#include "../renderer/r_local.h" +-#include "../client/cl_local.h" ++#include "../shared/shared.h" + #include "unix_glimp.h" + #include "unix_local.h" ++#include "x11_linux.h" + + static qBool vid_queueRestart; + static qBool vid_isActive; glxState_t glxState = {.OpenGLLib = NULL}; @@ -10,7 +22,7 @@ /* ============================================================================= -@@ -208,8 +211,8 @@ +@@ -208,8 +211,8 @@ void VID_Init (refConfig_t *outConfig) vid_fullscreen = Cvar_Register ("vid_fullscreen", "0", CVAR_ARCHIVE); // Add some console commands that we want to handle @@ -21,7 +33,7 @@ // Start the graphics mode and load refresh DLL vid_isActive = qFalse; -@@ -232,8 +235,8 @@ +@@ -232,8 +235,8 @@ void VID_Shutdown (void) vid_isActive = qFalse; }