From owner-svn-ports-head@freebsd.org Mon May 11 10:55:31 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F2A5D2DDED7; Mon, 11 May 2020 10:55:31 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49LHsH6BlVz4Ny1; Mon, 11 May 2020 10:55:31 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5AF11D58F; Mon, 11 May 2020 10:55:31 +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 04BAtVNb043440; Mon, 11 May 2020 10:55:31 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04BAtV5B043437; Mon, 11 May 2020 10:55:31 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202005111055.04BAtV5B043437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 11 May 2020 10:55:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534902 - head/graphics/embree X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/graphics/embree X-SVN-Commit-Revision: 534902 X-SVN-Commit-Repository: ports 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.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2020 10:55:32 -0000 Author: danfe Date: Mon May 11 10:55:30 2020 New Revision: 534902 URL: https://svnweb.freebsd.org/changeset/ports/534902 Log: - Update `graphics/embree' to version 3.10.0 (*) - Drop couple of in-place "patches", that code had been fixed upstream - Use LLVM's objdump(1) if available since obsolete GNU binutils version 2.17.50 is going to be removed from the base - Switch to Intel TBB as default tasking system for optimal performance, but allow to use the internal one if needed Reported by: portscout (*) Modified: head/graphics/embree/Makefile head/graphics/embree/distinfo head/graphics/embree/pkg-plist Modified: head/graphics/embree/Makefile ============================================================================== --- head/graphics/embree/Makefile Mon May 11 10:53:18 2020 (r534901) +++ head/graphics/embree/Makefile Mon May 11 10:55:30 2020 (r534902) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= embree -PORTVERSION= 3.9.0 +PORTVERSION= 3.10.0 DISTVERSIONPREFIX= v CATEGORIES= graphics @@ -18,14 +18,15 @@ USES= cmake pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes -CMAKE_ARGS= -DEMBREE_TASKING_SYSTEM:STRING=INTERNAL \ +CMAKE_ARGS= -DEMBREE_TASKING_SYSTEM:STRING=${_ETS} \ -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \ -DEMBREE_BACKFACE_CULLING:BOOL=ON \ -DEMBREE_RAY_MASK:BOOL=ON PLIST_SUB+= VERSION=${DISTVERSION} -OPTIONS_DEFINE= DOCS EXAMPLES ISPC +OPTIONS_DEFINE= DOCS EXAMPLES ISPC TBB +OPTIONS_DEFAULT= TBB OPTIONS_SUB= yes ISPC_DESC= ISPC applications support @@ -38,6 +39,11 @@ EXAMPLES_USES= gl jpeg xorg EXAMPLES_USE= GL=gl,glu,glut XORG=x11,xau,xcb,xdmcp EXAMPLES_CMAKE_OFF= -DEMBREE_TUTORIALS:BOOL=OFF +TBB_DESC= Use Intel TBB (optimal performance) +TBB_LIB_DEPENDS= libtbb.so:devel/tbb +TBB_VARS= _ETS=TBB +TBB_VARS_OFF= _ETS=INTERNAL + .include # Disable parts that use _mm_cvtsi128_si64() which is not defined on i386 @@ -51,10 +57,12 @@ post-patch: ${WRKSRC}/common/cmake/package.cmake @${REINPLACE_CMD} -e 's,Win32,${OPSYS},gi' \ ${WRKSRC}/common/simd/vint4_sse2.h - @${REINPLACE_CMD} -e 's,#else,#elif defined(MAP_HUGETLB),' \ - ${WRKSRC}/common/sys/alloc.cpp -# Avoid "Redefining uint8/uint16/uint32/uint64 type which is part of -# ISPC language since version 1.13" error - @${ECHO_CMD} > ${WRKSRC}/tutorials/common/common.isph +# Obsolete GNU binutils 2.17.50 objdump(1) is going to be removed +# from the base, use LLVM's one if it's available +.if exists(/usr/bin/llvm-objdump) + @${REINPLACE_CMD} -e 's,objdump,llvm-&,' \ + ${WRKSRC}/common/cmake/check_globals.cmake \ + ${WRKSRC}/common/cmake/check_stack_frame_size.cmake +.endif .include Modified: head/graphics/embree/distinfo ============================================================================== --- head/graphics/embree/distinfo Mon May 11 10:53:18 2020 (r534901) +++ head/graphics/embree/distinfo Mon May 11 10:55:30 2020 (r534902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586234456 -SHA256 (embree-embree-v3.9.0_GH0.tar.gz) = 53855e2ceb639289b20448ae9deab991151aa5f0bc7f9cc02f2af4dd6199d5d1 -SIZE (embree-embree-v3.9.0_GH0.tar.gz) = 13509056 +TIMESTAMP = 1588929024 +SHA256 (embree-embree-v3.10.0_GH0.tar.gz) = 7af744b2c3a2f60aa54cdfcf7928c56f59aabec4a7310dbb96b09a6c64a5a7b0 +SIZE (embree-embree-v3.10.0_GH0.tar.gz) = 13546398 Modified: head/graphics/embree/pkg-plist ============================================================================== --- head/graphics/embree/pkg-plist Mon May 11 10:53:18 2020 (r534901) +++ head/graphics/embree/pkg-plist Mon May 11 10:55:30 2020 (r534902) @@ -18,6 +18,8 @@ include/embree3/rtcore_scene.h include/embree3/rtcore_scene.isph lib/cmake/embree-%%VERSION%%/embree-config-version.cmake lib/cmake/embree-%%VERSION%%/embree-config.cmake +lib/cmake/embree-%%VERSION%%/embree-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/embree-%%VERSION%%/embree-targets.cmake lib/libembree3.so lib/libembree3.so.3 lib/libembree3.so.%%VERSION%% @@ -172,6 +174,13 @@ man/man3/rtcUpdateGeometryBuffer.3embree3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/cornell_box_mblur.xml.bin %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve0.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve1.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_flat.ecs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_flat.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_geometry.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_oriented.ecs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_oriented.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_round.ecs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/curve_round.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/cylinder.ecs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/cylinder.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/furBall_A.bin @@ -179,6 +188,7 @@ man/man3/rtcUpdateGeometryBuffer.3embree3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/furBall_A.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/hair0.ecs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/hair0.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/hair1.ecs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/hair1.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/linesegments.ecs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/linesegments.xml @@ -192,6 +202,8 @@ man/man3/rtcUpdateGeometryBuffer.3embree3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/oriented_curve1.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/oriented_curves.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/oriented_hermite_curve_twisted.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/points.ecs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/points.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/round_line_segments_0.ecs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/round_line_segments_0.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/models/round_line_segments_1.ecs