Date: Fri, 9 Jul 2021 11:07:26 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0da9b8bd4370 - main - devel/onetbb: Update to 2021.3.0 Message-ID: <202107091107.169B7Q2Z077469@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=0da9b8bd43709541d0a7eba2d5e3dcc11b420650 commit 0da9b8bd43709541d0a7eba2d5e3dcc11b420650 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2021-07-09 11:05:19 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2021-07-09 11:05:19 +0000 devel/onetbb: Update to 2021.3.0 Release notes: https://software.intel.com/content/www/us/en/develop/articles/intel-oneapi-threading-building-blocks-release-notes.html --- devel/onetbb/Makefile | 11 +---------- devel/onetbb/distinfo | 6 +++--- devel/onetbb/files/onetbb.pc.in | 10 ---------- devel/onetbb/files/patch-test-common-memory_usage.h | 12 ------------ .../files/patch-test-common-utils_concurrency_limit.h | 16 ++++++++++++++++ .../patch-test-tbbmalloc-test_malloc_compliance.cpp | 6 +++--- devel/onetbb/pkg-plist | 15 ++++++++++----- graphics/blender-lts28/Makefile | 2 +- graphics/blender/Makefile | 2 +- graphics/embree/Makefile | 2 +- graphics/oidn/Makefile | 1 + graphics/openimageio/Makefile | 2 +- math/dune-common/Makefile | 2 +- math/dune-geometry/Makefile | 2 +- math/dune-grid/Makefile | 2 +- math/dune-pdelab/Makefile | 2 +- math/dune-uggrid/Makefile | 2 +- math/openturns/Makefile | 2 +- math/saga/Makefile | 2 +- misc/ngraph/Makefile | 2 +- 20 files changed, 46 insertions(+), 55 deletions(-) diff --git a/devel/onetbb/Makefile b/devel/onetbb/Makefile index 92c35b3cfe62..578bec315771 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.2.0 +PORTVERSION= 2021.3.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -25,12 +25,6 @@ USE_GITHUB= yes GH_ACCOUNT= oneapi-src GH_PROJECT= oneTBB -SUB_FILES= onetbb.pc -SUB_LIST= prefix="${PREFIX}" \ - name="${PORTNAME}" \ - description="${COMMENT}" \ - version="${PORTVERSION}" - USE_LDCONFIG= yes PORTDOCS= README.md @@ -43,7 +37,4 @@ OPTIONS_DEFINE= DOCS EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_tbb_tools__api_ittnotify__config.h .endif -post-install: - ${INSTALL_DATA} ${WRKDIR}/onetbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig - .include <bsd.port.post.mk> diff --git a/devel/onetbb/distinfo b/devel/onetbb/distinfo index d59b54391657..8ac070e78dbe 100644 --- a/devel/onetbb/distinfo +++ b/devel/onetbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617819323 -SHA256 (oneapi-src-oneTBB-v2021.2.0_GH0.tar.gz) = cee20b0a71d977416f3e3b4ec643ee4f38cedeb2a9ff015303431dd9d8d79854 -SIZE (oneapi-src-oneTBB-v2021.2.0_GH0.tar.gz) = 1606919 +TIMESTAMP = 1625085505 +SHA256 (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e +SIZE (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 1651329 diff --git a/devel/onetbb/files/onetbb.pc.in b/devel/onetbb/files/onetbb.pc.in deleted file mode 100644 index 3a229fe83b6c..000000000000 --- a/devel/onetbb/files/onetbb.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%%prefix%% -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: %%name%% -Description: %%description%% -Version: %%version%% -Libs: -L${libdir} -ltbb -Cflags: -I${includedir} diff --git a/devel/onetbb/files/patch-test-common-memory_usage.h b/devel/onetbb/files/patch-test-common-memory_usage.h deleted file mode 100644 index c1813d83c17a..000000000000 --- a/devel/onetbb/files/patch-test-common-memory_usage.h +++ /dev/null @@ -1,12 +0,0 @@ ---- test/common/memory_usage.h.orig 2020-12-08 11:00:57 UTC -+++ test/common/memory_usage.h -@@ -119,7 +119,8 @@ namespace utils { - ASSERT(status == KERN_SUCCESS, NULL); - return info.virtual_size - shared_size; - #else -- return 0; -+ // Use stat var to work around unused parameter error -+ return stat == currentUsage ? 0 : 0; - #endif - } - diff --git a/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h new file mode 100644 index 000000000000..78edd61fe7d8 --- /dev/null +++ b/devel/onetbb/files/patch-test-common-utils_concurrency_limit.h @@ -0,0 +1,16 @@ +Backport edc39b844a483b69c39c64a136c4d62342884892 and 5c5d500d4fd502baed5176a19306e70c72d9c4e4 + +--- test/common/utils_concurrency_limit.h.orig 2021-06-30 08:19:55 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__) + + #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 index 893228604321..0773770d4ab3 100644 --- a/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp +++ b/devel/onetbb/files/patch-test-tbbmalloc-test_malloc_compliance.cpp @@ -1,13 +1,13 @@ -error: comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'rlim_t' (aka 'long') +Backport b2b2a9d65b30b869962de8140a44f5b29a3072fd ---- test/tbbmalloc/test_malloc_compliance.cpp.orig 2020-12-08 11:00:57 UTC +--- 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 && limit<(size_t)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 2f1601193448..5caccb0fcac2 100644 --- a/devel/onetbb/pkg-plist +++ b/devel/onetbb/pkg-plist @@ -38,6 +38,7 @@ 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/_machine.h +include/oneapi/tbb/detail/_mutex_common.h include/oneapi/tbb/detail/_namespace_injection.h include/oneapi/tbb/detail/_node_handle.h include/oneapi/tbb/detail/_pipeline_filters.h @@ -45,18 +46,21 @@ include/oneapi/tbb/detail/_pipeline_filters_deduction.h include/oneapi/tbb/detail/_range_common.h include/oneapi/tbb/detail/_rtm_mutex.h include/oneapi/tbb/detail/_rtm_rw_mutex.h +include/oneapi/tbb/detail/_scoped_lock.h 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/_template_helpers.h include/oneapi/tbb/detail/_utils.h +include/oneapi/tbb/detail/_waitable_atomic.h include/oneapi/tbb/enumerable_thread_specific.h include/oneapi/tbb/flow_graph.h include/oneapi/tbb/flow_graph_abstractions.h include/oneapi/tbb/global_control.h include/oneapi/tbb/info.h include/oneapi/tbb/memory_pool.h +include/oneapi/tbb/mutex.h include/oneapi/tbb/null_mutex.h include/oneapi/tbb/null_rw_mutex.h include/oneapi/tbb/parallel_for.h @@ -70,6 +74,7 @@ include/oneapi/tbb/partitioner.h include/oneapi/tbb/profiling.h include/oneapi/tbb/queuing_mutex.h include/oneapi/tbb/queuing_rw_mutex.h +include/oneapi/tbb/rw_mutex.h include/oneapi/tbb/scalable_allocator.h include/oneapi/tbb/spin_mutex.h include/oneapi/tbb/spin_rw_mutex.h @@ -133,14 +138,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.2 +lib/libtbb.so.12.3 lib/libtbbbind_2_4.so lib/libtbbbind_2_4.so.3 -lib/libtbbbind_2_4.so.3.2 +lib/libtbbbind_2_4.so.3.3 lib/libtbbmalloc.so lib/libtbbmalloc.so.2 -lib/libtbbmalloc.so.2.2 +lib/libtbbmalloc.so.2.3 lib/libtbbmalloc_proxy.so lib/libtbbmalloc_proxy.so.2 -lib/libtbbmalloc_proxy.so.2.2 -libdata/pkgconfig/onetbb.pc +lib/libtbbmalloc_proxy.so.2.3 +libdata/pkgconfig/tbb.pc diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile index 752b470ab188..4dbc0f4b7dad 100644 --- a/graphics/blender-lts28/Makefile +++ b/graphics/blender-lts28/Makefile @@ -1,6 +1,6 @@ PORTNAME= blender DISTVERSION= 2.83.15 -PORTREVISION= 3 +PORTREVISION= 4 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 355cfa54a388..28ce58affa1a 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -2,7 +2,7 @@ PORTNAME= blender DISTVERSION= 2.91.0 -PORTREVISION= 9 +PORTREVISION= 10 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 9ca08689fe2d..3e975ad1580f 100644 --- a/graphics/embree/Makefile +++ b/graphics/embree/Makefile @@ -3,7 +3,7 @@ PORTNAME= embree PORTVERSION= 3.13.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile index 750edabc3e22..7d34d03be655 100644 --- a/graphics/oidn/Makefile +++ b/graphics/oidn/Makefile @@ -1,6 +1,7 @@ PORTNAME= oidn DISTVERSIONPREFIX= v DISTVERSION= 1.4.1 +PORTREVISION= 1 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 8c50903e0718..6b7a3a927b74 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -7,7 +7,7 @@ DISTVERSION= 2.2.13.1 # py-openimageio's PORTREVISION. # Also, just to be on the safe side, when resetting, # best keep PORTREVISION?= 0. -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz diff --git a/math/dune-common/Makefile b/math/dune-common/Makefile index 28ae3c752d6a..68694c42208f 100644 --- a/math/dune-common/Makefile +++ b/math/dune-common/Makefile @@ -1,7 +1,7 @@ PORTNAME= dune-common DISTVERSIONPREFIX= v DISTVERSION= 2.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-geometry/Makefile b/math/dune-geometry/Makefile index 70b77b24401d..3786b86c75a7 100644 --- a/math/dune-geometry/Makefile +++ b/math/dune-geometry/Makefile @@ -1,7 +1,7 @@ PORTNAME= dune-geometry DISTVERSIONPREFIX= v DISTVERSION= 2.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-grid/Makefile b/math/dune-grid/Makefile index 7d7c6968c42a..6a8910c06d8d 100644 --- a/math/dune-grid/Makefile +++ b/math/dune-grid/Makefile @@ -1,7 +1,7 @@ PORTNAME= dune-grid DISTVERSIONPREFIX= v DISTVERSION= 2.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-pdelab/Makefile b/math/dune-pdelab/Makefile index 6b2d2c53752e..9bdf486fffe9 100644 --- a/math/dune-pdelab/Makefile +++ b/math/dune-pdelab/Makefile @@ -1,7 +1,7 @@ PORTNAME= dune-pdelab DISTVERSIONPREFIX= v DISTVERSION= 2.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/dune-uggrid/Makefile b/math/dune-uggrid/Makefile index c45c8da8423b..318e3ccf30de 100644 --- a/math/dune-uggrid/Makefile +++ b/math/dune-uggrid/Makefile @@ -1,7 +1,7 @@ PORTNAME= dune-uggrid DISTVERSIONPREFIX= v DISTVERSION= 2.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/openturns/Makefile b/math/openturns/Makefile index 95dbfd3f49aa..ed5e45cd76cc 100644 --- a/math/openturns/Makefile +++ b/math/openturns/Makefile @@ -1,7 +1,7 @@ PORTNAME= openturns DISTVERSIONPREFIX= v DISTVERSION= 1.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/saga/Makefile b/math/saga/Makefile index b9bc7eb296fc..404af68d20f9 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -2,7 +2,7 @@ PORTNAME= saga PORTVERSION= 7.9.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} diff --git a/misc/ngraph/Makefile b/misc/ngraph/Makefile index d13f5aa0a38d..f1afbcc24d4b 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= 6 +PORTREVISION= 7 CATEGORIES= misc # machine-learning PKGNAMESUFFIX= -machine-learning-library
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107091107.169B7Q2Z077469>