diff options
author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2021-10-10 15:11:27 +0000 |
---|---|---|
committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2021-10-10 15:11:27 +0000 |
commit | 036bda781b0b170e823e3cacc14f25e2bd9c2b3a (patch) | |
tree | 90617ab1ae5b1a26d09f870819f8d449cc782235 | |
parent | be6f269b0dc0dd4c58d200d2389bcd6892367e6b (diff) | |
download | ports-036bda781b0b170e823e3cacc14f25e2bd9c2b3a.tar.gz ports-036bda781b0b170e823e3cacc14f25e2bd9c2b3a.zip |
devel/onetbb: Update to 2021.4.0
Release notes: https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html
30 files changed, 67 insertions, 79 deletions
diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index b153978d4f01..c1289ac3badc 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,6 +1,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= teodorsigaev@gmail.com diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 578bec315771..c24dba9c5909 100644 --- a/devel/onetbb/Makefile +++ b/devel/onetbb/Makefile @@ -1,7 +1,7 @@ # Created by: Arun Sharma <arun@sharma-home.net> PORTNAME= onetbb -PORTVERSION= 2021.3.0 +PORTVERSION= 2021.4.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -16,8 +16,8 @@ USES= cmake compiler:c++11-lang tar:tgz CMAKE_ARGS+= -DTBB_STRICT:BOOL=FALSE \ -DCMAKE_INSTALL_DOCDIR:PATH="${DOCSDIR}" \ - -DCMAKE_HWLOC_2_4_LIBRARY_PATH:PATH="${LOCALBASE}/lib/libhwloc.so" \ - -DCMAKE_HWLOC_2_4_INCLUDE_PATH:PATH="${LOCALBASE}/include" + -DCMAKE_HWLOC_2_LIBRARY_PATH:PATH="${LOCALBASE}/lib/libhwloc.so" \ + -DCMAKE_HWLOC_2_INCLUDE_PATH:PATH="${LOCALBASE}/include" CONFLICTS= tbb-[0-9]* @@ -31,8 +31,15 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS +# Pkgconfig: tbb.pc (on 64bit arch) vs tbb32.pc +PLIST_SUB= PCSUFX="${PCSUFX}" + .include <bsd.port.pre.mk> +.if ${ARCH} == i386 || ${ARCH} == powerpc +PCSUFX= 32 +.endif + .if ${ARCH} == powerpc || ${ARCH} == riscv64 EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_tbb_tools__api_ittnotify__config.h .endif diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo index b362736545bd..ce939a2ff2f6 100644 --- a/devel/onetbb/distinfo +++ b/devel/onetbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626043027 -SHA256 (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e -SIZE (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 1651329 +TIMESTAMP = 1633466066 +SHA256 (oneapi-src-oneTBB-v2021.4.0_GH0.tar.gz) = 021796c7845e155e616f5ecda16daa606ebb4c6f90b996e5c08aebab7a8d3de3 +SIZE (oneapi-src-oneTBB-v2021.4.0_GH0.tar.gz) = 2452533 diff --git a/devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp b/devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp deleted file mode 100644 index 314267054456..000000000000 --- a/devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp +++ /dev/null @@ -1,30 +0,0 @@ -Backport fa944e19600500863507ed8e9b1f5a30037d9df6 - ---- src/tbbmalloc/frontend.cpp.orig 2021-06-30 08:19:55 UTC -+++ src/tbbmalloc/frontend.cpp -@@ -802,21 +802,15 @@ static inline unsigned int highestBitPos(unsigned int - return pos; - } - -- --#if __TBB_x86_32 || __aarch32__ - unsigned int getSmallObjectIndex(unsigned int size) - { -- return (size-1)>>3; --} --#elif __TBB_x86_64 || __aarch64__ --unsigned int getSmallObjectIndex(unsigned int size) --{ -- // For 64-bit malloc, 16 byte alignment is needed except for bin 0. - unsigned int result = (size-1)>>3; -- if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes -+ if (sizeof(void*)==8) { -+ // For 64-bit malloc, 16 byte alignment is needed except for bin 0. -+ if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes -+ } - return result; - } --#endif // __TBB_x86_32 || __aarch32__ - - /* - * Depending on indexRequest, for a given size return either the index into the bin diff --git a/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h index 78edd61fe7d8..945060970e53 100644 --- a/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h +++ b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h @@ -1,16 +1,21 @@ -Backport edc39b844a483b69c39c64a136c4d62342884892 and 5c5d500d4fd502baed5176a19306e70c72d9c4e4 +Fix build on FreeBSD ---- test/common/utils_concurrency_limit.h.orig 2021-06-30 08:19:55 UTC +__unix__ is defined on FreeBSD and makes #elif __FreeBSD__ section skipped + +--- test/common/utils_concurrency_limit.h.orig 2021-10-04 09:50:18 UTC +++ test/common/utils_concurrency_limit.h -@@ -166,9 +166,10 @@ int limit_number_of_threads( int max_threads ) { - - #endif // __TBB_TEST_SKIP_AFFINITY - --#define OS_AFFINITY_SYSCALL_PRESENT ((__linux__ && !__ANDROID__) || (__FreeBSD_version >= 701000)) -+#define OS_AFFINITY_SYSCALL_PRESENT (__linux__ && !__ANDROID__) +@@ -37,12 +37,11 @@ + #endif + #include <string.h> + #include <sched.h> +-#elif __FreeBSD__ +-#include <unistd.h> ++#if __FreeBSD__ + #include <errno.h> +-#include <string.h> + #include <sys/param.h> + #include <sys/cpuset.h> ++#endif + #endif + #include <thread> - #if OS_AFFINITY_SYSCALL_PRESENT -+ - void get_thread_affinity_mask(std::size_t& ncpus, std::vector<int>& free_indexes) { - cpu_set_t* mask = nullptr; - ncpus = sizeof(cpu_set_t) * CHAR_BIT; diff --git a/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp b/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp deleted file mode 100644 index 0773770d4ab3..000000000000 --- a/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Backport b2b2a9d65b30b869962de8140a44f5b29a3072fd - ---- test/tbbmalloc/test_malloc_compliance.cpp.orig 2021-06-30 08:19:55 UTC -+++ test/tbbmalloc/test_malloc_compliance.cpp -@@ -91,7 +91,7 @@ void limitMem( size_t limit ) - } - if (rlim.rlim_max==(rlim_t)RLIM_INFINITY) - rlim.rlim_cur = (limit > 0) ? limit*MByte : rlim.rlim_max; -- else rlim.rlim_cur = (limit > 0 && limit<rlim.rlim_max) ? limit*MByte : rlim.rlim_max; -+ else rlim.rlim_cur = (limit > 0 && static_cast<rlim_t>(limit)<rlim.rlim_max) ? limit*MByte : rlim.rlim_max; - ret = setrlimit(RLIMIT_AS,&rlim); - if (0 != ret) { - REPORT("Can't set limits: errno %d\n", errno); diff --git a/devel/onetbb/pkg-plist b/devel/onetbb/pkg-plist index 5caccb0fcac2..045e649bc53e 100644 --- a/devel/onetbb/pkg-plist +++ b/devel/onetbb/pkg-plist @@ -4,6 +4,7 @@ include/oneapi/tbb/blocked_range2d.h include/oneapi/tbb/blocked_range3d.h include/oneapi/tbb/blocked_rangeNd.h include/oneapi/tbb/cache_aligned_allocator.h +include/oneapi/tbb/collaborative_call_once.h include/oneapi/tbb/combinable.h include/oneapi/tbb/concurrent_hash_map.h include/oneapi/tbb/concurrent_lru_cache.h @@ -24,6 +25,7 @@ include/oneapi/tbb/detail/_concurrent_unordered_base.h include/oneapi/tbb/detail/_config.h include/oneapi/tbb/detail/_containers_helpers.h include/oneapi/tbb/detail/_exception.h +include/oneapi/tbb/detail/_export.h include/oneapi/tbb/detail/_flow_graph_body_impl.h include/oneapi/tbb/detail/_flow_graph_cache_impl.h include/oneapi/tbb/detail/_flow_graph_impl.h @@ -37,6 +39,7 @@ include/oneapi/tbb/detail/_flow_graph_tagged_buffer_impl.h include/oneapi/tbb/detail/_flow_graph_trace_impl.h include/oneapi/tbb/detail/_flow_graph_types_impl.h include/oneapi/tbb/detail/_hash_compare.h +include/oneapi/tbb/detail/_intrusive_list_node.h include/oneapi/tbb/detail/_machine.h include/oneapi/tbb/detail/_mutex_common.h include/oneapi/tbb/detail/_namespace_injection.h @@ -51,6 +54,7 @@ include/oneapi/tbb/detail/_segment_table.h include/oneapi/tbb/detail/_small_object_pool.h include/oneapi/tbb/detail/_string_resource.h include/oneapi/tbb/detail/_task.h +include/oneapi/tbb/detail/_task_handle.h include/oneapi/tbb/detail/_template_helpers.h include/oneapi/tbb/detail/_utils.h include/oneapi/tbb/detail/_waitable_atomic.h @@ -91,6 +95,7 @@ include/tbb/blocked_range2d.h include/tbb/blocked_range3d.h include/tbb/blocked_rangeNd.h include/tbb/cache_aligned_allocator.h +include/tbb/collaborative_call_once.h include/tbb/combinable.h include/tbb/concurrent_hash_map.h include/tbb/concurrent_lru_cache.h @@ -138,14 +143,14 @@ lib/cmake/TBB/TBBTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/TBB/TBBTargets.cmake lib/libtbb.so lib/libtbb.so.12 -lib/libtbb.so.12.3 -lib/libtbbbind_2_4.so -lib/libtbbbind_2_4.so.3 -lib/libtbbbind_2_4.so.3.3 +lib/libtbb.so.12.4 +lib/libtbbbind_2_0.so +lib/libtbbbind_2_0.so.3 +lib/libtbbbind_2_0.so.3.4 lib/libtbbmalloc.so lib/libtbbmalloc.so.2 -lib/libtbbmalloc.so.2.3 +lib/libtbbmalloc.so.2.4 lib/libtbbmalloc_proxy.so lib/libtbbmalloc_proxy.so.2 -lib/libtbbmalloc_proxy.so.2.3 -libdata/pkgconfig/tbb.pc +lib/libtbbmalloc_proxy.so.2.4 +libdata/pkgconfig/tbb%%PCSUFX%%.pc diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile index 9af9aea3b1c9..7453fc5e13b3 100644 --- a/graphics/blender-lts28/Makefile +++ b/graphics/blender-lts28/Makefile @@ -1,6 +1,6 @@ PORTNAME= blender DISTVERSION= 2.83.15 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 780e3d4fa4ae..b36503293d84 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -2,7 +2,7 @@ PORTNAME= blender DISTVERSION= 2.91.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile index f2d39772bd64..c587a7e21bc2 100644 --- a/graphics/embree/Makefile +++ b/graphics/embree/Makefile @@ -2,6 +2,7 @@ PORTNAME= embree PORTVERSION= 3.13.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= graphics diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile index 7d34d03be655..176194c6ae28 100644 --- a/graphics/oidn/Makefile +++ b/graphics/oidn/Makefile @@ -1,7 +1,7 @@ PORTNAME= oidn DISTVERSIONPREFIX= v DISTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://freebsd.org/:weights # bogus URL to make the framework happy, the fetch uses Git URL below DISTFILES= ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}:weights diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 1309b8377196..fae5d3ba6c98 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -7,7 +7,7 @@ DISTVERSION= 2.2.16.0 # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz diff --git a/math/curv/Makefile b/math/curv/Makefile index 2c26a0d50e22..e2bfae5f7d1f 100644 --- a/math/curv/Makefile +++ b/math/curv/Makefile @@ -1,5 +1,6 @@ PORTNAME= curv DISTVERSION= 0.5 +PORTREVISION= 1 CATEGORIES= math lang graphics MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-alugrid/Makefile b/math/dune-alugrid/Makefile index 959ee58c05a0..ee8f1bfb5c0d 100644 --- a/math/dune-alugrid/Makefile +++ b/math/dune-alugrid/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-alugrid DISTVERSIONPREFIX= v DISTVERSION= 2.8.0rc1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-common/Makefile b/math/dune-common/Makefile index dfe6dadc09b1..0a08a46c9faa 100644 --- a/math/dune-common/Makefile +++ b/math/dune-common/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-common DISTVERSIONPREFIX= v DISTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-fem/Makefile b/math/dune-fem/Makefile index 08672e4996aa..bdfd84e274d7 100644 --- a/math/dune-fem/Makefile +++ b/math/dune-fem/Makefile @@ -1,5 +1,6 @@ PORTNAME= dune-fem DISTVERSION= 2.8.0rc1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-geometry/Makefile b/math/dune-geometry/Makefile index 58dd1d59538c..147460e6583c 100644 --- a/math/dune-geometry/Makefile +++ b/math/dune-geometry/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-geometry DISTVERSIONPREFIX= v DISTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-grid-glue/Makefile b/math/dune-grid-glue/Makefile index 1a768d9ca88a..14cec91ffedc 100644 --- a/math/dune-grid-glue/Makefile +++ b/math/dune-grid-glue/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-grid-glue DISTVERSIONPREFIX= v DISTVERSION= 2.7.0.20201113 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-grid/Makefile b/math/dune-grid/Makefile index 38feffa57a15..efa9eaeec2f5 100644 --- a/math/dune-grid/Makefile +++ b/math/dune-grid/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-grid DISTVERSIONPREFIX= v DISTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-pdelab/Makefile b/math/dune-pdelab/Makefile index 58affcba07e8..e70cf2c33e17 100644 --- a/math/dune-pdelab/Makefile +++ b/math/dune-pdelab/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-pdelab DISTVERSIONPREFIX= v DISTVERSION= 2.7.0.20210824 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-polygongrid/Makefile b/math/dune-polygongrid/Makefile index 2a13407a4a8c..b39154ec4e67 100644 --- a/math/dune-polygongrid/Makefile +++ b/math/dune-polygongrid/Makefile @@ -1,5 +1,6 @@ PORTNAME= dune-polygongrid DISTVERSION= g20210307 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-uggrid/Makefile b/math/dune-uggrid/Makefile index c6c702f421ff..517302fdee1e 100644 --- a/math/dune-uggrid/Makefile +++ b/math/dune-uggrid/Makefile @@ -1,6 +1,7 @@ PORTNAME= dune-uggrid DISTVERSIONPREFIX= v DISTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-vtk/Makefile b/math/dune-vtk/Makefile index d72a9fe0b6a6..c96524300e95 100644 --- a/math/dune-vtk/Makefile +++ b/math/dune-vtk/Makefile @@ -1,5 +1,6 @@ PORTNAME= dune-vtk DISTVERSION= g20210623 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile index 25ac46db35a8..debe300f42aa 100644 --- a/math/heyoka/Makefile +++ b/math/heyoka/Makefile @@ -1,6 +1,7 @@ PORTNAME= heyoka DISTVERSIONPREFIX= v DISTVERSION= 0.15.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/obake/Makefile b/math/obake/Makefile index ec99f706b204..1ce08da9752a 100644 --- a/math/obake/Makefile +++ b/math/obake/Makefile @@ -1,7 +1,7 @@ PORTNAME= obake DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/openturns/Makefile b/math/openturns/Makefile index 205a13b534ee..a58c7a1d746b 100644 --- a/math/openturns/Makefile +++ b/math/openturns/Makefile @@ -1,7 +1,7 @@ PORTNAME= openturns DISTVERSIONPREFIX= v DISTVERSION= 1.17 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/misc/ngraph/Makefile b/misc/ngraph/Makefile index f1afbcc24d4b..6ec08b7d4538 100644 --- a/misc/ngraph/Makefile +++ b/misc/ngraph/Makefile @@ -2,7 +2,7 @@ PORTNAME= ngraph DISTVERSIONPREFIX= v DISTVERSION= 0.29.0-rc.0-345 DISTVERSIONSUFFIX= -g58b649aa6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc # machine-learning PKGNAMESUFFIX= -machine-learning-library diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile index 349c9c590232..8abafccf5ecb 100644 --- a/misc/openvdb/Makefile +++ b/misc/openvdb/Makefile @@ -1,7 +1,7 @@ PORTNAME= openvdb DISTVERSIONPREFIX= v DISTVERSION= 8.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ diff --git a/science/opensph/Makefile b/science/opensph/Makefile index 73954ed012e0..b6c527d020ea 100644 --- a/science/opensph/Makefile +++ b/science/opensph/Makefile @@ -1,6 +1,6 @@ PORTNAME= OpenSPH DISTVERSION= 0.3.8 -PORTREVISION= 1 # accounts for the upstream moving 0.3.8 release, including bugfixes +PORTREVISION= 2 # accounts for the upstream moving 0.3.8 release, including bugfixes CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/pagmo2/Makefile b/science/pagmo2/Makefile index 336204b7d3b8..109752ebf375 100644 --- a/science/pagmo2/Makefile +++ b/science/pagmo2/Makefile @@ -1,7 +1,7 @@ PORTNAME= pagmo2 DISTVERSIONPREFIX= v DISTVERSION= 2.18.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org |