Date: Tue, 12 May 2020 22:52:43 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535072 - in head/games/fs2open: . files Message-ID: <202005122252.04CMqhq6092769@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Tue May 12 22:52:43 2020 New Revision: 535072 URL: https://svnweb.freebsd.org/changeset/ports/535072 Log: games/fs2open: fix build Build with Clang 10 fails. Modified: head/games/fs2open/Makefile head/games/fs2open/files/patch-code_model_modelread.cpp Modified: head/games/fs2open/Makefile ============================================================================== --- head/games/fs2open/Makefile Tue May 12 22:31:44 2020 (r535071) +++ head/games/fs2open/Makefile Tue May 12 22:52:43 2020 (r535072) @@ -16,7 +16,7 @@ LICENSE_PERMS= dist-mirror auto-accept LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libpng.so:graphics/png -USES= cmake compiler:c++11-lang lua:51 jpeg openal pkgconfig sdl +USES= cmake compiler:gcc-c++11-lib lua:51 jpeg openal pkgconfig sdl USE_GITHUB= yes GH_ACCOUNT= scp-fs2open GH_PROJECT= fs2open.github.com Modified: head/games/fs2open/files/patch-code_model_modelread.cpp ============================================================================== --- head/games/fs2open/files/patch-code_model_modelread.cpp Tue May 12 22:31:44 2020 (r535071) +++ head/games/fs2open/files/patch-code_model_modelread.cpp Tue May 12 22:52:43 2020 (r535072) @@ -1,4 +1,4 @@ ---- code/model/modelread.cpp.orig 2020-02-10 13:38:06 UTC +--- code/model/modelread.cpp.orig 2020-01-25 16:45:09 UTC +++ code/model/modelread.cpp @@ -5341,7 +5341,7 @@ void swap_bsp_sortnorms( polymodel * pm, ubyte * p ) } @@ -9,7 +9,13 @@ { #if BYTE_ORDER == BIG_ENDIAN ubyte *p = (ubyte *)model_ptr; -@@ -5397,7 +5397,7 @@ void swap_bsp_data( polymodel * /*pm*/, void * /*mode +@@ -5394,10 +5394,13 @@ void swap_bsp_data( polymodel * /*pm*/, void * /*mode + } + + return; ++#else ++(void)pm; ++(void)model_ptr; #endif } @@ -18,3 +24,12 @@ { #if BYTE_ORDER == BIG_ENDIAN char *type_p = (char *)(buffer); +@@ -5439,6 +5442,8 @@ void swap_sldc_data(ubyte * /*buffer*/) + shld_polys[i] = INTEL_INT(shld_polys[i]); + } + } ++#else ++(void)buffer; + #endif + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005122252.04CMqhq6092769>