- Belatedly update `graphics/embree' to the latest version, 2.17.1

- Add ISPC option and enable it by default (this pulls rather heavy
  `devel/llvm50' via BUILD_DEPENDS and normally would not be enabled
  by default, but since Embree is most likely to be used in graphics
  applications, it is safe to assume that users already have LLVM 5
  installed because X.org/Mesa stack unconditionally requires it)
- OpenEXR support was removed upstream since version 2.13.0 back in
  November 11, 2016: https://github.com/embree/embree/commit/483491e
  (as usual, unfortunately, no explanation was provided in the log)
- Remove CXXFLAGS+=-msse2 required for i386 earlier, not needed now
- Add missing USE_GL, USE_XORG components as prompted by `stage-qa'

PR:	214577, 224066

Because GitHub releases (tarballs) are not fetched with correct modification
time, set TIMESTAMP to 1510648523 which corresponds to commit 90e49f2 tagged
as this release.
This commit is contained in:
Alexey Dokuchaev 2017-12-29 16:46:46 +00:00
parent ed1d97b1db
commit fde4d555a5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=457515
4 changed files with 76 additions and 20 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= embree
PORTVERSION= 2.12.0
PORTREVISION= 1
PORTVERSION= 2.17.1
DISTVERSIONPREFIX= v
CATEGORIES= graphics
@ -17,32 +16,42 @@ ONLY_FOR_ARCHS_REASON= heavy use of SSE instructions
USE_GITHUB= yes
USES= cmake
USE_GL= glut
USE_XORG= xmu
USES= cmake compiler:env
USE_GL= gl glu glut
USE_XORG= xi xmu
USE_LDCONFIG= yes
CMAKE_ARGS= -DEMBREE_TASKING_SYSTEM:STRING=INTERNAL \
-DEMBREE_ISPC_SUPPORT:BOOL=OFF
CXXFLAGS+= -msse2 # required on i386
CMAKE_ARGS= -DEMBREE_TASKING_SYSTEM:STRING=INTERNAL
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2
PLIST_SUB+= VERSION=${DISTVERSION}
OPTIONS_DEFINE= IMAGEMAGICK JPEG OPENEXR PNG
IMAGEMAGICK_DESC= BMP, GIF, PNG, TGA, TIFF image formats support
OPTIONS_DEFINE= IMAGEMAGICK ISPC JPEG PNG
OPTIONS_DEFAULT= ISPC
OPTIONS_SUB= yes
IMAGEMAGICK_DESC= BMP, GIF, PNG, TGA, TIFF image formats support
IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick
IMAGEMAGICK_CMAKE_ON= -DEMBREE_TUTORIALS_IMAGE_MAGICK:BOOL=ON
ISPC_DESC= ISPC applications support
ISPC_BUILD_DEPENDS= ispc:devel/ispc
ISPC_CMAKE_OFF= -DEMBREE_ISPC_SUPPORT:BOOL=OFF
JPEG_USES= jpeg
JPEG_CMAKE_OFF= -DEMBREE_TUTORIALS_LIBJPEG:BOOL=OFF
OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
OPENEXR_CMAKE_OFF= -DEMBREE_TUTORIALS_OPENEXR:BOOL=OFF
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_CMAKE_OFF= -DEMBREE_TUTORIALS_LIBPNG:BOOL=OFF
.include <bsd.port.mk>
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e 's,#else,#elif defined(MAP_HUGETLB),' \
${WRKSRC}/common/sys/alloc.cpp
# Old versions of Clang (e.g. on FreeBSD 10.x) do not support `-z' options
.if ${COMPILER_VERSION} < 35
@${REINPLACE_CMD} -e '/ -z /d' ${WRKSRC}/common/cmake/clang.cmake
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1476794305
SHA256 (embree-embree-v2.12.0_GH0.tar.gz) = 14153c4a8fd4413a01f584df16b89b5c9f904083d8044557e0f268232b1db19d
SIZE (embree-embree-v2.12.0_GH0.tar.gz) = 1838935
TIMESTAMP = 1510648523
SHA256 (embree-embree-v2.17.1_GH0.tar.gz) = ab4af2f86690f82228337bb4e54213ca3316fd38726770f720fe2c9b4cf0f066
SIZE (embree-embree-v2.17.1_GH0.tar.gz) = 2107410

View file

