From owner-svn-ports-head@freebsd.org Tue May 12 22:52:44 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F5342E01B4; Tue, 12 May 2020 22:52:44 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49MCkM6j3mz4C9Q; Tue, 12 May 2020 22:52:43 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E15A2FBA2; Tue, 12 May 2020 22:52:43 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04CMqhtM092771; Tue, 12 May 2020 22:52:43 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04CMqhq6092769; Tue, 12 May 2020 22:52:43 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202005122252.04CMqhq6092769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 12 May 2020 22:52:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535072 - in head/games/fs2open: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/games/fs2open: . files X-SVN-Commit-Revision: 535072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2020 22:52:44 -0000 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 + } +