From owner-svn-ports-all@freebsd.org Fri Feb 3 12:35:53 2017 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 5AE05CCCEC1; Fri, 3 Feb 2017 12:35:53 +0000 (UTC) (envelope-from ehaupt@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 mx1.freebsd.org (Postfix) with ESMTPS id 0DBD71154; Fri, 3 Feb 2017 12:35:52 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v13CZqbE071434; Fri, 3 Feb 2017 12:35:52 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v13CZpLc071431; Fri, 3 Feb 2017 12:35:51 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201702031235.v13CZpLc071431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Fri, 3 Feb 2017 12:35:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433222 - in head/games/bloboats: . files X-SVN-Group: ports-head 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.23 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: Fri, 03 Feb 2017 12:35:53 -0000 Author: ehaupt Date: Fri Feb 3 12:35:51 2017 New Revision: 433222 URL: https://svnweb.freebsd.org/changeset/ports/433222 Log: Fix build with clang 4.0 PR: 216630 (based on) Notified by: jbeich Added: head/games/bloboats/files/patch-src_menu.cpp (contents, props changed) Modified: head/games/bloboats/Makefile head/games/bloboats/files/patch-Makefile Modified: head/games/bloboats/Makefile ============================================================================== --- head/games/bloboats/Makefile Fri Feb 3 11:31:26 2017 (r433221) +++ head/games/bloboats/Makefile Fri Feb 3 12:35:51 2017 (r433222) @@ -15,7 +15,7 @@ COMMENT= Boat racing game in the spirit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/copying.txt -USES= gmake +USES= dos2unix gmake USE_SDL= mixer image net sdl USE_GL= gl glu @@ -23,4 +23,6 @@ MAKE_ENV+= DATADIR="${DATADIR}" STAGEDIR WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +DOS2UNIX_FILES= src/*.cpp + .include Modified: head/games/bloboats/files/patch-Makefile ============================================================================== --- head/games/bloboats/files/patch-Makefile Fri Feb 3 11:31:26 2017 (r433221) +++ head/games/bloboats/files/patch-Makefile Fri Feb 3 12:35:51 2017 (r433222) @@ -1,4 +1,4 @@ ---- Makefile.orig 2010-11-23 19:27:16 UTC +--- Makefile.orig 2017-02-03 12:18:46 UTC +++ Makefile @@ -7,16 +7,13 @@ ### Installation directory (Installation prefix) Added: head/games/bloboats/files/patch-src_menu.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bloboats/files/patch-src_menu.cpp Fri Feb 3 12:35:51 2017 (r433222) @@ -0,0 +1,12 @@ +--- src/menu.cpp.orig 2017-02-03 12:18:46 UTC ++++ src/menu.cpp +@@ -1567,7 +1567,8 @@ void menu::resolution() { + // Get resolutions + vector resolutions; + SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE|SDL_OPENGL); +- if(modes > 0) { ++ // if(modes > 0) { ++ if(modes != '\0') { + Uint32 bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel; + for(int i=0; modes[i] && i < 10; ++i) { + Resolution resolution;