From owner-svn-ports-head@freebsd.org  Wed Jun  1 14:16:14 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 A3307B4F3D7;
 Wed,  1 Jun 2016 14:16:14 +0000 (UTC)
 (envelope-from danfe@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 749171452;
 Wed,  1 Jun 2016 14:16:14 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u51EGDhc081162;
 Wed, 1 Jun 2016 14:16:13 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u51EGDLu081161;
 Wed, 1 Jun 2016 14:16:13 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201606011416.u51EGDLu081161@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 1 Jun 2016 14:16:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416244 - head/graphics/embree
X-SVN-Group: ports-head
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2016 14:16:14 -0000

Author: danfe
Date: Wed Jun  1 14:16:13 2016
New Revision: 416244
URL: https://svnweb.freebsd.org/changeset/ports/416244

Log:
  Fix installed header by replacing vendor-specific (mainly MSVC) keyword
  `__forceinline' with `inline __attribute__((always_inline))', which is
  how upstream originally defines it in order to be understood by both
  Clang and GCC, and don't force CHOSEN_COMPILER_TYPE as it is not needed
  anymore.  Bump port revision.

Modified:
  head/graphics/embree/Makefile

Modified: head/graphics/embree/Makefile
==============================================================================
--- head/graphics/embree/Makefile	Wed Jun  1 13:55:55 2016	(r416243)
+++ head/graphics/embree/Makefile	Wed Jun  1 14:16:13 2016	(r416244)
@@ -4,6 +4,7 @@
 PORTNAME=	embree
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -24,8 +25,7 @@ USE_XORG=	xmu
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DRTCORE_TASKING_SYSTEM:STRING=INTERNAL \
-		-DENABLE_ISPC_SUPPORT:BOOL=OFF \
-		-DCOMPILER:STRING=${CHOSEN_COMPILER_TYPE:tu}
+		-DENABLE_ISPC_SUPPORT:BOOL=OFF
 
 CXXFLAGS+=	-msse2					# required on i386
 
@@ -57,5 +57,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/encodeRGB8_to_JPEG/s,size_t \*,unsigned \
 		long *,' ${WRKSRC}/tutorials/common/image/image.h \
 		${WRKSRC}/tutorials/common/image/jpeg.cpp
+	@${REINPLACE_CMD} -e 's,__forceinline,inline __attribute__((always_inline)),' \
+		${WRKSRC}/include/embree2/rtcore_ray.h
 
 .include <bsd.port.mk>