@ -7,4 +7,8 @@ These kernels are optimized for photo-realistic rendering on the latest
Intel processors with support for SSE, AVX, AVX2, AVX512, and the 16-wide
Intel Xeon Phi coprocessor vector instructions.
Embree supports applications written with the Intel SPMD Program Compiler
(ISPC, available as `devel/ispc' port) by also providing an ISPC interface
to the core ray tracing algorithms.
WWW: https://embree.github.io/

View file

@ -1,41 +1,84 @@
bin/embree2/buildbench
bin/embree2/bvh_access
bin/embree2/bvh_builder
bin/embree2/convert
bin/embree2/curve_geometry
%%ISPC%%bin/embree2/curve_geometry_ispc
bin/embree2/displacement_geometry
%%ISPC%%bin/embree2/displacement_geometry_ispc
bin/embree2/dynamic_scene
%%ISPC%%bin/embree2/dynamic_scene_ispc
bin/embree2/hair_geometry
%%ISPC%%bin/embree2/hair_geometry_ispc
bin/embree2/instanced_geometry
%%ISPC%%bin/embree2/instanced_geometry_ispc
bin/embree2/interpolation
%%ISPC%%bin/embree2/interpolation_ispc
bin/embree2/intersection_filter
%%ISPC%%bin/embree2/intersection_filter_ispc
bin/embree2/lazy_geometry
%%ISPC%%bin/embree2/lazy_geometry_ispc
bin/embree2/models/cornell_box.ecs
bin/embree2/models/cornell_box.mtl
bin/embree2/models/cornell_box.obj
bin/embree2/models/cornell_box.xml
bin/embree2/models/cornell_box.xml.bin
bin/embree2/models/curve0.xml
bin/embree2/models/curve1.xml
bin/embree2/models/cylinder.ecs
bin/embree2/models/cylinder.xml
bin/embree2/models/hair0.ecs
bin/embree2/models/hair0.xml
bin/embree2/models/linesegments.ecs
bin/embree2/models/linesegments.xml
bin/embree2/models/subdiv0.ecs
bin/embree2/models/subdiv0.xml
bin/embree2/models/subdiv1.ecs
bin/embree2/models/subdiv1.xml
bin/embree2/models/subdiv2.xml
bin/embree2/models/subdiv3.ecs
bin/embree2/models/subdiv3.xml
bin/embree2/models/subdiv4.ecs
bin/embree2/models/subdiv4.xml
bin/embree2/models/subdiv5.ecs
bin/embree2/models/subdiv5.xml
bin/embree2/models/subdiv6.ecs
bin/embree2/models/subdiv6.xml
bin/embree2/models/subdiv7.ecs
bin/embree2/models/subdiv7.xml
bin/embree2/models/subdiv8.ecs
bin/embree2/models/subdiv8.xml
bin/embree2/models/subdiv9.ecs
bin/embree2/models/subdiv9.xml
bin/embree2/models/subdiv_no_boundary.ecs
bin/embree2/models/subdiv_no_boundary.xml
bin/embree2/models/subdiv_pin_all.ecs
bin/embree2/models/subdiv_pin_all.xml
bin/embree2/models/subdiv_pin_boundary.ecs
bin/embree2/models/subdiv_pin_boundary.xml
bin/embree2/models/subdiv_pin_corners.ecs
bin/embree2/models/subdiv_pin_corners.xml
bin/embree2/models/subdiv_smooth_boundary.ecs
bin/embree2/models/subdiv_smooth_boundary.xml
bin/embree2/motion_blur_geometry
%%ISPC%%bin/embree2/motion_blur_geometry_ispc
bin/embree2/pathtracer
%%ISPC%%bin/embree2/pathtracer_ispc
bin/embree2/subdivision_geometry
%%ISPC%%bin/embree2/subdivision_geometry_ispc
bin/embree2/triangle_geometry
%%ISPC%%bin/embree2/triangle_geometry_ispc
bin/embree2/user_geometry
%%ISPC%%bin/embree2/user_geometry_ispc
bin/embree2/verify
bin/embree2/viewer
%%ISPC%%bin/embree2/viewer_ispc
bin/embree2/viewer_anim
%%ISPC%%bin/embree2/viewer_anim_ispc
bin/embree2/viewer_stream
%%ISPC%%bin/embree2/viewer_stream_ispc
include/embree2/rtcore.h
include/embree2/rtcore.isph
include/embree2/rtcore_builder.h
include/embree2/rtcore_geometry.h
include/embree2/rtcore_geometry.isph
include/embree2/rtcore_geometry_user.h
@ -44,7 +87,7 @@ include/embree2/rtcore_ray.h
include/embree2/rtcore_ray.isph
include/embree2/rtcore_scene.h
include/embree2/rtcore_scene.isph
lib/cmake/embree-%%VERSION%%/embree-config-default.cmake
include/embree2/rtcore_version.h
lib/cmake/embree-%%VERSION%%/embree-config-version.cmake
lib/cmake/embree-%%VERSION%%/embree-config.cmake
lib/libembree.so