[PR PATCH] tbb: update to 2021.11.0.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] tbb: update to 2021.11.0.
@ 2024-02-21 21:37 Calandracas606
  2024-02-21 21:41 ` Calandracas606
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-21 21:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]

There is a new pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages tbb
https://github.com/void-linux/void-packages/pull/48872

tbb: update to 2021.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested TBB, but have not tested the bumped packages

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

Tested builds for bumped packages in all the above architectures (when supported)

Fixed the build for PrusaSlicer, however it segfaults immediately: https://github.com/void-linux/void-packages/issues/46687

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/48872.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-48872.patch --]
[-- Type: text/x-diff, Size: 18633 bytes --]

From bddc475378a4a54a3ad21fe05ea86a356227f7ed Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 08:58:51 -0500
Subject: [PATCH 01/12] tbb: update to 2021.11.0.

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 18 -------
 srcpkgs/tbb/template                     | 68 +++++++-----------------
 4 files changed, 19 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 delete mode 100644 srcpkgs/tbb/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 34596bac98f4b5..a024b2dfd3a9d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2340,13 +2340,10 @@ libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
-libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.11.0_1
 libembree.so.3 embree-3.12.2_1
-libtbb_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
 libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch
deleted file mode 100644
index 4aefeff192b52a..00000000000000
--- a/srcpkgs/tbb/patches/hostname-usage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/version_info_linux.sh
-+++ b/build/version_info_linux.sh
-@@ -20,7 +20,7 @@
- 
- # Script used to generate version info string
- echo "#define __TBB_VERSION_STRINGS(N) \\"
--echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
-+echo '#N": BUILD_HOST'"\t\t"`hostname`" ("`uname -m`")"'" ENDL \'
- # find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
- echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
- echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \'
diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch
deleted file mode 100644
index a8867eb5379376..00000000000000
--- a/srcpkgs/tbb/patches/musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/tbbmalloc/proxy.cpp	2018-10-17 14:05:31.311723013 +0200
-+++ b/src/tbbmalloc/proxy.cpp	2018-10-17 14:06:32.972726194 +0200
-@@ -28,6 +28,7 @@
- // of aligned_alloc as required by new C++ standard, this makes it hard to
- // redefine aligned_alloc here. However, running on systems with new libc
- // version, it still needs it to be redefined, thus tricking system headers
-+#if defined(__GLIBC__)
- #if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
- // tell <cstdlib> that there is no aligned_alloc
- #undef _GLIBCXX_HAVE_ALIGNED_ALLOC
-@@ -37,6 +38,7 @@
- #include <cstdlib>
- #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
-+#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
- 
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 250561cde8e705..a64d7d5d8e3abe 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,44 @@
 # Template file for 'tbb'
 pkgname=tbb
-reverts="2021.5.0_1"
-version=2020.U3
-revision=2
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-build_style=gnu-makefile
-hostmakedepends="cmake"
+version=2021.11.0
+revision=1
+wrksrc="oneTBB-${version}"
+build_style=cmake
+configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
+makedepends="libgomp-devel libhwloc-devel"
 short_desc="Intel Threading Building Blocks"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.threadingbuildingblocks.org"
-distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
-checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
+changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/master/RELEASE_NOTES.md"
+distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz"
+checksum=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363
+make_check=no  # checks fail upstream on i686
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*)
-		make_build_args="arch=intel64"
-		;;
-	i686*)
-		make_build_args="arch=ia32"
-		;;
-	armv7l*)
-		make_build_args="arch=armv7"
-		;;
-	aarch64*)
-		make_build_args="arch=arm64"
-		;;
-	ppc64*)
-		make_build_args="arch=ppc64"
-		;;
-	ppc*)
-		make_build_args="arch=ppc32"
-		;;
-	*)
-		# make sure to fall back instead of letting host uname control it
-		make_build_args="arch=generic"
-		;;
+	x86_64*|aarch64*)
+		build_options_default+=" -DTBB4PY_BUILD=ON"
+		hostmakedepends+=" python3-devel python3-distutils-extra swig"
+		makedepends+=" python3-devel"
+	;;
 esac
 
 post_extract() {
-	sed -i 's|CPLUS = g..|CPLUS = $(CXX)|g' build/linux.gcc.inc
-	sed -i 's|CONLY = gcc|CONLY = $(CC)|g' build/linux.gcc.inc
-
 	# alternative might be:
 	# https://git.alpinelinux.org/cgit/aports/tree/testing/libtbb/glibc-struct-mallinfo.patch
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
-		  -i src/tbbmalloc/proxy.h
+		  -i src/tbbmalloc_proxy/proxy.h
 	fi
 }
 
-do_install() {
-	vmkdir usr/lib
-	vcopy build/linux_*/*.so* usr/lib
-	vmkdir usr/include/tbb
-	vcopy include/tbb/* usr/include/tbb
-
-	cmake \
-		-DINSTALL_DIR=$DESTDIR/usr/lib/cmake/TBB \
-		-DSYSTEM_NAME=Linux \
-		-DLIB_REL_PATH=../.. \
-		-DINC_REL_PATH=../../../include \
-		-P cmake/tbb_config_installer.cmake
-}
-
 tbb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

From 4dc102ef39b4ba5c4227b819f27a3c285f19edd2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:50 -0500
Subject: [PATCH 02/12] OpenSubdiv: rebuild for tbb

---
 srcpkgs/OpenSubdiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 81e4fa926bd24e..76d950301cd01d 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=3
+revision=4
 build_style=cmake
 # TODO: CUDA/OpenCL support
 # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable

From 34791df9c0d879006b228093d54ad9a72876da52 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:53 -0500
Subject: [PATCH 03/12] PrusaSlicer: rebuild for tbb, fix build.

---
 .../patches/ambiguous-overloads.patch         | 28 ++++++
 srcpkgs/PrusaSlicer/patches/cstdint.patch     | 85 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  2 +-
 3 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/cstdint.patch

diff --git a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
new file mode 100644
index 00000000000000..eb8cd200a0bbc3
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
@@ -0,0 +1,28 @@
+diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+index 2364c5624..c977bee4c 100644
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+     // Always fill in the "printhost_port" combo box from the config and select it.
+     {
+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+-        choice->set_values({ m_config->opt_string("printhost_port") });
++	const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
++        choice->set_values(printhost_port);
+         choice->set_selection();
+     }
+ 
+diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
+index 2d00674c0..011ef7cfd 100644
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
+ 
+     p->reset();
+ 
+-    if (! load_files({ into_path(filename) }).empty()) {
++    boost::filesystem::path full_path = into_path(filename);
++    if (! load_files({ full_path }, true, true).empty()) {
+         // At least one file was loaded.
+         p->set_project_filename(filename);
+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/srcpkgs/PrusaSlicer/patches/cstdint.patch b/srcpkgs/PrusaSlicer/patches/cstdint.patch
new file mode 100644
index 00000000000000..3b74f98a57889f
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cstdint.patch
@@ -0,0 +1,85 @@
+From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 5 May 2023 20:39:46 +0200
+Subject: [PATCH] add missing includes of <cstdint> (PR #10499)
+
+---
+ deps/OpenEXR/OpenEXR.cmake      |  3 ++-
+ deps/OpenEXR/OpenEXR.patch      | 36 +++++++++++++++++++++++++++++++++
+ src/libslic3r/PNGReadWrite.hpp  |  1 +
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 deps/OpenEXR/OpenEXR.patch
+
+diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
+index 046223fed9e..094965d0421 100644
+--- a/deps/OpenEXR/OpenEXR.cmake
++++ b/deps/OpenEXR/OpenEXR.cmake
+@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
+     URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+     DEPENDS ${ZLIB_PKG}
+     GIT_TAG v2.5.5
++    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
+     CMAKE_ARGS
+         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+         -DBUILD_TESTING=OFF 
+@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
+ 
+ if (MSVC)
+     add_debug_dep(dep_OpenEXR)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
+new file mode 100644
+index 00000000000..22adbd27784
+--- /dev/null
++++ b/deps/OpenEXR/OpenEXR.patch
+@@ -0,0 +1,36 @@
++diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++index 59d1d5d1..585a3e65 100644
++--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++@@ -159,6 +159,7 @@
++ #include <limits>
++ 
++ #include <cstddef>
+++#include <cstdint>
++ 
++ 
++ // Windows specific addition to prevent the indirect import of the redefined min/max macros
++diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
++index 271849b7..165fac58 100644
++--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++++ b/OpenEXR/IlmImf/ImfHuf.cpp
++@@ -53,6 +53,7 @@
++ #include <cstring>
++ #include <cassert>
++ #include <algorithm>
+++#include <cstdint>
++ 
++ 
++ using namespace std;
++diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
++index d2c84787..4b487940 100644
++--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++++ b/OpenEXR/IlmImf/ImfMisc.cpp
++@@ -40,6 +40,7 @@
++ //
++ //-----------------------------------------------------------------------------
++ 
+++#include <cstdint>
++ #include <ImfMisc.h>
++ #include <ImfHeader.h>
++ #include <ImfAttribute.h>
+diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
+index 01e1f474500..399c6224382 100644
+--- a/src/libslic3r/PNGReadWrite.hpp
++++ b/src/libslic3r/PNGReadWrite.hpp
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include <istream>
++#include <cstdint>
+ 
+ namespace Slic3r { namespace png {
+ 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c2290..04d1e74a3533d0 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.5.2
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower

From 6ab17b1402d441c420849ca1d750fedd5650f90d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:57 -0500
Subject: [PATCH 04/12] blender: rebuild for tbb

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 1dc61ec9d29d84..68787b76a26c18 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=4.0.2
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="usr/share/blender/${version%.*}/scripts"

From 79dd898211846ef82f8b77c0ecf9443c6c4f3bcb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:00 -0500
Subject: [PATCH 05/12] easyeffects: rebuild for tbb

---
 srcpkgs/easyeffects/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 9af8212cf4a168..44d531e73fd92f 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
 version=7.1.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
  gtk4-update-icon-cache"

From 55a85ae5cbdfac8beedc620fc7d65ed2c132470a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:03 -0500
Subject: [PATCH 06/12] embree: rebuild for tbb

---
 srcpkgs/embree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 114240f02a8461..17b1aa0fc5e311 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,7 +1,7 @@
 # Template file for 'embree'
 pkgname=embree
 version=4.3.1
-revision=1
+revision=2
 archs="aarch64* x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF

From 070b910fdd63a0ce36166cf454ab2f71f858a7fd Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:07 -0500
Subject: [PATCH 07/12] openimagedenoise: rebuild for tbb

---
 srcpkgs/openimagedenoise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index b792813dba7c29..109deb171c3f75 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 hostmakedepends="ispc python3"

From f4e34c62853457866612557e6ac6d368dba91019 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:10 -0500
Subject: [PATCH 08/12] openimageio: rebuild for tbb

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 3ce3f9e49d350c..27d2131bc0a61a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=7
+revision=8
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From 46ae99142e81b584770267fa874c660f5de3326c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:13 -0500
Subject: [PATCH 09/12] openpgl: rebuild for tbb

---
 srcpkgs/openpgl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openpgl/template b/srcpkgs/openpgl/template
index 4caffb336c84be..64b19c6a164f20 100644
--- a/srcpkgs/openpgl/template
+++ b/srcpkgs/openpgl/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgl'
 pkgname=openpgl
 version=0.5.0
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 configure_args="-DOPENPGL_BUILD_TOOLS=On"

From 49389e159a8294cc0892e2e2c62878f68772d41a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:17 -0500
Subject: [PATCH 10/12] openvdb: rebuild for tbb

---
 srcpkgs/openvdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 278709b4b7892c..c84569aefeff73 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"

From bb9b8c71c4dbfde7328876902454ad8a9bde1ba5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:20 -0500
Subject: [PATCH 11/12] root: rebuild for tbb

---
 srcpkgs/root/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 641fdcec9019dd..5ac16b099b7d01 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
 # Template file for 'root'
 pkgname=root
 version=6.30.02
-revision=2
+revision=3
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
 build_style=cmake

From 041dce9e51e826acd961c72f4041a216f7d22799 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:23 -0500
Subject: [PATCH 12/12] sysdig: rebuild for tbb

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index b451f73920a4e3..25bea57b91c042 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.33.1
-revision=4
+revision=5
 _falcover=59fb313475b82f842e9e9bbc1e0e629428c0a4cf
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
@ 2024-02-21 21:41 ` Calandracas606
  2024-02-21 21:43 ` [PR PATCH] [Updated] " Calandracas606
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-21 21:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#issuecomment-1958012341

Comment:
@thypon FYI this is an update to a package for which you are listed as the maintainer

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
  2024-02-21 21:41 ` Calandracas606
