Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Jun 2016 14:16:13 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416244 - head/graphics/embree
Message-ID:  <201606011416.u51EGDLu081161@repo.freebsd.org>

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



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