From owner-svn-ports-all@FreeBSD.ORG Thu Nov 27 18:01:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 788AC653; Thu, 27 Nov 2014 18:01:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4ADCC971; Thu, 27 Nov 2014 18:01:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sARI1b9h068298; Thu, 27 Nov 2014 18:01:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sARI1awr068296; Thu, 27 Nov 2014 18:01:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201411271801.sARI1awr068296@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 27 Nov 2014 18:01:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373503 - in head/games/openclonk: . 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.18-1 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: Thu, 27 Nov 2014 18:01:37 -0000 Author: amdmi3 Date: Thu Nov 27 18:01:36 2014 New Revision: 373503 URL: https://svnweb.freebsd.org/changeset/ports/373503 QAT: https://qat.redports.org/buildarchive/r373503/ Log: - Fix build on i386 - Mark broken on pre-clang (does not build due to lack of proper c++11 support) Approved by: portmgr blanket Added: head/games/openclonk/files/ head/games/openclonk/files/patch-src__platform__StdSync.h (contents, props changed) Modified: head/games/openclonk/Makefile Modified: head/games/openclonk/Makefile ============================================================================== --- head/games/openclonk/Makefile Thu Nov 27 17:33:10 2014 (r373502) +++ head/games/openclonk/Makefile Thu Nov 27 18:01:36 2014 (r373503) @@ -21,7 +21,7 @@ LIB_DEPENDS= libboost_thread.so:${PORTSD libpng.so:${PORTSDIR}/graphics/png \ libvorbis.so:${PORTSDIR}/audio/libvorbis -USES= cmake iconv pkgconfig tar:bzip2 +USES= compiler:c++11-lib cmake iconv pkgconfig tar:bzip2 USE_GL= glew USE_GNOME= gtk20 USE_SDL= sdl mixer @@ -29,8 +29,14 @@ USE_XORG= x11 xpm WRKSRC= ${WRKDIR}/openclonk-release-${DISTVERSIONPREFIX}${DISTVERSION}-src +.include + +.if ${OSVERSION} < 1000024 +BROKEN= does not build (lack of proper c++11 support) +.endif + post-patch: @${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \ ${WRKSRC}/CMakeLists.txt -.include +.include Added: head/games/openclonk/files/patch-src__platform__StdSync.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openclonk/files/patch-src__platform__StdSync.h Thu Nov 27 18:01:36 2014 (r373503) @@ -0,0 +1,11 @@ +--- src/platform/StdSync.h.orig 2014-10-05 17:22:07.000000000 +0400 ++++ src/platform/StdSync.h 2014-11-27 18:14:51.000000000 +0300 +@@ -135,7 +135,7 @@ + { + // Use pthread_cond_wait or pthread_cond_timedwait depending on wait length. Check return value. + // Note this will temporarily unlock the mutex, so no deadlock should occur. +- timespec ts = { iMillis / 1000, (iMillis % 1000) * 1000000 }; ++ timespec ts = { static_cast(iMillis / 1000), static_cast(iMillis % 1000) * 1000000 }; + if (0 != (iMillis != INFINITE ? pthread_cond_timedwait(&cond, &mutex, &ts) : pthread_cond_wait(&cond, &mutex))) + { + pthread_mutex_unlock(&mutex);