@ 2024-02-21 21:43 ` Calandracas606
  2024-02-21 21:44 ` thypon
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-21 21:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages tbb
https://github.com/void-linux/void-packages/pull/48872

tbb: update to 2021.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested TBB, but have not tested the bumped packages

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

Tested builds for bumped packages in all the above architectures (when supported)

Fixed the build for PrusaSlicer, however it segfaults immediately: https://github.com/void-linux/void-packages/issues/46687

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/48872.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-48872.patch --]
[-- Type: text/x-diff, Size: 18605 bytes --]

From 6094e4d456921e1380f526c29f095081c0a83262 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 08:58:51 -0500
Subject: [PATCH 01/12] tbb: update to 2021.11.0.

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 18 -------
 srcpkgs/tbb/template                     | 67 ++++++------------------
 4 files changed, 18 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 delete mode 100644 srcpkgs/tbb/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index 34596bac98f4b5..a024b2dfd3a9d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2340,13 +2340,10 @@ libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
-libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.11.0_1
 libembree.so.3 embree-3.12.2_1
-libtbb_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
 libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch
deleted file mode 100644
index 4aefeff192b52a..00000000000000
--- a/srcpkgs/tbb/patches/hostname-usage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/version_info_linux.sh
-+++ b/build/version_info_linux.sh
-@@ -20,7 +20,7 @@
- 
- # Script used to generate version info string
- echo "#define __TBB_VERSION_STRINGS(N) \\"
--echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
-+echo '#N": BUILD_HOST'"\t\t"`hostname`" ("`uname -m`")"'" ENDL \'
- # find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
- echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
- echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \'
diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch
deleted file mode 100644
index a8867eb5379376..00000000000000
--- a/srcpkgs/tbb/patches/musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/tbbmalloc/proxy.cpp	2018-10-17 14:05:31.311723013 +0200
-+++ b/src/tbbmalloc/proxy.cpp	2018-10-17 14:06:32.972726194 +0200
-@@ -28,6 +28,7 @@
- // of aligned_alloc as required by new C++ standard, this makes it hard to
- // redefine aligned_alloc here. However, running on systems with new libc
- // version, it still needs it to be redefined, thus tricking system headers
-+#if defined(__GLIBC__)
- #if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
- // tell <cstdlib> that there is no aligned_alloc
- #undef _GLIBCXX_HAVE_ALIGNED_ALLOC
-@@ -37,6 +38,7 @@
- #include <cstdlib>
- #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
-+#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
- 
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 250561cde8e705..c47817bdeb6d63 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,43 @@
 # Template file for 'tbb'
 pkgname=tbb
