From f5161f74ce86a803284ed187b1026d57f31e0dda Mon Sep 17 00:00:00 2001 From: danfe Date: Wed, 1 Jun 2016 14:16:13 +0000 Subject: 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. --- graphics/embree/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'graphics') diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile index 1b99c6324db..6409366d357 100644 --- a/graphics/embree/Makefile +++ b/graphics/embree/Makefile @@ -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 -- cgit