From owner-svn-ports-all@freebsd.org Sat Jan 20 17:45:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D242DEBBFFF; Sat, 20 Jan 2018 17:45:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ACDB58346A; Sat, 20 Jan 2018 17:45:53 +0000 (UTC) (envelope-from jbeich@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 E50271F92A; Sat, 20 Jan 2018 17:45:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0KHjqbU032147; Sat, 20 Jan 2018 17:45:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0KHjq1j032145; Sat, 20 Jan 2018 17:45:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801201745.w0KHjq1j032145@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 20 Jan 2018 17:45:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459533 - head/games/abuse_sdl/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/abuse_sdl/files X-SVN-Commit-Revision: 459533 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jan 2018 17:45:53 -0000 Author: jbeich Date: Sat Jan 20 17:45:52 2018 New Revision: 459533 URL: https://svnweb.freebsd.org/changeset/ports/459533 Log: games/abuse_sdl: unbreak build with Clang 6 (C++14 by default) fileman.cpp:296:33: error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'uint8_t' (aka 'unsigned char') in initializer list [-Wc++11-narrowing] uint8_t sizes[3]={ CLIENT_NFS,strlen(filename)+1,strlen(mode)+1}; ^~~~~~~~~~~~~~~~~~ hmi.cpp:302:97: error: non-constant-expression cannot be narrowed from type 'int' to 'uint8_t' (aka 'unsigned char') in initializer list [-Wc++11-narrowing] ...0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (num_tracks + 1), 0x00, 0xC0 }; ^~~~~~~~~~~~~~~~ Reported by: pkg-fallout Added: head/games/abuse_sdl/files/patch-src-net-fileman.cpp (contents, props changed) head/games/abuse_sdl/files/patch-src-sdlport-hmi.cpp (contents, props changed) Added: head/games/abuse_sdl/files/patch-src-net-fileman.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/abuse_sdl/files/patch-src-net-fileman.cpp Sat Jan 20 17:45:52 2018 (r459533) @@ -0,0 +1,26 @@ +fileman.cpp:296:33: error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'uint8_t' (aka 'unsigned char') in initializer list [-Wc++11-narrowing] + uint8_t sizes[3]={ CLIENT_NFS,strlen(filename)+1,strlen(mode)+1}; + ^~~~~~~~~~~~~~~~~~ +fileman.cpp:296:33: note: insert an explicit cast to silence this issue + uint8_t sizes[3]={ CLIENT_NFS,strlen(filename)+1,strlen(mode)+1}; + ^~~~~~~~~~~~~~~~~~ + static_cast( ) +fileman.cpp:296:52: error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'uint8_t' (aka 'unsigned char') in initializer list [-Wc++11-narrowing] + uint8_t sizes[3]={ CLIENT_NFS,strlen(filename)+1,strlen(mode)+1}; + ^~~~~~~~~~~~~~ +fileman.cpp:296:52: note: insert an explicit cast to silence this issue + uint8_t sizes[3]={ CLIENT_NFS,strlen(filename)+1,strlen(mode)+1}; + ^~~~~~~~~~~~~~ + static_cast( ) + +--- src/net/fileman.cpp.orig 2011-05-02 11:55:06 UTC ++++ src/net/fileman.cpp +@@ -293,7 +293,7 @@ file_manager::remote_file::remote_file(net_socket *soc + next=Next; + open_local=0; + +- uint8_t sizes[3]={ CLIENT_NFS,strlen(filename)+1,strlen(mode)+1}; ++ uint8_t sizes[3]={ CLIENT_NFS,(uint8_t)(strlen(filename)+1),(uint8_t)(strlen(mode)+1)}; + if (sock->write(sizes,3)!=3) { r_close("could not send open info"); return ; } + if (sock->write(filename,sizes[1])!=sizes[1]) { r_close("could not send filename"); return ; } + if (sock->write(mode,sizes[2])!=sizes[2]) { r_close("could not send mode"); return ; } Added: head/games/abuse_sdl/files/patch-src-sdlport-hmi.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/abuse_sdl/files/patch-src-sdlport-hmi.cpp Sat Jan 20 17:45:52 2018 (r459533) @@ -0,0 +1,20 @@ +hmi.cpp:302:97: error: non-constant-expression cannot be narrowed from type 'int' to 'uint8_t' + (aka 'unsigned char') in initializer list [-Wc++11-narrowing] + ...0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (num_tracks + 1), 0x00, 0xC0 }; + ^~~~~~~~~~~~~~~~ +hmi.cpp:302:97: note: insert an explicit cast to silence this issue + ...0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (num_tracks + 1), 0x00, 0xC0 }; + ^~~~~~~~~~~~~~~~ + static_cast( ) + +--- src/sdlport/hmi.cpp.orig 2011-05-09 07:58:30 UTC ++++ src/sdlport/hmi.cpp +@@ -299,7 +299,7 @@ uint8_t* load_hmi(char const *filename, uint32_t &data + uint8_t num_tracks = (next_offset - offset_tracks) / sizeof(uint32_t); + + // Write Midi file header +- uint8_t midi_header[] = { 0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (num_tracks + 1), 0x00, 0xC0 }; ++ uint8_t midi_header[] = { 0x4D, 0x54, 0x68, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, (uint8_t)(num_tracks + 1), 0x00, 0xC0 }; + memcpy(output_buffer_ptr, midi_header, 14); + output_buffer_ptr += 14; +