-reverts="2021.5.0_1"
-version=2020.U3
-revision=2
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-build_style=gnu-makefile
-hostmakedepends="cmake"
+version=2021.11.0
+revision=1
+build_style=cmake
+configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
+makedepends="libgomp-devel libhwloc-devel"
 short_desc="Intel Threading Building Blocks"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://www.threadingbuildingblocks.org"
-distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
-checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
+changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/master/RELEASE_NOTES.md"
+distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz"
+checksum=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363
+make_check=no  # checks fail upstream on i686
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*)
-		make_build_args="arch=intel64"
-		;;
-	i686*)
-		make_build_args="arch=ia32"
-		;;
-	armv7l*)
-		make_build_args="arch=armv7"
-		;;
-	aarch64*)
-		make_build_args="arch=arm64"
-		;;
-	ppc64*)
-		make_build_args="arch=ppc64"
-		;;
-	ppc*)
-		make_build_args="arch=ppc32"
-		;;
-	*)
-		# make sure to fall back instead of letting host uname control it
-		make_build_args="arch=generic"
-		;;
+	x86_64*|aarch64*)
+		build_options_default+=" -DTBB4PY_BUILD=ON"
+		hostmakedepends+=" python3-devel python3-distutils-extra swig"
+		makedepends+=" python3-devel"
+	;;
 esac
 
 post_extract() {
-	sed -i 's|CPLUS = g..|CPLUS = $(CXX)|g' build/linux.gcc.inc
-	sed -i 's|CONLY = gcc|CONLY = $(CC)|g' build/linux.gcc.inc
-
 	# alternative might be:
 	# https://git.alpinelinux.org/cgit/aports/tree/testing/libtbb/glibc-struct-mallinfo.patch
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
-		  -i src/tbbmalloc/proxy.h
+		  -i src/tbbmalloc_proxy/proxy.h
 	fi
 }
 
