From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1412138-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 34D27158094
for <garchives@archives.gentoo.org>; Sat, 25 Jun 2022 23:33:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EF9D3E0839;
Sat, 25 Jun 2022 23:33:40 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4D221E0839
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jun 2022 23:33:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F36B3341596
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jun 2022 23:33:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E249480
for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jun 2022 23:33:37 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1656200003.d7f8763ca52ef8a17cf9271997fc8e4a4c83e75d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/, sci-libs/opencascade/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch sci-libs/opencascade/opencascade-7.5.3-r7.ebuild sci-libs/opencascade/opencascade-7.5.3-r8.ebuild sci-libs/opencascade/opencascade-7.6.1-r1.ebuild sci-libs/opencascade/opencascade-7.6.1-r2.ebuild sci-libs/opencascade/opencascade-7.6.2-r1.ebuild sci-libs/opencascade/opencascade-7.6.2.ebuild
X-VCS-Directories: sci-libs/opencascade/files/ sci-libs/opencascade/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d7f8763ca52ef8a17cf9271997fc8e4a4c83e75d
X-VCS-Branch: master
Date: Sat, 25 Jun 2022 23:33:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a4e10121-d43d-44af-bc74-7ef67ae065f1
X-Archives-Hash: 3ac173c770e996487ba94aa356c8bef4
commit: d7f8763ca52ef8a17cf9271997fc8e4a4c83e75d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 23:06:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 23:33:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f8763c
sci-libs/opencascade: allow newer TBB
Bug: https://bugs.gentoo.org/851783
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/opencascade-7.5.3-tbb-2021.patch | 51 ++++++++++++++++++++++
...7.5.3-r7.ebuild => opencascade-7.5.3-r8.ebuild} | 3 +-
...7.6.1-r1.ebuild => opencascade-7.6.1-r2.ebuild} | 3 +-
...de-7.6.2.ebuild => opencascade-7.6.2-r1.ebuild} | 3 +-
4 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
new file mode 100644
index 000000000000..38770ac9a541
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
@@ -0,0 +1,51 @@
+https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3
+
+From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001
+From: kgv <kgv@opencascade.com>
+Date: Mon, 29 Nov 2021 21:26:45 +0300
+Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB
+ 2021
+
+Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception.
+--- a/src/OSD/OSD_Parallel_TBB.cxx
++++ b/src/OSD/OSD_Parallel_TBB.cxx
+@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
+ #include <tbb/parallel_for.h>
+ #include <tbb/parallel_for_each.h>
+ #include <tbb/blocked_range.h>
+-#include <tbb/task_scheduler_init.h>
++#if TBB_VERSION_MAJOR < 2021
++ #include <tbb/task_scheduler_init.h>
++#endif
+ Standard_ENABLE_DEPRECATION_WARNINGS
+
+ //=======================================================================
+@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+ const FunctorInterface& theFunctor,
+ Standard_Integer theNbItems)
+ {
++#if TBB_VERSION_MAJOR >= 2021
++ // task_scheduler_init is removed,
++ // exceptions are captured without proxy tbb::captured_exception object
++ (void )theNbItems;
++ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
++#else
+ try
+ {
+ const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
+- const Standard_Integer aNbThreads = theNbItems > 0 ?
+- aThreadPool->NbDefaultThreadsToLaunch() : -1;
+-
++ const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1;
+ tbb::task_scheduler_init aScheduler (aNbThreads);
+ tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+ }
+@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+ {
+ throw Standard_ProgramError (anException.what());
+ }
++#endif
+ }
+
+ #endif /* HAVE_TBB */
+
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
rename to sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 8287de53da6b..87b782fa5e6a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r7.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4.0 )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="${RDEPEND}"
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
rename to sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
index 41e15cf2bd76..e11b24187775 100644
--- a/sci-libs/opencascade/opencascade-7.6.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4 )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
)
src_prepare() {
diff --git a/sci-libs/opencascade/opencascade-7.6.2.ebuild b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
similarity index 98%
rename from sci-libs/opencascade/opencascade-7.6.2.ebuild
rename to sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
index 7914fe259a7e..7773a90fb9f2 100644
--- a/sci-libs/opencascade/opencascade-7.6.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
)
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
- tbb? ( <dev-cpp/tbb-2021.4 )
+ tbb? ( dev-cpp/tbb:= )
vtk? ( sci-libs/vtk:=[rendering] )
"
DEPEND="
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
"${FILESDIR}"/${P}-avoid-pre-stripping-binaries.patch
+ "${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
)
src_prepare() {