Bug#1143680: openvdb: diff for NMU version 10.0.1-3.2
Sébastien Noel <[email protected]>
| Newsgroups | gmane.linux.debian.devel.multimedia |
|---|---|
| Message-ID | <6c88813f-1175-45d0-8653-d7dc48002043__25710.0592296169$1786953567$gmane$org@twolife.be> |
Control: tags 1143680 + patch Dear maintainer, I've prepared an NMU for openvdb (versioned as 10.0.1-3.2) and will upload it to DELAYED/10 in a few minutes. Please feel free to tell me if I should cancel it. Regards. Sébastien
openvdb-10.0.1-3.2-nmu.diff
(text/x-patch, 3.6 KB)
diffstat for openvdb-10.0.1 openvdb-10.0.1 changelog | 7 ++ patches/d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.patch | 48 +++++++++++++++++ patches/series | 1 3 files changed, 56 insertions(+) diff -Nru openvdb-10.0.1/debian/changelog openvdb-10.0.1/debian/changelog --- openvdb-10.0.1/debian/changelog 2026-03-21 12:37:52.000000000 +0100 +++ openvdb-10.0.1/debian/changelog 2026-08-13 09:30:49.000000000 +0200 @@ -1,3 +1,10 @@ +openvdb (10.0.1-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream patch to fix FTBFS with TBB 2023 (Closes: #1143680) + + -- Sébastien Noel <[email protected]> Thu, 13 Aug 2026 09:30:49 +0200 + openvdb (10.0.1-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru openvdb-10.0.1/debian/patches/d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.patch openvdb-10.0.1/debian/patches/d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.patch --- openvdb-10.0.1/debian/patches/d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.patch 1970-01-01 01:00:00.000000000 +0100 +++ openvdb-10.0.1/debian/patches/d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.patch 2026-08-13 09:29:19.000000000 +0200 @@ -0,0 +1,48 @@ +From d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1 Mon Sep 17 00:00:00 2001 +From: Dan Bailey <[email protected]> +Date: Wed, 6 May 2026 09:37:43 -0700 +Subject: [PATCH] Switch from tbb/blocked_range.h to tbb/task_arena.h to pull + in TBB version macro + +Signed-off-by: Dan Bailey <[email protected]> +--- + openvdb/openvdb/thread/Threading.h | 14 ++++++++------ + pendingchanges/tbb2023.txt | 2 ++ + 2 files changed, 10 insertions(+), 6 deletions(-) + create mode 100644 pendingchanges/tbb2023.txt + +diff --git a/openvdb/openvdb/thread/Threading.h b/openvdb/openvdb/thread/Threading.h +index b339a85ecc..f1433341f9 100644 +--- a/openvdb/openvdb/thread/Threading.h ++++ b/openvdb/openvdb/thread/Threading.h +@@ -14,14 +14,16 @@ + #endif + + +-/// @note tbb/blocked_range.h is the ONLY include that persists from TBB 2020 +-/// to TBB 2021 that itself includes the TBB specific version header files. +-/// In TBB 2020, the version header was called tbb/stddef.h. In 2021, it's +-/// called tbb/version.h. We include tbb/blocked_range.h here to indirectly +-/// access the version defines in a consistent way so that downstream +-/// software doesn't need to provide compile time defines. + #include <tbb/blocked_range.h> + #include <tbb/task.h> ++/// @note tbb/task_arena.h is the ONLY include that persists from TBB 2020 ++/// to TBB 2021 to TBB 2023 that itself includes the TBB specific version ++/// header files. ++/// In TBB 2020, the version header was called tbb/stddef.h. In 2021+, it's ++/// called tbb/version.h. We include tbb/task_arena.h here to indirectly ++/// access the version defines in a consistent way so that downstream ++/// software doesn't need to provide compile time defines. ++#include <tbb/task_arena.h> + #include <tbb/task_group.h> + + namespace openvdb { +diff --git a/pendingchanges/tbb2023.txt b/pendingchanges/tbb2023.txt +new file mode 100644 +index 0000000000..ea7b65432c +--- /dev/null ++++ b/pendingchanges/tbb2023.txt +@@ -0,0 +1,2 @@ ++Build: ++ - OpenVDB now builds against TBB 2023. diff -Nru openvdb-10.0.1/debian/patches/series openvdb-10.0.1/debian/patches/series --- openvdb-10.0.1/debian/patches/series 2026-02-05 21:40:21.000000000 +0100 +++ openvdb-10.0.1/debian/patches/series 2026-08-13 09:29:42.000000000 +0200 @@ -9,3 +9,4 @@ unittests.patch llvm.patch stdc++17.diff +d68d0914fc6ed41cadd363bd4330c39a7fb5b1f1.patch