-do_install() {
-	vmkdir usr/lib
-	vcopy build/linux_*/*.so* usr/lib
-	vmkdir usr/include/tbb
-	vcopy include/tbb/* usr/include/tbb
-
-	cmake \
-		-DINSTALL_DIR=$DESTDIR/usr/lib/cmake/TBB \
-		-DSYSTEM_NAME=Linux \
-		-DLIB_REL_PATH=../.. \
-		-DINC_REL_PATH=../../../include \
-		-P cmake/tbb_config_installer.cmake
-}
-
 tbb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

From 10dc677128ced452f3f72539eab877788c6d2e0c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:50 -0500
Subject: [PATCH 02/12] OpenSubdiv: rebuild for tbb

---
 srcpkgs/OpenSubdiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 81e4fa926bd24e..76d950301cd01d 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=3
+revision=4
 build_style=cmake
 # TODO: CUDA/OpenCL support
 # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable

From 331948833f2aa9352510dfc53ac12c78aec7c31d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:53 -0500
Subject: [PATCH 03/12] PrusaSlicer: rebuild for tbb, fix build.

---
 .../patches/ambiguous-overloads.patch         | 28 ++++++
 srcpkgs/PrusaSlicer/patches/cstdint.patch     | 85 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  2 +-
 3 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/cstdint.patch

diff --git a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
new file mode 100644
index 00000000000000..eb8cd200a0bbc3
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
@@ -0,0 +1,28 @@
+diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+index 2364c5624..c977bee4c 100644
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+     // Always fill in the "printhost_port" combo box from the config and select it.
+     {
+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+-        choice->set_values({ m_config->opt_string("printhost_port") });
++	const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
++        choice->set_values(printhost_port);
+         choice->set_selection();
+     }
+ 
+diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
+index 2d00674c0..011ef7cfd 100644
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
+ 
+     p->reset();
+ 
+-    if (! load_files({ into_path(filename) }).empty()) {
++    boost::filesystem::path full_path = into_path(filename);
++    if (! load_files({ full_path }, true, true).empty()) {
+         // At least one file was loaded.
+         p->set_project_filename(filename);
+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/srcpkgs/PrusaSlicer/patches/cstdint.patch b/srcpkgs/PrusaSlicer/patches/cstdint.patch
new file mode 100644
index 00000000000000..3b74f98a57889f
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cstdint.patch
@@ -0,0 +1,85 @@
+From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 5 May 2023 20:39:46 +0200
+Subject: [PATCH] add missing includes of <cstdint> (PR #10499)
+
+---
+ deps/OpenEXR/OpenEXR.cmake      |  3 ++-
+ deps/OpenEXR/OpenEXR.patch      | 36 +++++++++++++++++++++++++++++++++
+ src/libslic3r/PNGReadWrite.hpp  |  1 +
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 deps/OpenEXR/OpenEXR.patch
+
+diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
+index 046223fed9e..094965d0421 100644
+--- a/deps/OpenEXR/OpenEXR.cmake
++++ b/deps/OpenEXR/OpenEXR.cmake
+@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
+     URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+     DEPENDS ${ZLIB_PKG}
+     GIT_TAG v2.5.5
++    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
+     CMAKE_ARGS
+         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+         -DBUILD_TESTING=OFF 
+@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
+ 
+ if (MSVC)
+     add_debug_dep(dep_OpenEXR)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
+new file mode 100644
+index 00000000000..22adbd27784
+--- /dev/null
++++ b/deps/OpenEXR/OpenEXR.patch
+@@ -0,0 +1,36 @@
++diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++index 59d1d5d1..585a3e65 100644
++--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++@@ -159,6 +159,7 @@
++ #include <limits>
++ 
++ #include <cstddef>
+++#include <cstdint>
++ 
++ 
++ // Windows specific addition to prevent the indirect import of the redefined min/max macros
++diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
++index 271849b7..165fac58 100644
++--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++++ b/OpenEXR/IlmImf/ImfHuf.cpp
++@@ -53,6 +53,7 @@
++ #include <cstring>
++ #include <cassert>
++ #include <algorithm>
+++#include <cstdint>
++ 
++ 
++ using namespace std;
++diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
++index d2c84787..4b487940 100644
++--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++++ b/OpenEXR/IlmImf/ImfMisc.cpp
++@@ -40,6 +40,7 @@
++ //
++ //-----------------------------------------------------------------------------
++ 
+++#include <cstdint>
++ #include <ImfMisc.h>
++ #include <ImfHeader.h>
++ #include <ImfAttribute.h>
+diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
+index 01e1f474500..399c6224382 100644
+--- a/src/libslic3r/PNGReadWrite.hpp
++++ b/src/libslic3r/PNGReadWrite.hpp
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include <istream>
++#include <cstdint>
+ 
+ namespace Slic3r { namespace png {
+ 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c2290..04d1e74a3533d0 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.5.2
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower

From e6e63bc948bd1dfa887b1044ffd386aaef16434f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:57 -0500
Subject: [PATCH 04/12] blender: rebuild for tbb

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 1dc61ec9d29d84..68787b76a26c18 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=4.0.2
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="usr/share/blender/${version%.*}/scripts"

From 6025e7e44558133e8b143268a465630fc7cf0abb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:00 -0500
Subject: [PATCH 05/12] easyeffects: rebuild for tbb

---
 srcpkgs/easyeffects/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 9af8212cf4a168..44d531e73fd92f 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
 version=7.1.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
  gtk4-update-icon-cache"

From 3b8fbdf8661c203147b78b97190341144fb57a1a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:03 -0500
Subject: [PATCH 06/12] embree: rebuild for tbb

---
 srcpkgs/embree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 114240f02a8461..17b1aa0fc5e311 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,7 +1,7 @@
 # Template file for 'embree'
 pkgname=embree
 version=4.3.1
-revision=1
+revision=2
 archs="aarch64* x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF

From efe51e60e4f914f3ff35d26417cc73bcbad86998 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:07 -0500
Subject: [PATCH 07/12] openimagedenoise: rebuild for tbb

---
 srcpkgs/openimagedenoise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index b792813dba7c29..109deb171c3f75 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 hostmakedepends="ispc python3"

From dd36dea26663c2169daf27f6434860f5a6238c79 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:10 -0500
Subject: [PATCH 08/12] openimageio: rebuild for tbb

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 3ce3f9e49d350c..27d2131bc0a61a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=7
+revision=8
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From 91ab9d83ff6e6b2b5ccb34f59a9121cce77fec2f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:13 -0500
Subject: [PATCH 09/12] openpgl: rebuild for tbb

---
 srcpkgs/openpgl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openpgl/template b/srcpkgs/openpgl/template
index 4caffb336c84be..64b19c6a164f20 100644
--- a/srcpkgs/openpgl/template
+++ b/srcpkgs/openpgl/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgl'
 pkgname=openpgl
 version=0.5.0
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 configure_args="-DOPENPGL_BUILD_TOOLS=On"

From defe72ea04ecfd9c445e9d1d8c5961a594e9a15d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:17 -0500
Subject: [PATCH 10/12] openvdb: rebuild for tbb

---
 srcpkgs/openvdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 278709b4b7892c..c84569aefeff73 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"

From 7b9c2e1ed57a184c1b917f37e38edea62b3f584e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:20 -0500
Subject: [PATCH 11/12] root: rebuild for tbb

---
 srcpkgs/root/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 641fdcec9019dd..5ac16b099b7d01 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
 # Template file for 'root'
 pkgname=root
 version=6.30.02
-revision=2
+revision=3
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
 build_style=cmake

From 93e75af8d476bc926e40d16340a979c5424605b0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:23 -0500
Subject: [PATCH 12/12] sysdig: rebuild for tbb

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index b451f73920a4e3..25bea57b91c042 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.33.1
-revision=4
+revision=5
 _falcover=59fb313475b82f842e9e9bbc1e0e629428c0a4cf
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
  2024-02-21 21:41 ` Calandracas606
  2024-02-21 21:43 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-02-21 21:44 ` thypon
  2024-02-22 19:40 ` [PR REVIEW] " cinerea0
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: thypon @ 2024-02-21 21:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by thypon on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#issuecomment-1958022434

Comment:
sounds good to me

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (3 preceding siblings ...)
  2024-02-22 19:40 ` [PR REVIEW] " cinerea0
@ 2024-02-22 19:40 ` cinerea0
  2024-02-22 19:40 ` cinerea0
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: cinerea0 @ 2024-02-22 19:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1499802130

Comment:
```suggestion
homepage="https://oneapi-src.github.io/oneTBB/"
```

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (5 preceding siblings ...)
  2024-02-22 19:40 ` cinerea0
@ 2024-02-22 19:40 ` cinerea0
  2024-02-22 21:45 ` [PR PATCH] [Updated] " Calandracas606
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: cinerea0 @ 2024-02-22 19:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1499820674

Comment:
These comments haven't been relevant for a while, you can remove them.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (2 preceding siblings ...)
  2024-02-21 21:44 ` thypon
@ 2024-02-22 19:40 ` cinerea0
  2024-02-22 19:40 ` cinerea0
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: cinerea0 @ 2024-02-22 19:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1499799831

Comment:
```suggestion
		vmove "usr/lib/*.so"
```
You don't need to move this to the end.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (4 preceding siblings ...)
  2024-02-22 19:40 ` cinerea0
@ 2024-02-22 19:40 ` cinerea0
  2024-02-22 19:40 ` cinerea0
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: cinerea0 @ 2024-02-22 19:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1499826396

Comment:
```suggestion
esac

if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
	makedepends+=" libucontext-devel"
	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
fi

if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
	makedepends+=" libatomic-devel"
	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
fi
```

I found these build options fixed some problems. The `libucontext` one in particular enables relocation on musl.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (6 preceding siblings ...)
  2024-02-22 19:40 ` cinerea0
@ 2024-02-22 21:45 ` Calandracas606
  2024-02-22 21:48 ` Calandracas606
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-22 21:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages tbb
https://github.com/void-linux/void-packages/pull/48872

tbb: update to 2021.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested TBB, but have not tested the bumped packages

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

Tested builds for bumped packages in all the above architectures (when supported)

Fixed the build for PrusaSlicer, however it segfaults immediately: https://github.com/void-linux/void-packages/issues/46687

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/48872.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-48872.patch --]
[-- Type: text/x-diff, Size: 18934 bytes --]

From 3c0b1873aea3891694deed8ec8f51571b80d8d7d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 08:58:51 -0500
Subject: [PATCH 01/12] tbb: update to 2021.11.0.

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 18 ------
 srcpkgs/tbb/template                     | 80 +++++++++---------------
 4 files changed, 29 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 delete mode 100644 srcpkgs/tbb/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index cde1106f7dbeff..26598845c19b71 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2340,13 +2340,10 @@ libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
-libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.11.0_1
 libembree.so.3 embree-3.12.2_1
-libtbb_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
 libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch
deleted file mode 100644
index 4aefeff192b52a..00000000000000
--- a/srcpkgs/tbb/patches/hostname-usage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/version_info_linux.sh
-+++ b/build/version_info_linux.sh
-@@ -20,7 +20,7 @@
- 
- # Script used to generate version info string
- echo "#define __TBB_VERSION_STRINGS(N) \\"
--echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
-+echo '#N": BUILD_HOST'"\t\t"`hostname`" ("`uname -m`")"'" ENDL \'
- # find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
- echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
- echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \'
diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch
deleted file mode 100644
index a8867eb5379376..00000000000000
--- a/srcpkgs/tbb/patches/musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/tbbmalloc/proxy.cpp	2018-10-17 14:05:31.311723013 +0200
-+++ b/src/tbbmalloc/proxy.cpp	2018-10-17 14:06:32.972726194 +0200
-@@ -28,6 +28,7 @@
- // of aligned_alloc as required by new C++ standard, this makes it hard to
- // redefine aligned_alloc here. However, running on systems with new libc
- // version, it still needs it to be redefined, thus tricking system headers
-+#if defined(__GLIBC__)
- #if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
- // tell <cstdlib> that there is no aligned_alloc
- #undef _GLIBCXX_HAVE_ALIGNED_ALLOC
-@@ -37,6 +38,7 @@
- #include <cstdlib>
- #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
-+#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
- 
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 250561cde8e705..1da7897d3bd5cd 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,52 @@
 # Template file for 'tbb'
 pkgname=tbb
-reverts="2021.5.0_1"
-version=2020.U3
-revision=2
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-build_style=gnu-makefile
-hostmakedepends="cmake"
+version=2021.11.0
+revision=1
+build_style=cmake
+configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
+makedepends="libgomp-devel libhwloc-devel"
 short_desc="Intel Threading Building Blocks"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-homepage="https://www.threadingbuildingblocks.org"
-distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
-checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
+homepage="https://oneapi-src.github.io/oneTBB/"
+changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/v${version}/RELEASE_NOTES.md"
+distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz"
+checksum=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363
+make_check=no  # checks fail upstream on i686
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*)
-		make_build_args="arch=intel64"
-		;;
-	i686*)
-		make_build_args="arch=ia32"
-		;;
-	armv7l*)
-		make_build_args="arch=armv7"
-		;;
-	aarch64*)
-		make_build_args="arch=arm64"
-		;;
-	ppc64*)
-		make_build_args="arch=ppc64"
-		;;
-	ppc*)
-		make_build_args="arch=ppc32"
-		;;
-	*)
-		# make sure to fall back instead of letting host uname control it
-		make_build_args="arch=generic"
-		;;
+	x86_64*|aarch64*)
+		build_options_default+=" -DTBB4PY_BUILD=ON"
+		hostmakedepends+=" python3-devel python3-distutils-extra swig"
+		makedepends+=" python3-devel"
+	;;
 esac
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
+
 post_extract() {
-	sed -i 's|CPLUS = g..|CPLUS = $(CXX)|g' build/linux.gcc.inc
-	sed -i 's|CONLY = gcc|CONLY = $(CC)|g' build/linux.gcc.inc
 
-	# alternative might be:
-	# https://git.alpinelinux.org/cgit/aports/tree/testing/libtbb/glibc-struct-mallinfo.patch
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
-		  -i src/tbbmalloc/proxy.h
+		  -i src/tbbmalloc_proxy/proxy.h
 	fi
 }
 
-do_install() {
-	vmkdir usr/lib
-	vcopy build/linux_*/*.so* usr/lib
-	vmkdir usr/include/tbb
-	vcopy include/tbb/* usr/include/tbb
-
-	cmake \
-		-DINSTALL_DIR=$DESTDIR/usr/lib/cmake/TBB \
-		-DSYSTEM_NAME=Linux \
-		-DLIB_REL_PATH=../.. \
-		-DINC_REL_PATH=../../../include \
-		-P cmake/tbb_config_installer.cmake
-}
-
 tbb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
 	}
 }

From 7422c03ccd53bd7e6a8fc24940cd078eaf32b420 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:50 -0500
Subject: [PATCH 02/12] OpenSubdiv: rebuild for tbb

---
 srcpkgs/OpenSubdiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 81e4fa926bd24e..76d950301cd01d 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=3
+revision=4
 build_style=cmake
 # TODO: CUDA/OpenCL support
 # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable

From 58caf7da3d5af6edac3f63118bdf2f5405e77739 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:53 -0500
Subject: [PATCH 03/12] PrusaSlicer: rebuild for tbb, fix build.

---
 .../patches/ambiguous-overloads.patch         | 28 ++++++
 srcpkgs/PrusaSlicer/patches/cstdint.patch     | 85 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  2 +-
 3 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/cstdint.patch

diff --git a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
new file mode 100644
index 00000000000000..eb8cd200a0bbc3
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
@@ -0,0 +1,28 @@
+diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+index 2364c5624..c977bee4c 100644
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+     // Always fill in the "printhost_port" combo box from the config and select it.
+     {
+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+-        choice->set_values({ m_config->opt_string("printhost_port") });
++	const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
++        choice->set_values(printhost_port);
+         choice->set_selection();
+     }
+ 
+diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
+index 2d00674c0..011ef7cfd 100644
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
+ 
+     p->reset();
+ 
+-    if (! load_files({ into_path(filename) }).empty()) {
++    boost::filesystem::path full_path = into_path(filename);
++    if (! load_files({ full_path }, true, true).empty()) {
+         // At least one file was loaded.
+         p->set_project_filename(filename);
+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/srcpkgs/PrusaSlicer/patches/cstdint.patch b/srcpkgs/PrusaSlicer/patches/cstdint.patch
new file mode 100644
index 00000000000000..3b74f98a57889f
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cstdint.patch
@@ -0,0 +1,85 @@
+From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 5 May 2023 20:39:46 +0200
+Subject: [PATCH] add missing includes of <cstdint> (PR #10499)
+
+---
+ deps/OpenEXR/OpenEXR.cmake      |  3 ++-
+ deps/OpenEXR/OpenEXR.patch      | 36 +++++++++++++++++++++++++++++++++
+ src/libslic3r/PNGReadWrite.hpp  |  1 +
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 deps/OpenEXR/OpenEXR.patch
+
+diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
+index 046223fed9e..094965d0421 100644
+--- a/deps/OpenEXR/OpenEXR.cmake
++++ b/deps/OpenEXR/OpenEXR.cmake
+@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
+     URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+     DEPENDS ${ZLIB_PKG}
+     GIT_TAG v2.5.5
++    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
+     CMAKE_ARGS
+         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+         -DBUILD_TESTING=OFF 
+@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
+ 
+ if (MSVC)
+     add_debug_dep(dep_OpenEXR)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
+new file mode 100644
+index 00000000000..22adbd27784
+--- /dev/null
++++ b/deps/OpenEXR/OpenEXR.patch
+@@ -0,0 +1,36 @@
++diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++index 59d1d5d1..585a3e65 100644
++--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++@@ -159,6 +159,7 @@
++ #include <limits>
++ 
++ #include <cstddef>
+++#include <cstdint>
++ 
++ 
++ // Windows specific addition to prevent the indirect import of the redefined min/max macros
++diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
++index 271849b7..165fac58 100644
++--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++++ b/OpenEXR/IlmImf/ImfHuf.cpp
++@@ -53,6 +53,7 @@
++ #include <cstring>
++ #include <cassert>
++ #include <algorithm>
+++#include <cstdint>
++ 
++ 
++ using namespace std;
++diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
++index d2c84787..4b487940 100644
++--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++++ b/OpenEXR/IlmImf/ImfMisc.cpp
++@@ -40,6 +40,7 @@
++ //
++ //-----------------------------------------------------------------------------
++ 
+++#include <cstdint>
++ #include <ImfMisc.h>
++ #include <ImfHeader.h>
++ #include <ImfAttribute.h>
+diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
+index 01e1f474500..399c6224382 100644
+--- a/src/libslic3r/PNGReadWrite.hpp
++++ b/src/libslic3r/PNGReadWrite.hpp
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include <istream>
++#include <cstdint>
+ 
+ namespace Slic3r { namespace png {
+ 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c2290..04d1e74a3533d0 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.5.2
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower

From b41c15c8ad9ca968d4e077c279fba57b1932ae62 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:57 -0500
Subject: [PATCH 04/12] blender: rebuild for tbb

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 1dc61ec9d29d84..68787b76a26c18 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=4.0.2
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="usr/share/blender/${version%.*}/scripts"

From 5514c8fbd75f910752836188a24208b38a5b2f0c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:00 -0500
Subject: [PATCH 05/12] easyeffects: rebuild for tbb

---
 srcpkgs/easyeffects/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 9af8212cf4a168..44d531e73fd92f 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
 version=7.1.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
  gtk4-update-icon-cache"

From ff0bd8d2637e2c5504626b200b2d80978aa41e37 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:03 -0500
Subject: [PATCH 06/12] embree: rebuild for tbb

---
 srcpkgs/embree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 114240f02a8461..17b1aa0fc5e311 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,7 +1,7 @@
 # Template file for 'embree'
 pkgname=embree
 version=4.3.1
-revision=1
+revision=2
 archs="aarch64* x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF

From 0ea7e27b53836d462073aeaff2d587cda244cb55 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:07 -0500
Subject: [PATCH 07/12] openimagedenoise: rebuild for tbb

---
 srcpkgs/openimagedenoise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index b792813dba7c29..109deb171c3f75 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 hostmakedepends="ispc python3"

From 15ad3528e18600425aa9ea933ffa126e76962719 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:10 -0500
Subject: [PATCH 08/12] openimageio: rebuild for tbb

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 3ce3f9e49d350c..27d2131bc0a61a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=7
+revision=8
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From af9376973f8b00a475f649b4527272800140f33e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:13 -0500
Subject: [PATCH 09/12] openpgl: rebuild for tbb

---
 srcpkgs/openpgl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openpgl/template b/srcpkgs/openpgl/template
index 4caffb336c84be..64b19c6a164f20 100644
--- a/srcpkgs/openpgl/template
+++ b/srcpkgs/openpgl/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgl'
 pkgname=openpgl
 version=0.5.0
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 configure_args="-DOPENPGL_BUILD_TOOLS=On"

From 795693ac4ec89a56339fc76479570741058488b9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:17 -0500
Subject: [PATCH 10/12] openvdb: rebuild for tbb

---
 srcpkgs/openvdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 278709b4b7892c..c84569aefeff73 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"

From 7961c5d760929d1281a7464261bde8b410c3d364 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:20 -0500
Subject: [PATCH 11/12] root: rebuild for tbb

---
 srcpkgs/root/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 641fdcec9019dd..5ac16b099b7d01 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
 # Template file for 'root'
 pkgname=root
 version=6.30.02
-revision=2
+revision=3
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
 build_style=cmake

From 1374083ef4d1cbfbcd3bdd1ee52107d1e94f9949 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:23 -0500
Subject: [PATCH 12/12] sysdig: rebuild for tbb

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 25bea57b91c042..2a02d1d115b849 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.33.1
-revision=5
+revision=6
 _falcover=59fb313475b82f842e9e9bbc1e0e629428c0a4cf
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (7 preceding siblings ...)
  2024-02-22 21:45 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-02-22 21:48 ` Calandracas606
  2024-02-22 22:44 ` [PR REVIEW] " Calandracas606
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-22 21:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages tbb
https://github.com/void-linux/void-packages/pull/48872

tbb: update to 2021.11.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested TBB, but have not tested the bumped packages

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

Tested builds for bumped packages in all the above architectures (when supported)

Fixed the build for PrusaSlicer, however it segfaults immediately: https://github.com/void-linux/void-packages/issues/46687

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/48872.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-48872.patch --]
[-- Type: text/x-diff, Size: 18898 bytes --]

From 9b3389f9e292eedda8042dbe2043ad54c2ce1951 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 08:58:51 -0500
Subject: [PATCH 01/12] tbb: update to 2021.11.0.

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 18 ------
 srcpkgs/tbb/template                     | 78 ++++++++----------------
 4 files changed, 28 insertions(+), 84 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 delete mode 100644 srcpkgs/tbb/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index cde1106f7dbef..26598845c19b7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2340,13 +2340,10 @@ libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
-libtbbmalloc_proxy_debug.so.2 tbb-4.3_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.11.0_1
 libembree.so.3 embree-3.12.2_1
-libtbb_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
 libembree.so.2 embree-2.5.1_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch
deleted file mode 100644
index 4aefeff192b52..0000000000000
--- a/srcpkgs/tbb/patches/hostname-usage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/version_info_linux.sh
-+++ b/build/version_info_linux.sh
-@@ -20,7 +20,7 @@
- 
- # Script used to generate version info string
- echo "#define __TBB_VERSION_STRINGS(N) \\"
--echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
-+echo '#N": BUILD_HOST'"\t\t"`hostname`" ("`uname -m`")"'" ENDL \'
- # find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
- echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
- echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \'
diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch
deleted file mode 100644
index a8867eb537937..0000000000000
--- a/srcpkgs/tbb/patches/musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/tbbmalloc/proxy.cpp	2018-10-17 14:05:31.311723013 +0200
-+++ b/src/tbbmalloc/proxy.cpp	2018-10-17 14:06:32.972726194 +0200
-@@ -28,6 +28,7 @@
- // of aligned_alloc as required by new C++ standard, this makes it hard to
- // redefine aligned_alloc here. However, running on systems with new libc
- // version, it still needs it to be redefined, thus tricking system headers
-+#if defined(__GLIBC__)
- #if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
- // tell <cstdlib> that there is no aligned_alloc
- #undef _GLIBCXX_HAVE_ALIGNED_ALLOC
-@@ -37,6 +38,7 @@
- #include <cstdlib>
- #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
-+#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
- 
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 250561cde8e70..8cb4e9f83b4df 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,70 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-reverts="2021.5.0_1"
-version=2020.U3
-revision=2
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-build_style=gnu-makefile
-hostmakedepends="cmake"
+version=2021.11.0
+revision=1
+build_style=cmake
+configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
+makedepends="libgomp-devel libhwloc-devel"
 short_desc="Intel Threading Building Blocks"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
-homepage="https://www.threadingbuildingblocks.org"
-distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
-checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
+homepage="https://oneapi-src.github.io/oneTBB/"
+changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/v${version}/RELEASE_NOTES.md"
+distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz"
+checksum=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363
+make_check=no  # checks fail upstream on i686
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*)
-		make_build_args="arch=intel64"
-		;;
-	i686*)
-		make_build_args="arch=ia32"
-		;;
-	armv7l*)
-		make_build_args="arch=armv7"
-		;;
-	aarch64*)
-		make_build_args="arch=arm64"
-		;;
-	ppc64*)
-		make_build_args="arch=ppc64"
-		;;
-	ppc*)
-		make_build_args="arch=ppc32"
-		;;
-	*)
-		# make sure to fall back instead of letting host uname control it
-		make_build_args="arch=generic"
-		;;
+	x86_64*|aarch64*)
+		build_options_default+=" -DTBB4PY_BUILD=ON"
+		hostmakedepends+=" python3-devel python3-distutils-extra swig"
+		makedepends+=" python3-devel"
+	;;
 esac
 
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
+
 post_extract() {
-	sed -i 's|CPLUS = g..|CPLUS = $(CXX)|g' build/linux.gcc.inc
-	sed -i 's|CONLY = gcc|CONLY = $(CC)|g' build/linux.gcc.inc
 
-	# alternative might be:
-	# https://git.alpinelinux.org/cgit/aports/tree/testing/libtbb/glibc-struct-mallinfo.patch
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
-		  -i src/tbbmalloc/proxy.h
+		  -i src/tbbmalloc_proxy/proxy.h
 	fi
 }
 
-do_install() {
-	vmkdir usr/lib
-	vcopy build/linux_*/*.so* usr/lib
-	vmkdir usr/include/tbb
-	vcopy include/tbb/* usr/include/tbb
-
-	cmake \
-		-DINSTALL_DIR=$DESTDIR/usr/lib/cmake/TBB \
-		-DSYSTEM_NAME=Linux \
-		-DLIB_REL_PATH=../.. \
-		-DINC_REL_PATH=../../../include \
-		-P cmake/tbb_config_installer.cmake
-}
-
 tbb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -72,5 +47,6 @@ tbb-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
 	}
 }

From e24a9cffc796d3b88e5c1d6124424e3db72623e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:50 -0500
Subject: [PATCH 02/12] OpenSubdiv: rebuild for tbb

---
 srcpkgs/OpenSubdiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index 81e4fa926bd24..76d950301cd01 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,7 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=3
+revision=4
 build_style=cmake
 # TODO: CUDA/OpenCL support
 # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable

From 202a679ad615f1bb5963a02f6e0c8843973c8a2c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:53 -0500
Subject: [PATCH 03/12] PrusaSlicer: rebuild for tbb, fix build.

---
 .../patches/ambiguous-overloads.patch         | 28 ++++++
 srcpkgs/PrusaSlicer/patches/cstdint.patch     | 85 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  2 +-
 3 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
 create mode 100644 srcpkgs/PrusaSlicer/patches/cstdint.patch

diff --git a/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
new file mode 100644
index 0000000000000..eb8cd200a0bbc
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/ambiguous-overloads.patch
@@ -0,0 +1,28 @@
+diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+index 2364c5624..c977bee4c 100644
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
++++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -467,7 +467,8 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+     // Always fill in the "printhost_port" combo box from the config and select it.
+     {
+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
+-        choice->set_values({ m_config->opt_string("printhost_port") });
++	const wxArrayString printhost_port = wxArrayString{ m_config->opt_string("printhost_port") };
++        choice->set_values(printhost_port);
+         choice->set_selection();
+     }
+ 
+diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
+index 2d00674c0..011ef7cfd 100644
+--- a/src/slic3r/GUI/Plater.cpp
++++ b/src/slic3r/GUI/Plater.cpp
+@@ -5425,7 +5425,8 @@ void Plater::load_project(const wxString& filename)
+ 
+     p->reset();
+ 
+-    if (! load_files({ into_path(filename) }).empty()) {
++    boost::filesystem::path full_path = into_path(filename);
++    if (! load_files({ full_path }, true, true).empty()) {
+         // At least one file was loaded.
+         p->set_project_filename(filename);
+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.
diff --git a/srcpkgs/PrusaSlicer/patches/cstdint.patch b/srcpkgs/PrusaSlicer/patches/cstdint.patch
new file mode 100644
index 0000000000000..3b74f98a57889
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cstdint.patch
@@ -0,0 +1,85 @@
+From 4846f8c211515546d441d3305a50138614987b72 Mon Sep 17 00:00:00 2001
+From: Robert Schiele <rschiele@gmail.com>
+Date: Fri, 5 May 2023 20:39:46 +0200
+Subject: [PATCH] add missing includes of <cstdint> (PR #10499)
+
+---
+ deps/OpenEXR/OpenEXR.cmake      |  3 ++-
+ deps/OpenEXR/OpenEXR.patch      | 36 +++++++++++++++++++++++++++++++++
+ src/libslic3r/PNGReadWrite.hpp  |  1 +
+ 4 files changed, 40 insertions(+), 1 deletion(-)
+ create mode 100644 deps/OpenEXR/OpenEXR.patch
+
+diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
+index 046223fed9e..094965d0421 100644
+--- a/deps/OpenEXR/OpenEXR.cmake
++++ b/deps/OpenEXR/OpenEXR.cmake
+@@ -4,6 +4,7 @@ prusaslicer_add_cmake_project(OpenEXR
+     URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+     DEPENDS ${ZLIB_PKG}
+     GIT_TAG v2.5.5
++    PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/OpenEXR.patch
+     CMAKE_ARGS
+         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+         -DBUILD_TESTING=OFF 
+@@ -14,4 +15,4 @@ prusaslicer_add_cmake_project(OpenEXR
+ 
+ if (MSVC)
+     add_debug_dep(dep_OpenEXR)
+-endif ()
+\ No newline at end of file
++endif ()
+diff --git a/deps/OpenEXR/OpenEXR.patch b/deps/OpenEXR/OpenEXR.patch
+new file mode 100644
+index 00000000000..22adbd27784
+--- /dev/null
++++ b/deps/OpenEXR/OpenEXR.patch
+@@ -0,0 +1,36 @@
++diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.cpp b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++index 59d1d5d1..585a3e65 100644
++--- a/OpenEXR/IlmImf/ImfDwaCompressor.cpp
+++++ b/OpenEXR/IlmImf/ImfDwaCompressor.cpp
++@@ -159,6 +159,7 @@
++ #include <limits>
++ 
++ #include <cstddef>
+++#include <cstdint>
++ 
++ 
++ // Windows specific addition to prevent the indirect import of the redefined min/max macros
++diff --git a/OpenEXR/IlmImf/ImfHuf.cpp b/OpenEXR/IlmImf/ImfHuf.cpp
++index 271849b7..165fac58 100644
++--- a/OpenEXR/IlmImf/ImfHuf.cpp
+++++ b/OpenEXR/IlmImf/ImfHuf.cpp
++@@ -53,6 +53,7 @@
++ #include <cstring>
++ #include <cassert>
++ #include <algorithm>
+++#include <cstdint>
++ 
++ 
++ using namespace std;
++diff --git a/OpenEXR/IlmImf/ImfMisc.cpp b/OpenEXR/IlmImf/ImfMisc.cpp
++index d2c84787..4b487940 100644
++--- a/OpenEXR/IlmImf/ImfMisc.cpp
+++++ b/OpenEXR/IlmImf/ImfMisc.cpp
++@@ -40,6 +40,7 @@
++ //
++ //-----------------------------------------------------------------------------
++ 
+++#include <cstdint>
++ #include <ImfMisc.h>
++ #include <ImfHeader.h>
++ #include <ImfAttribute.h>
+diff --git a/src/libslic3r/PNGReadWrite.hpp b/src/libslic3r/PNGReadWrite.hpp
+index 01e1f474500..399c6224382 100644
+--- a/src/libslic3r/PNGReadWrite.hpp
++++ b/src/libslic3r/PNGReadWrite.hpp
+@@ -4,6 +4,7 @@
+ #include <vector>
+ #include <string>
+ #include <istream>
++#include <cstdint>
+ 
+ namespace Slic3r { namespace png {
+ 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..04d1e74a3533d 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
 version=2.5.2
-revision=3
+revision=4
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower

From 4b3e3581de42c119d036a97ce3b3298645359a71 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:06:57 -0500
Subject: [PATCH 04/12] blender: rebuild for tbb

---
 srcpkgs/blender/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 1dc61ec9d29d8..68787b76a26c1 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=4.0.2
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="usr/share/blender/${version%.*}/scripts"

From 0a275ecd801457d0e87a8363a2c562f8de2a75c8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:00 -0500
Subject: [PATCH 05/12] easyeffects: rebuild for tbb

---
 srcpkgs/easyeffects/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index 9af8212cf4a16..44d531e73fd92 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
 version=7.1.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
  gtk4-update-icon-cache"

From 4a2aad61fe1400015db98f22f5b60ce187cb07f5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:03 -0500
Subject: [PATCH 06/12] embree: rebuild for tbb

---
 srcpkgs/embree/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 114240f02a846..17b1aa0fc5e31 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,7 +1,7 @@
 # Template file for 'embree'
 pkgname=embree
 version=4.3.1
-revision=1
+revision=2
 archs="aarch64* x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF

From 50e8aca98cb0479754c1342c6444fcce2cea3666 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:07 -0500
Subject: [PATCH 07/12] openimagedenoise: rebuild for tbb

---
 srcpkgs/openimagedenoise/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index b792813dba7c2..109deb171c3f7 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.3
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 hostmakedepends="ispc python3"

From 550941d96e2d43d6f8e59e1dffd12bd05fcaae7e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:10 -0500
Subject: [PATCH 08/12] openimageio: rebuild for tbb

---
 srcpkgs/openimageio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 3ce3f9e49d350..27d2131bc0a61 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.4.9.0
-revision=7
+revision=8
 build_style=cmake
 build_helper=qemu
 configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0

From 34713d8dbcce7b9aed72d4f20b956f2c0923d0aa Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:13 -0500
Subject: [PATCH 09/12] openpgl: rebuild for tbb

---
 srcpkgs/openpgl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openpgl/template b/srcpkgs/openpgl/template
index 4caffb336c84b..64b19c6a164f2 100644
--- a/srcpkgs/openpgl/template
+++ b/srcpkgs/openpgl/template
@@ -1,7 +1,7 @@
 # Template file for 'openpgl'
 pkgname=openpgl
 version=0.5.0
-revision=1
+revision=2
 archs="x86_64*"
 build_style=cmake
 configure_args="-DOPENPGL_BUILD_TOOLS=On"

From 6b5cadd058169cf6aeb3fc988d0f557ce2cc9fff Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:17 -0500
Subject: [PATCH 10/12] openvdb: rebuild for tbb

---
 srcpkgs/openvdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 278709b4b7892..c84569aefeff7 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
 # Template file for 'openvdb'
 pkgname=openvdb
 version=9.0.0
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"

From 1d4faff35a321d8b9bb1bb6c5c8aa835bd3e7698 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:20 -0500
Subject: [PATCH 11/12] root: rebuild for tbb

---
 srcpkgs/root/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index 641fdcec9019d..5ac16b099b7d0 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
 # Template file for 'root'
 pkgname=root
 version=6.30.02
-revision=2
+revision=3
 # Only i686 and x86_64 seem to be officially supported
 archs="i686* x86_64*"
 build_style=cmake

From b1e07d68a805d933fb800ba311d8413d6c24127b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 21 Feb 2024 13:07:23 -0500
Subject: [PATCH 12/12] sysdig: rebuild for tbb

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 25bea57b91c04..2a02d1d115b84 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.33.1
-revision=5
+revision=6
 _falcover=59fb313475b82f842e9e9bbc1e0e629428c0a4cf
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (8 preceding siblings ...)
  2024-02-22 21:48 ` Calandracas606
@ 2024-02-22 22:44 ` Calandracas606
  2024-02-22 22:45 ` Calandracas606
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-22 22:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New review comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1500028854

Comment:
I've been added these in. I haven't encountered any issues with musl without libucontext, and it doesn't require the shlib either

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (9 preceding siblings ...)
  2024-02-22 22:44 ` [PR REVIEW] " Calandracas606
@ 2024-02-22 22:45 ` Calandracas606
  2024-02-28 15:45 ` thypon
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-22 22:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#issuecomment-1960457246

Comment:
> Suggesting some changes from my open PR (#48733). I'm okay with closing that one in favor of this one if you've done significant building/testing. Building the dependent packages should let you know if there are more changes you need to make to `common/shlibs`.

Sorry I should have checked before opening this PR

As aforementioned, I have done extensive build tests of the dependencies, and have been using this library for the past couple of days without issues

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (10 preceding siblings ...)
  2024-02-22 22:45 ` Calandracas606
@ 2024-02-28 15:45 ` thypon
  2024-02-28 15:48 ` cinerea0
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: thypon @ 2024-02-28 15:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New comment by thypon on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#issuecomment-1969267157

Comment:
Any other issue here?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (11 preceding siblings ...)
  2024-02-28 15:45 ` thypon
@ 2024-02-28 15:48 ` cinerea0
  2024-02-28 16:31 ` [PR PATCH] [Merged]: " thypon
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: cinerea0 @ 2024-02-28 15:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#issuecomment-1969272903

Comment:
I don't think so.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Merged]: tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (12 preceding siblings ...)
  2024-02-28 15:48 ` cinerea0
@ 2024-02-28 16:31 ` thypon
  2024-02-29  3:02 ` [PR REVIEW] " sgn
  2024-02-29  4:52 ` Calandracas606
  15 siblings, 0 replies; 17+ messages in thread
From: thypon @ 2024-02-28 16:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]

There's a merged pull request on the void-packages repository

tbb: update to 2021.11.0.
https://github.com/void-linux/void-packages/pull/48872

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
- Tested TBB, but have not tested the bumped packages

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - aarch64-musl (cross)
  - armv7l (cross)
  - armv6l-musl (cross)

Tested builds for bumped packages in all the above architectures (when supported)

Fixed the build for PrusaSlicer, however it segfaults immediately: https://github.com/void-linux/void-packages/issues/46687

[ci skip]


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (13 preceding siblings ...)
  2024-02-28 16:31 ` [PR PATCH] [Merged]: " thypon
@ 2024-02-29  3:02 ` sgn
  2024-02-29  4:52 ` Calandracas606
  15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2024-02-29  3:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1506935855

Comment:
This is broken https://github.com/void-linux/void-packages/pull/48993

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] tbb: update to 2021.11.0.
  2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
                   ` (14 preceding siblings ...)
  2024-02-29  3:02 ` [PR REVIEW] " sgn
@ 2024-02-29  4:52 ` Calandracas606
  15 siblings, 0 replies; 17+ messages in thread
From: Calandracas606 @ 2024-02-29  4:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/48872#discussion_r1506990921

Comment:
yes this is a mistake

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2024-02-29  4:52 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-21 21:37 [PR PATCH] tbb: update to 2021.11.0 Calandracas606
2024-02-21 21:41 ` Calandracas606
2024-02-21 21:43 ` [PR PATCH] [Updated] " Calandracas606
2024-02-21 21:44 ` thypon
2024-02-22 19:40 ` [PR REVIEW] " cinerea0
2024-02-22 19:40 ` cinerea0
2024-02-22 19:40 ` cinerea0
2024-02-22 19:40 ` cinerea0
2024-02-22 21:45 ` [PR PATCH] [Updated] " Calandracas606
2024-02-22 21:48 ` Calandracas606
2024-02-22 22:44 ` [PR REVIEW] " Calandracas606
2024-02-22 22:45 ` Calandracas606
2024-02-28 15:45 ` thypon
2024-02-28 15:48 ` cinerea0
2024-02-28 16:31 ` [PR PATCH] [Merged]: " thypon
2024-02-29  3:02 ` [PR REVIEW] " sgn
2024-02-29  4:52 ` Calandracas606

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).