From owner-svn-ports-head@freebsd.org Sat Jul 28 06:33:38 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7CB5103ADC0; Sat, 28 Jul 2018 06:33:37 +0000 (UTC) (envelope-from tobik@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 9E3727D042; Sat, 28 Jul 2018 06:33:37 +0000 (UTC) (envelope-from tobik@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 7F6502308C; Sat, 28 Jul 2018 06:33:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6S6Xb14093682; Sat, 28 Jul 2018 06:33:37 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6S6Xb0v093681; Sat, 28 Jul 2018 06:33:37 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807280633.w6S6Xb0v093681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 28 Jul 2018 06:33:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475497 - head/games/odamex X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/odamex X-SVN-Commit-Revision: 475497 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.27 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: Sat, 28 Jul 2018 06:33:38 -0000 Author: tobik Date: Sat Jul 28 06:33:37 2018 New Revision: 475497 URL: https://svnweb.freebsd.org/changeset/ports/475497 Log: games/odamex: Fix build with Clang 6 common/d_dehacked.cpp:883:16: error: non-constant-expression cannot be narrowed from type 'uintptr_t' (aka 'unsigned int') to 'ptrdiff_t' (aka 'int') in initializer list [-Wc++11-narrowing] { "ID #", myoffsetof(mobjinfo_t,doomednum) }, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ http://beefy11.nyi.freebsd.org/data/head-i386-default/p475044_s336572/logs/odamex-0.7.0_2.log - While here add missing libpng dependency so that it doesn't use its own bundled version Modified: head/games/odamex/Makefile Modified: head/games/odamex/Makefile ============================================================================== --- head/games/odamex/Makefile Sat Jul 28 06:23:54 2018 (r475496) +++ head/games/odamex/Makefile Sat Jul 28 06:33:37 2018 (r475497) @@ -3,7 +3,7 @@ PORTNAME= odamex PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION} DISTNAME= odamex-src-${PORTVERSION} @@ -14,9 +14,14 @@ COMMENT= Client/server multiplayer engine for Doom LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libpng.so:graphics/png + USE_SDL= sdl mixer -USES= cmake dos2unix tar:bzip2 +USES= cmake compiler dos2unix tar:bzip2 DOS2UNIX_FILES= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp + +CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} +CXXFLAGS_clang= -Wno-c++11-narrowing OPTIONS_DEFINE= DOCS LAUNCHER