Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jul 2018 06:33:37 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475497 - head/games/odamex
Message-ID:  <201807280633.w6S6Xb0v093681@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807280633.w6S6Xb0v093681>