Date: Mon, 17 Oct 2016 10:38:50 +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: r424104 - in head/graphics/embree: . files Message-ID: <201610171038.u9HAcog7084618@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Oct 17 10:38:50 2016 New Revision: 424104 URL: https://svnweb.freebsd.org/changeset/ports/424104 Log: - Update `graphics/embree' to version 2.11.0 - GC patches (all of them got integrated upstream) - Rename IMAGE_MAGICK option to a standard IMAGEMAGICK, but keep custom description which is more specific and follows internal one Because GitHub releases (tarballs) are not fetched with correct modification time, set TIMESTAMP to 1472729819 which corresponds to commit aa318b0 tagged as this release. Deleted: head/graphics/embree/files/ Modified: head/graphics/embree/Makefile head/graphics/embree/distinfo head/graphics/embree/pkg-plist Modified: head/graphics/embree/Makefile ============================================================================== --- head/graphics/embree/Makefile Mon Oct 17 10:38:05 2016 (r424103) +++ head/graphics/embree/Makefile Mon Oct 17 10:38:50 2016 (r424104) @@ -3,8 +3,7 @@ PORTNAME= embree DISTVERSIONPREFIX= v -DISTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.11.0 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org @@ -24,40 +23,27 @@ USE_GL= glut USE_XORG= xmu USE_LDCONFIG= yes -CMAKE_ARGS= -DRTCORE_TASKING_SYSTEM:STRING=INTERNAL \ - -DENABLE_ISPC_SUPPORT:BOOL=OFF +CMAKE_ARGS= -DEMBREE_TASKING_SYSTEM:STRING=INTERNAL \ + -DEMBREE_ISPC_SUPPORT:BOOL=OFF CXXFLAGS+= -msse2 # required on i386 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2 PLIST_SUB+= VERSION=${DISTVERSION} -OPTIONS_DEFINE= IMAGE_MAGICK JPEG OPENEXR PNG -IMAGE_MAGICK_DESC= BMP, GIF, PNG, TGA, TIFF image formats support +OPTIONS_DEFINE= IMAGEMAGICK JPEG OPENEXR PNG +IMAGEMAGICK_DESC= BMP, GIF, PNG, TGA, TIFF image formats support -IMAGE_MAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick -IMAGE_MAGICK_CMAKE_ON= -DUSE_IMAGE_MAGICK:BOOL=ON +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_CMAKE_ON= -DEMBREE_TUTORIALS_IMAGE_MAGICK:BOOL=ON JPEG_USES= jpeg -JPEG_CMAKE_OFF= -DUSE_LIBJPEG:BOOL=OFF +JPEG_CMAKE_OFF= -DEMBREE_TUTORIALS_LIBJPEG:BOOL=OFF OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR -OPENEXR_CMAKE_OFF= -DUSE_OPENEXR:BOOL=OFF +OPENEXR_CMAKE_OFF= -DEMBREE_TUTORIALS_OPENEXR:BOOL=OFF PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_CMAKE_OFF= -DUSE_LIBPNG:BOOL=OFF - -post-patch: - @${REINPLACE_CMD} -e 's,MAP_HUGETLB,MAP_ALIGNED_SUPER,' \ - ${WRKSRC}/common/sys/alloc.cpp - @${REINPLACE_CMD} -e '/__aligned/s,^,//,' \ - ${WRKSRC}/common/sys/platform.h - @${REINPLACE_CMD} -e 's,MAP_POPULATE,MAP_PREFAULT_READ,' \ - ${WRKSRC}/tests/benchmark.cpp - @${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 +PNG_CMAKE_OFF= -DEMBREE_TUTORIALS_LIBPNG:BOOL=OFF .include <bsd.port.mk> Modified: head/graphics/embree/distinfo ============================================================================== --- head/graphics/embree/distinfo Mon Oct 17 10:38:05 2016 (r424103) +++ head/graphics/embree/distinfo Mon Oct 17 10:38:50 2016 (r424104) @@ -1,2 +1,3 @@ -SHA256 (embree-embree-v2.10.0_GH0.tar.gz) = c011dc3c035c9618733a2e256ca24efe54aea937f86069e24ff87b02af2d50e4 -SIZE (embree-embree-v2.10.0_GH0.tar.gz) = 1774006 +TIMESTAMP = 1472729819 +SHA256 (embree-embree-v2.11.0_GH0.tar.gz) = 35283fa82c3f345a05a9d3ff3af5a36cf71d75d19dc9150a681999f301d67832 +SIZE (embree-embree-v2.11.0_GH0.tar.gz) = 1789427 Modified: head/graphics/embree/pkg-plist ============================================================================== --- head/graphics/embree/pkg-plist Mon Oct 17 10:38:05 2016 (r424103) +++ head/graphics/embree/pkg-plist Mon Oct 17 10:38:50 2016 (r424104) @@ -1,4 +1,3 @@ -bin/embree2/benchmark bin/embree2/bvh_access bin/embree2/bvh_builder bin/embree2/convert @@ -29,7 +28,6 @@ bin/embree2/models/subdiv8.xml bin/embree2/models/subdiv9.xml bin/embree2/motion_blur_geometry bin/embree2/pathtracer -bin/embree2/retrace bin/embree2/subdivision_geometry bin/embree2/triangle_geometry bin/embree2/user_geometry
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610171038.u9HAcog7084618>