Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies
@ 2022-01-16  1:21 cinerea0
  2022-01-16  3:35 ` [PR PATCH] [Updated] " cinerea0
                   ` (58 more replies)
  0 siblings, 59 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  1:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 91c133a5848ce932e801daa6be616bb144392e49 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 15 Jan 2022 19:54:16 -0500
Subject: [PATCH] tbb: update to 2021.5.0

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

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..5889f16d1bce 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,34 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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
-
-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"
-		;;
-esac
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
 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
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
@ 2022-01-16  3:35 ` cinerea0
  2022-01-16  4:03 ` cinerea0
                   ` (57 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  3:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From cf4e931d2f61349e4b6dc270c9e6c148e13fd184 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 15 Jan 2022 22:35:14 -0500
Subject: [PATCH] tbb: update to 2021.5.0

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

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..f029beef3869 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,35 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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
-
-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"
-		;;
-esac
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
 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
+		vsed -e "s/RTLD_DEEPBIND/RTLD_GLOBAL/" -i src/tbb/dynamic_link.cpp
 	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
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
  2022-01-16  3:35 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-16  4:03 ` cinerea0
  2022-01-16  5:36 ` [PR PATCH] [Closed]: " cinerea0
                   ` (56 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  4:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From da4eb5a6ed3d26c12c667821bfd84b2e78f30c95 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 15 Jan 2022 23:03:07 -0500
Subject: [PATCH] tbb: update to 2021.5.0

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

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..5889f16d1bce 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,34 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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
-
-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"
-		;;
-esac
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
 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
 	}
 }

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

* Re: [PR PATCH] [Closed]: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
  2022-01-16  3:35 ` [PR PATCH] [Updated] " cinerea0
  2022-01-16  4:03 ` cinerea0
@ 2022-01-16  5:36 ` cinerea0
  2022-01-16  6:22 ` [PR PATCH] [Updated] " cinerea0
                   ` (55 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  5:36 UTC (permalink / raw)
  To: ml

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

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

tbb: update to 2021.5.0; update reverse dependencies
https://github.com/void-linux/void-packages/pull/35077

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

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (2 preceding siblings ...)
  2022-01-16  5:36 ` [PR PATCH] [Closed]: " cinerea0
@ 2022-01-16  6:22 ` cinerea0
  2022-01-16  7:00 ` cinerea0
                   ` (54 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  6:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 71db992df2e7f184b480cfdbb3f2def11622d784 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 16 Jan 2022 01:22:32 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 -----
 srcpkgs/tbb/patches/musl.patch           | 22 +++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 ++++++
 srcpkgs/tbb/template                     | 62 ++++--------------------
 5 files changed, 37 insertions(+), 77 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..5889f16d1bce 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,34 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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
-
-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"
-		;;
-esac
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
 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
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (3 preceding siblings ...)
  2022-01-16  6:22 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-16  7:00 ` cinerea0
  2022-01-16  7:45 ` cinerea0
                   ` (53 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  7:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 6ada0f8ca7aec9b4f053650cb24a974cc5792f5b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 16 Jan 2022 02:00:13 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 69 +++++++-----------------
 5 files changed, 45 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..d82907908700 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,43 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
-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"
-		;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -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
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+fi
 
+post_extract() {
 	# 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
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (4 preceding siblings ...)
  2022-01-16  7:00 ` cinerea0
@ 2022-01-16  7:45 ` cinerea0
  2022-01-16 15:16 ` notthewave
                   ` (52 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16  7:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 6ada0f8ca7aec9b4f053650cb24a974cc5792f5b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 16 Jan 2022 02:00:13 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 69 +++++++-----------------
 5 files changed, 45 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..d82907908700 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,43 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
-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"
-		;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS+=" -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
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+fi
 
+post_extract() {
 	# 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
 	}
 }

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (5 preceding siblings ...)
  2022-01-16  7:45 ` cinerea0
@ 2022-01-16 15:16 ` notthewave
  2022-01-16 15:19 ` notthewave
                   ` (51 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:16 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894391

Comment:
I atempted some of this. Take a look at:
https://github.com/notthewave/void-packages/commits/opencolorio
Maybe that helps...


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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (6 preceding siblings ...)
  2022-01-16 15:16 ` notthewave
@ 2022-01-16 15:19 ` notthewave
  2022-01-16 15:42 ` notthewave
                   ` (50 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:19 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894974

Comment:
I got stuck trying to make it work with musl
```
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `swapcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `getcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `makecontext'
```

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (7 preceding siblings ...)
  2022-01-16 15:19 ` notthewave
@ 2022-01-16 15:42 ` notthewave
  2022-01-16 15:42 ` notthewave
                   ` (49 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:42 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894391

Comment:
I atempted some of this. Take a look at:
https://github.com/notthewave/void-packages/commits/opencolorio
Maybe that helps...
the commits are not clean (shlibs not included some unecessary lines)

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (8 preceding siblings ...)
  2022-01-16 15:42 ` notthewave
@ 2022-01-16 15:42 ` notthewave
  2022-01-16 15:43 ` notthewave
                   ` (48 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:42 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894974

Comment:
I got stuck trying to make it work with musl but you seem to have solved that already
```
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `swapcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `getcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `makecontext'
```

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (9 preceding siblings ...)
  2022-01-16 15:42 ` notthewave
@ 2022-01-16 15:43 ` notthewave
  2022-01-16 15:51 ` notthewave
                   ` (47 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:43 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894974

Comment:
I got stuck trying to make it work with musl. But you seem to have solved that already
```
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `swapcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `getcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `makecontext'
```

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (10 preceding siblings ...)
  2022-01-16 15:43 ` notthewave
@ 2022-01-16 15:51 ` notthewave
  2022-01-16 15:52 ` notthewave
                   ` (46 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:51 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894974

Comment:
I got stuck at the same point trying to make it work with musl. ~~But you seem to have solved that already~~
```
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `swapcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `getcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `makecontext'
```

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (11 preceding siblings ...)
  2022-01-16 15:51 ` notthewave
@ 2022-01-16 15:52 ` notthewave
  2022-01-16 15:52 ` notthewave
                   ` (45 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:52 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894391

Comment:
I atempted some of this. Take a look at:
https://github.com/notthewave/void-packages/commits/opencolorio
Maybe that helps...
the commits are not clean (shlibs not included some unecessary lines)

I got stuck at the same point trying to make it work with musl. ~~But you seem to have solved that already~~
```
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `swapcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `getcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `makecontext'
```

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (12 preceding siblings ...)
  2022-01-16 15:52 ` notthewave
@ 2022-01-16 15:52 ` notthewave
  2022-01-16 18:41 ` [PR REVIEW] " ericonr
                   ` (44 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-16 15:52 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1013894974

Comment:
I got stuck at the same point trying to make it work with musl. ~~But you seem to have solved that already~~
```
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `swapcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `getcontext'
/usr/bin/ld: gnu_10.2_cxx11_64_none/libtbb.so.12.5: undefined reference to `makecontext'
```

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

* Re: [PR REVIEW] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (13 preceding siblings ...)
  2022-01-16 15:52 ` notthewave
@ 2022-01-16 18:41 ` ericonr
  2022-01-16 18:41 ` ericonr
                   ` (43 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: ericonr @ 2022-01-16 18:41 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#discussion_r785479984

Comment:
This should theoretically be `LDFLAGS=`

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

* Re: [PR REVIEW] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (14 preceding siblings ...)
  2022-01-16 18:41 ` [PR REVIEW] " ericonr
@ 2022-01-16 18:41 ` ericonr
  2022-01-16 18:41 ` ericonr
                   ` (42 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: ericonr @ 2022-01-16 18:41 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#discussion_r785480090

Comment:
You dropped the quotes ;)

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

* Re: [PR REVIEW] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (15 preceding siblings ...)
  2022-01-16 18:41 ` ericonr
@ 2022-01-16 18:41 ` ericonr
  2022-01-16 23:42 ` cinerea0
                   ` (41 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: ericonr @ 2022-01-16 18:41 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#discussion_r785480054

Comment:
This has the unfortunate side effect of making it only really work on x86 and aarch64 :/

Idk how many users on ARM we have, though. And well, there's not much we can do.

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

* Re: [PR REVIEW] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (16 preceding siblings ...)
  2022-01-16 18:41 ` ericonr
@ 2022-01-16 23:42 ` cinerea0
  2022-01-17  1:35 ` [PR PATCH] [Updated] " cinerea0
                   ` (40 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-16 23:42 UTC (permalink / raw)
  To: ml

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

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#discussion_r785551805

Comment:
It's not working here either, so we don't have to worry about that yet. Are there any ways to get around the `undefined reference to 'swapcontext', 'getcontext', 'makecontext'` errors?

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (17 preceding siblings ...)
  2022-01-16 23:42 ` cinerea0
@ 2022-01-17  1:35 ` cinerea0
  2022-01-17  3:17 ` cinerea0
                   ` (39 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17  1:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 0b42fefaaee139dfe329a072d9c6a0c2e5953c0e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 16 Jan 2022 02:44:49 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 69 +++++++-----------------
 5 files changed, 45 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index d35944228287..a450358dde40 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..5a2284bd6270 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,43 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
-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"
-		;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	CFLAGS+=" -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
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+fi
 
+post_extract() {
 	# 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
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (18 preceding siblings ...)
  2022-01-17  1:35 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-17  3:17 ` cinerea0
  2022-01-17  4:37 ` cinerea0
                   ` (38 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17  3:17 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From afb04e4d53b15d98c4236229769f715bbbb6d169 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 16 Jan 2022 22:17:19 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 65 +++++-------------------
 5 files changed, 41 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..b98068151c99 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,39 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
 
-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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (19 preceding siblings ...)
  2022-01-17  3:17 ` cinerea0
@ 2022-01-17  4:37 ` cinerea0
  2022-01-17  5:06 ` cinerea0
                   ` (37 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17  4:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From c40825c598c52c66fbe749ff70666dff65cc35aa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 16 Jan 2022 23:36:52 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 68 ++++++------------------
 5 files changed, 44 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..098508e4d1c7 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,42 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6
+archs="i686* x86_64* armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (20 preceding siblings ...)
  2022-01-17  4:37 ` cinerea0
@ 2022-01-17  5:06 ` cinerea0
  2022-01-17  6:49 ` cinerea0
                   ` (36 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17  5:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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"
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (21 preceding siblings ...)
  2022-01-17  5:06 ` cinerea0
@ 2022-01-17  6:49 ` cinerea0
  2022-01-17  6:53 ` cinerea0
                   ` (35 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17  6:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [ ] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [ ] SuiteSparse
- [ ] sysdig


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 d0bf4e8ee88b3ae3922d834d1b49976e9dad07fe Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 01:46:33 -0500
Subject: [PATCH 2/2] SuiteSparse: revbump for new tbb

tbb support was dropped by author
https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/110
---
 common/shlibs                | 12 ++++++++++++
 srcpkgs/SuiteSparse/template |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index cab503a35ee4..a51b5c80342d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4060,6 +4060,18 @@ libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
 libumfpack.so.5 SuiteSparse-5.10.1_1
+libbtf.so.1 SuiteSparse-5.10.1_2
+libcolamd.so.2 SuiteSparse-5.10.1_2
+libklu.so.1 SuiteSparse-5.10.1_2
+librbio.so.2 SuiteSparse-5.10.1_2
+libccolamd.so.2 SuiteSparse-5.10.1_2
+libspqr.so.2 SuiteSparse-5.10.1_2
+libldl.so.2 SuiteSparse-5.10.1_2
+libcamd.so.2 SuiteSparse-5.10.1_2
+libmongoose.so.2 SuiteSparse-5.10.1_2
+libsuitesparseconfig.so.5 SuiteSparse-5.10.1_2
+libmetis.so SuiteSparse-5.10.1_2
+libspliplu.so.1 SuiteSparse-5.10.1_2
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 23f75ff6dd7a..aee5e6bf1a02 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,10 +1,10 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
 version=5.10.1
-revision=1
-make_build_args="BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB"
+revision=2
+make_build_args="BLAS=-lblas LAPACK=-llapack"
 hostmakedepends="cmake chrpath"
-makedepends="tbb-devel libgomp-devel lapack-devel mpfr-devel"
+makedepends="libgomp-devel lapack-devel mpfr-devel"
 short_desc="Suite of sparse matrix software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="custom:multiple"

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (22 preceding siblings ...)
  2022-01-17  6:49 ` cinerea0
@ 2022-01-17  6:53 ` cinerea0
  2022-01-17 16:03 ` [PR PATCH] [Updated] " cinerea0
                   ` (34 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17  6:53 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1014194490

Comment:
Because SuiteSparse took about an hour to build locally for me, the current plan is to test all of the dependent packages listed in the first comment on their own, see if they work in CI, and then push all of them at the end while skipping CI.

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (23 preceding siblings ...)
  2022-01-17  6:53 ` cinerea0
@ 2022-01-17 16:03 ` cinerea0
  2022-01-17 17:41 ` cinerea0
                   ` (33 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17 16:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [ ] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 d0454d86f987189f36b28d8df6cab22e446b6c21 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 11:03:26 -0500
Subject: [PATCH 2/2] OpenSubdiv: revbump for new tbb

---
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 +++++++++++++++++++++++
 srcpkgs/OpenSubdiv/template               |  4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch

diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
new file mode 100644
index 000000000000..5a812c84b211
--- /dev/null
+++ b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
@@ -0,0 +1,29 @@
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f..8dec0e1 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,7 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index fd32e6bd6949..9066b267f34f 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,7 +1,9 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=1
+revision=2
+# restricted due to dependency on tbb
+archs="i686* x86_64* armv6l armv7l* aarch64*"
 wrksrc="OpenSubdiv-${version//./_}"
 build_style=cmake
 configure_args="-DOpenGL_GL_PREFERENCE=GLVND"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (24 preceding siblings ...)
  2022-01-17 16:03 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-17 17:41 ` cinerea0
  2022-01-17 19:00 ` cinerea0
                   ` (32 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17 17:41 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [ ] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 bb1d84a08c116a9fa18f8f9a55617b17c63d7129 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 12:41:19 -0500
Subject: [PATCH 2/2] OpenSubdiv: revbump for new tbb

---
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 +++++++++++++++++++++++
 srcpkgs/OpenSubdiv/template               |  7 ++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch

diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
new file mode 100644
index 000000000000..5a812c84b211
--- /dev/null
+++ b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
@@ -0,0 +1,29 @@
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f..8dec0e1 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,7 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index fd32e6bd6949..83524d5c1bdb 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,11 +1,14 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=1
+revision=2
+# restricted due to dependency on tbb
+archs="i686* x86_64* armv6l armv7l* aarch64*"
 wrksrc="OpenSubdiv-${version//./_}"
 build_style=cmake
-configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
 # TODO: CUDA/OpenCL support
+# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DNO_GLTESTS=1 -DNO_CUDA=1"
 makedepends="libXrandr-devel libXinerama-devel libXcursor-devel zlib-devel
  libgomp-devel glfw-devel glew-devel tbb-devel libXxf86vm-devel"
 short_desc="Open-Source subdivision surface library"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (25 preceding siblings ...)
  2022-01-17 17:41 ` cinerea0
@ 2022-01-17 19:00 ` cinerea0
  2022-01-17 19:57 ` cinerea0
                   ` (31 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17 19:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [ ] occt
- [ ] openimagednoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 6732caaa8189f7bb448347be7dc34b69968ea5fc Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 14:00:05 -0500
Subject: [PATCH 2/2] embree: update to 3.13.2

---
 common/shlibs                                       |  2 +-
 .../patches/uintNN-is-part-of-ispc-1.13.patch       | 12 ------------
 srcpkgs/embree/template                             | 13 +++++++------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch

diff --git a/common/shlibs b/common/shlibs
index cab503a35ee4..1d9e92581abc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2377,7 +2377,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-4.3_1
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
deleted file mode 100644
index 5d0b02f3b2e5..000000000000
--- a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: embree-2.17.7/tutorials/common/common.isph
-===================================================================
---- embree-2.17.7.orig/tutorials/common/common.isph
-+++ embree-2.17.7/tutorials/common/common.isph
-@@ -16,7 +16,3 @@
- 
- #pragma once
- 
--typedef unsigned int64 uint64;
--typedef unsigned int32 uint32;
--typedef unsigned int16 uint16;
--typedef unsigned int8  uint8;
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..4d0607977dde 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,19 +1,20 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
 makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel"
+ libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
 short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
+checksum=dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (26 preceding siblings ...)
  2022-01-17 19:00 ` cinerea0
@ 2022-01-17 19:57 ` cinerea0
  2022-01-19 20:53 ` cinerea0
                   ` (30 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-17 19:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [ ] occt
- [ ] openimagednoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 9b762d2ee3d603badd7645197c2971b0e4e986e8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 14:55:49 -0500
Subject: [PATCH 2/2] occt: revbump for new tbb

tbb dependency removed due to use of deprecated features
---
 srcpkgs/occt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index bbf04b932396..cd4facdc3c53 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -2,14 +2,14 @@
 pkgname=occt
 reverts=7.5.0_1
 version=7.4.0p1
-revision=4
+revision=5
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
-configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
+configure_args="-DUSE_FREEIMAGE=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
-makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
- tcl-devel tk-devel"
+makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tcl-devel
+ tk-devel"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:LGPL-2.1-only-with-exceptions"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (27 preceding siblings ...)
  2022-01-17 19:57 ` cinerea0
@ 2022-01-19 20:53 ` cinerea0
  2022-01-19 23:57 ` cinerea0
                   ` (29 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-19 20:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagednoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From 0eaebe266f0bc977bd78caa4ef33b7f4c30d749a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 00:06:23 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..cab503a35ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 9b762d2ee3d603badd7645197c2971b0e4e986e8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 17 Jan 2022 14:55:49 -0500
Subject: [PATCH 2/2] occt: revbump for new tbb

tbb dependency removed due to use of deprecated features
---
 srcpkgs/occt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index bbf04b932396..cd4facdc3c53 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -2,14 +2,14 @@
 pkgname=occt
 reverts=7.5.0_1
 version=7.4.0p1
-revision=4
+revision=5
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
-configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
+configure_args="-DUSE_FREEIMAGE=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
-makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
- tcl-devel tk-devel"
+makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tcl-devel
+ tk-devel"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:LGPL-2.1-only-with-exceptions"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (28 preceding siblings ...)
  2022-01-19 20:53 ` cinerea0
@ 2022-01-19 23:57 ` cinerea0
  2022-01-20 15:45 ` cinerea0
                   ` (28 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-19 23:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagednoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From 1d1abd969399908c91583a52fc18684a7d57bb43 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 19 Jan 2022 15:51:29 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 5744c0ec56c29e071fd96bb0be9205c8727e5876 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 19 Jan 2022 18:57:39 -0500
Subject: [PATCH 2/2] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..79811536222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..9fcbb4ee31f5 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,27 +1,20 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
+# restricted due to dependency on tbb
+archs="i686* x86_64* armv6l armv7l* aarch64*"
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
 
 post_install() {
 	vlicense LICENSE

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (29 preceding siblings ...)
  2022-01-19 23:57 ` cinerea0
@ 2022-01-20 15:45 ` cinerea0
  2022-01-20 17:58 ` cinerea0
                   ` (27 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 15:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From 716cb839432190bc667657ae889250e5f745dc7e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 10:43:57 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 +++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 73 +++++++-----------------
 5 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..17ea7bb57c11 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,47 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+# libucontext does not support armv6l-musl
+archs="i686* x86_64* armv6l armv7l* aarch64*"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 1d4c8a93018a285aa5efa1b7e3819b0636cf222e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 10:44:59 -0500
Subject: [PATCH 2/2] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..79811536222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..9fcbb4ee31f5 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,27 +1,20 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
+# restricted due to dependency on tbb
+archs="i686* x86_64* armv6l armv7l* aarch64*"
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
 
 post_install() {
 	vlicense LICENSE

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (30 preceding siblings ...)
  2022-01-20 15:45 ` cinerea0
@ 2022-01-20 17:58 ` cinerea0
  2022-01-20 18:27 ` cinerea0
                   ` (26 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 17:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From 4e0279d87f808a13ef7f7b6f6098fb062ea7e01c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 12:58:30 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..8f7e05629135 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0
 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..4fce3518f24b 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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"
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (31 preceding siblings ...)
  2022-01-20 17:58 ` cinerea0
@ 2022-01-20 18:27 ` cinerea0
  2022-01-20 19:27 ` cinerea0
                   ` (25 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 18:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From f1084fedadfb2f67c1ecb7de5ca66ba2f36dcaaa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 13:26:34 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..8f7e05629135 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0
 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..5d2dbc12b11b 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	LDFLAGS+=" -lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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"
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (32 preceding siblings ...)
  2022-01-20 18:27 ` cinerea0
@ 2022-01-20 19:27 ` cinerea0
  2022-01-20 21:20 ` cinerea0
                   ` (24 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 19:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [x] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From ef80446bcccb5538bc11d518eedfd3da2480c91b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 14:26:18 -0500
Subject: [PATCH] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..8f7e05629135 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0
 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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"
 	}
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (33 preceding siblings ...)
  2022-01-20 19:27 ` cinerea0
@ 2022-01-20 21:20 ` cinerea0
  2022-01-20 21:37 ` cinerea0
                   ` (23 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 21:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [ ] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [ ] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From ef80446bcccb5538bc11d518eedfd3da2480c91b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 14:26:18 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..8f7e05629135 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0
 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 ef41a90aed40db1833749f67cbb01735f95c52a4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 16:19:43 -0500
Subject: [PATCH 2/2] embree: update to 3.13.2

---
 common/shlibs           | 2 +-
 srcpkgs/embree/template | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f7e05629135..3ff86f2ac940 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2377,7 +2377,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-2021.5.0
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..c042e5b9c05d 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,8 +1,8 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
@@ -12,7 +12,8 @@ short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
 checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
 
 embree-devel_package() {

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (34 preceding siblings ...)
  2022-01-20 21:20 ` cinerea0
@ 2022-01-20 21:37 ` cinerea0
  2022-01-20 22:20 ` cinerea0
                   ` (22 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 21:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [x] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From ef80446bcccb5538bc11d518eedfd3da2480c91b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 14:26:18 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..8f7e05629135 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0
 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 8ff1f3bc7badf1f4b0c3b22554b86f9674fb6070 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 16:37:22 -0500
Subject: [PATCH 2/2] embree: update to 3.13.2

---
 common/shlibs           |  2 +-
 srcpkgs/embree/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f7e05629135..3ff86f2ac940 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2377,7 +2377,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-2021.5.0
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..62d259bf03ce 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,8 +1,8 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
@@ -12,8 +12,9 @@ short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
+checksum=dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (35 preceding siblings ...)
  2022-01-20 21:37 ` cinerea0
@ 2022-01-20 22:20 ` cinerea0
  2022-01-20 22:43 ` cinerea0
                   ` (21 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 22:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [x] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From ef80446bcccb5538bc11d518eedfd3da2480c91b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 14:26:18 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..8f7e05629135 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0
 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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 8ff1f3bc7badf1f4b0c3b22554b86f9674fb6070 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 16:37:22 -0500
Subject: [PATCH 2/2] embree: update to 3.13.2

---
 common/shlibs           |  2 +-
 srcpkgs/embree/template | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8f7e05629135..3ff86f2ac940 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2377,7 +2377,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-2021.5.0
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..62d259bf03ce 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,8 +1,8 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
@@ -12,8 +12,9 @@ short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
+checksum=dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (36 preceding siblings ...)
  2022-01-20 22:20 ` cinerea0
@ 2022-01-20 22:43 ` cinerea0
  2022-01-20 23:49 ` [PR PATCH] [Updated] " cinerea0
                   ` (20 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 22:43 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1017991906

Comment:
The good news is that I learned on IRC how to make tbb work on armv6l-musl, so there's no need to impose any extra restrictions on packages that depend on tbb. The bad news is that I now have to re-run CI for all of the reverse dependencies.

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (37 preceding siblings ...)
  2022-01-20 22:43 ` cinerea0
@ 2022-01-20 23:49 ` cinerea0
  2022-01-21  0:51 ` cinerea0
                   ` (19 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-20 23:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [ ] embree
- [x] occt
- [ ] openimagednoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 17:19:12 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 e12d37254abae7f1582c6a0fb6d1db342835bf6e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 18:49:36 -0500
Subject: [PATCH 2/2] embree: update to 3.13.2

---
 common/shlibs                                       |  2 +-
 .../patches/uintNN-is-part-of-ispc-1.13.patch       | 12 ------------
 srcpkgs/embree/template                             | 13 +++++++------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..f93ba5763382 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2377,7 +2377,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-2021.5.0_1
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
deleted file mode 100644
index 5d0b02f3b2e5..000000000000
--- a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: embree-2.17.7/tutorials/common/common.isph
-===================================================================
---- embree-2.17.7.orig/tutorials/common/common.isph
-+++ embree-2.17.7/tutorials/common/common.isph
-@@ -16,7 +16,3 @@
- 
- #pragma once
- 
--typedef unsigned int64 uint64;
--typedef unsigned int32 uint32;
--typedef unsigned int16 uint16;
--typedef unsigned int8  uint8;
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..4d0607977dde 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,19 +1,20 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
 makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel"
+ libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
 short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
+checksum=dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (38 preceding siblings ...)
  2022-01-20 23:49 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-21  0:51 ` cinerea0
  2022-01-21  1:23 ` cinerea0
                   ` (18 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21  0:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [ ] sysdig
- [ ] openimageio


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

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

From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 17:19:12 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 617529818916fd7c3d8f5d45e5ebd7cb3856500d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 19:51:41 -0500
Subject: [PATCH 2/2] sysdig: revbump for new tbb

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

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 02c943c9f828..8760f669e23f 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (39 preceding siblings ...)
  2022-01-21  0:51 ` cinerea0
@ 2022-01-21  1:23 ` cinerea0
  2022-01-21  2:59 ` cinerea0
                   ` (17 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21  1:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 17:19:12 -0500
Subject: [PATCH 1/4] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 6ab6b99863acd99726a25c5afa942d951611a4f6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 20:22:44 -0500
Subject: [PATCH 2/4] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..79811536222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..dd65417c3596 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,27 +1,18 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
 
 post_install() {
 	vlicense LICENSE

From f83b664c92cabdb3608826c0c653bd797cebd4c3 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 20:23:09 -0500
Subject: [PATCH 3/4] openimageio: revbump for new tbb

---
 srcpkgs/openimageio/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index de8e1cd04409..5ba69d2b35a1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.2.15.1
-revision=1
+revision=2
 wrksrc="oiio-Release-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -59,6 +59,9 @@ openimageio-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From e59ae1c45caa06ca2c36214931f828935cdfd2c9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 20:23:32 -0500
Subject: [PATCH 4/4] openimagedenoise: revbump for new tbb

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 8190e029a08b..2519a207b7df 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.2
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (40 preceding siblings ...)
  2022-01-21  1:23 ` cinerea0
@ 2022-01-21  2:59 ` cinerea0
  2022-01-21  3:55 ` cinerea0
                   ` (16 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21  2:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 17:19:12 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 06f6874829de73e04415ee15002acb9828a28e58 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 21:59:31 -0500
Subject: [PATCH 2/2] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..79811536222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..ee1a7e9e5f63 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,27 +1,21 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 post_install() {
 	vlicense LICENSE

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

* Re: tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (41 preceding siblings ...)
  2022-01-21  2:59 ` cinerea0
@ 2022-01-21  3:55 ` cinerea0
  2022-01-21  4:19 ` [PR PATCH] [Updated] " cinerea0
                   ` (15 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21  3:55 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1018145521

Comment:
The aarch64 CI builders are clogged up with icu updates *again*, for like the fourth day in a row, so I can't make much more progress tonight.

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (42 preceding siblings ...)
  2022-01-21  3:55 ` cinerea0
@ 2022-01-21  4:19 ` cinerea0
  2022-01-21  5:49 ` cinerea0
                   ` (14 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21  4:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 17:19:12 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 06f6874829de73e04415ee15002acb9828a28e58 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 21:59:31 -0500
Subject: [PATCH 2/2] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..79811536222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..ee1a7e9e5f63 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,27 +1,21 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 post_install() {
 	vlicense LICENSE

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (43 preceding siblings ...)
  2022-01-21  4:19 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-21  5:49 ` cinerea0
  2022-01-21 16:55 ` cinerea0
                   ` (13 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21  5:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 20 Jan 2022 17:19:12 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index b07e14379e28..86b4a9fce2a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,12 +2374,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 7b86497903d03d75e10bab791d69741cf17e2d4a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 21 Jan 2022 00:48:51 -0500
Subject: [PATCH 2/2] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 86b4a9fce2a9..79811536222a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3892,7 +3892,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (44 preceding siblings ...)
  2022-01-21  5:49 ` cinerea0
@ 2022-01-21 16:55 ` cinerea0
  2022-01-24 17:09 ` cinerea0
                   ` (12 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-21 16:55 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 8bcbcf8a0b45a5e7119ea01f8cc9078a79408e10 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 21 Jan 2022 11:47:51 -0500
Subject: [PATCH 1/4] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 af656b2d5d63bda060caffb4eae72e5320a6686c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 21 Jan 2022 11:48:52 -0500
Subject: [PATCH 2/4] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c628094e2c7..fa121321fe41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

From b4b6b1c24dcbcea0d39d3f2cc561544481406bfa Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 21 Jan 2022 11:54:29 -0500
Subject: [PATCH 3/4] openimageio: revbump for new openvdb

---
 srcpkgs/openimageio/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index de8e1cd04409..5ba69d2b35a1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.2.15.1
-revision=1
+revision=2
 wrksrc="oiio-Release-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -59,6 +59,9 @@ openimageio-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From befbb5eee4e66bc11372666e0b6298b48fa27a35 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 21 Jan 2022 11:55:06 -0500
Subject: [PATCH 4/4] openimagedenoise: revbumo for new tbb

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 8190e029a08b..2519a207b7df 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.2
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (45 preceding siblings ...)
  2022-01-21 16:55 ` cinerea0
@ 2022-01-24 17:09 ` cinerea0
  2022-01-24 20:48 ` cinerea0
                   ` (11 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-24 17:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 85dc6adddd8a08aee60029589781a7fc9d7ed9a2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:07:02 -0500
Subject: [PATCH 1/4] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 30dc7b9eda4cd7556f81370182a4bf1830780122 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:08:13 -0500
Subject: [PATCH 2/4] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c628094e2c7..fa121321fe41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 860ba6dc6820684be2b1d6efcb4babff8dfce487 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:08:44 -0500
Subject: [PATCH 3/4] openimageio: revbump for new openvdb

---
 srcpkgs/openimageio/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index de8e1cd04409..5ba69d2b35a1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.2.15.1
-revision=1
+revision=2
 wrksrc="oiio-Release-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -59,6 +59,9 @@ openimageio-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From cb35bc24052e6227759c295f94fb0e95ecd58d4a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:09:02 -0500
Subject: [PATCH 4/4] openimagedenoise: revbump for new tbb

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 8190e029a08b..2519a207b7df 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.2
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (46 preceding siblings ...)
  2022-01-24 17:09 ` cinerea0
@ 2022-01-24 20:48 ` cinerea0
  2022-01-24 22:03 ` cinerea0
                   ` (10 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-24 20:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [ ] openimagedenoise
- [ ] OpenSubdiv
- [ ] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [ ] openimageio


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

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

From 85dc6adddd8a08aee60029589781a7fc9d7ed9a2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:07:02 -0500
Subject: [PATCH 1/3] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 30dc7b9eda4cd7556f81370182a4bf1830780122 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:08:13 -0500
Subject: [PATCH 2/3] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c628094e2c7..fa121321fe41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

From e5b106d5d54b06e9a977c454adff3d4ac56c7328 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 15:48:16 -0500
Subject: [PATCH 3/3] PrusaSlicer: update to 2.4.0

---
 srcpkgs/PrusaSlicer/patches/cross.patch | 11 -----------
 srcpkgs/PrusaSlicer/template            | 11 +++++++++--
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index d64a450d9e9f..000000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/avrdude/CMakeLists.txt	2020-06-04 09:19:26.017251215 +0200
-+++ b/src/avrdude/CMakeLists.txt	2020-06-04 09:19:36.468250771 +0200
-@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen
- add_custom_command(
-     DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
-     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
--    COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-+    COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
- 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..093bc3f64614 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.3.0
+version=2.4.0
 revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
@@ -16,9 +16,16 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
 
+post_extract() {
+	# this test suite fails on musl
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -i tests/CMakeLists.txt -e "s/add_subdirectory(libslic3r)/d"
+	fi
+}
+
 Slic3rPE_package() {
 	build_style=meta
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (47 preceding siblings ...)
  2022-01-24 20:48 ` cinerea0
@ 2022-01-24 22:03 ` cinerea0
  2022-01-25  2:51 ` cinerea0
                   ` (9 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-24 22:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [x] openimagedenoise
- [ ] OpenSubdiv
- [x] openvdb
- [ ] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [x] openimageio


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

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

From 85dc6adddd8a08aee60029589781a7fc9d7ed9a2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:07:02 -0500
Subject: [PATCH 1/3] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 30dc7b9eda4cd7556f81370182a4bf1830780122 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:08:13 -0500
Subject: [PATCH 2/3] openvdb: update to 9.0.0

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c628094e2c7..fa121321fe41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

From b251568266886407be09d18d7afdb89090467961 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 17:03:16 -0500
Subject: [PATCH 3/3] PrusaSlicer: update to 2.4.0

---
 srcpkgs/PrusaSlicer/patches/cross.patch | 11 -----------
 srcpkgs/PrusaSlicer/template            | 11 +++++++++--
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index d64a450d9e9f..000000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/avrdude/CMakeLists.txt	2020-06-04 09:19:26.017251215 +0200
-+++ b/src/avrdude/CMakeLists.txt	2020-06-04 09:19:36.468250771 +0200
-@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen
- add_custom_command(
-     DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
-     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
--    COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-+    COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
- 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c612c47d785b 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.3.0
+version=2.4.0
 revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
@@ -16,9 +16,16 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
 
+post_extract() {
+	# this test suite fails on musl
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+	fi
+}
+
 Slic3rPE_package() {
 	build_style=meta
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: [PR PATCH] [Updated] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (48 preceding siblings ...)
  2022-01-24 22:03 ` cinerea0
@ 2022-01-25  2:51 ` cinerea0
  2022-01-25  4:23 ` [PR PATCH] [Updated] [ci skip] " cinerea0
                   ` (8 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-25  2:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [ ] blender
- [x] embree
- [x] occt
- [x] openimagedenoise
- [ ] OpenSubdiv
- [x] openvdb
- [x] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [x] openimageio


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

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

From 85dc6adddd8a08aee60029589781a7fc9d7ed9a2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 12:07:02 -0500
Subject: [PATCH 1/2] tbb: update to 2021.5.0

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 be652efc6861d0f279cd9ac051d37e4fff31348f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 21:51:19 -0500
Subject: [PATCH 2/2] OpenSubdiv: revbump for new tbb

---
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 +++++++++++++++++++++++
 srcpkgs/OpenSubdiv/template               |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch

diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
new file mode 100644
index 000000000000..5a812c84b211
--- /dev/null
+++ b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
@@ -0,0 +1,29 @@
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f..8dec0e1 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,7 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index fd32e6bd6949..0d6867b5a6d3 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,11 +1,12 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=1
+revision=2
 wrksrc="OpenSubdiv-${version//./_}"
 build_style=cmake
-configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
 # TODO: CUDA/OpenCL support
+# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DNO_GLTESTS=1 -DNO_CUDA=1"
 makedepends="libXrandr-devel libXinerama-devel libXcursor-devel zlib-devel
  libgomp-devel glfw-devel glew-devel tbb-devel libXxf86vm-devel"
 short_desc="Open-Source subdivision surface library"

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

* Re: [PR PATCH] [Updated] [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (49 preceding siblings ...)
  2022-01-25  2:51 ` cinerea0
@ 2022-01-25  4:23 ` cinerea0
  2022-01-28  0:23 ` cinerea0
                   ` (7 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-25  4:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

[ci skip] tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [x] blender
- [x] embree
- [x] occt
- [x] openimagedenoise
- [x] OpenSubdiv
- [x] openvdb
- [x] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [x] openimageio


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

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

From e65f8957ed397c017cd5f772739f045a4f0f7ecf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:09:48 -0500
Subject: [PATCH 01/11] tbb: update to 2021.5.0.

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 277c799d3247c2e4cb245007be7cc26dfac1ef29 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:10:04 -0500
Subject: [PATCH 02/11] occt: revbump for new tbb.

tbb build dependency removed because occt relies
on deprecated behavior.
---
 srcpkgs/occt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index bbf04b932396..cd4facdc3c53 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -2,14 +2,14 @@
 pkgname=occt
 reverts=7.5.0_1
 version=7.4.0p1
-revision=4
+revision=5
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
-configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
+configure_args="-DUSE_FREEIMAGE=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
-makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
- tcl-devel tk-devel"
+makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tcl-devel
+ tk-devel"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:LGPL-2.1-only-with-exceptions"

From 9f81666b412cb2af19a22feb3cfa16d1e82212b6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:14:00 -0500
Subject: [PATCH 03/11] SuiteSparse: revbump for new tbb.

tbb build dependency removed because of reliance
on deprecated behavior.
DrTimothyAldenDavis/SuiteSparse#10.
---
 common/shlibs                | 12 ++++++++++++
 srcpkgs/SuiteSparse/template |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c628094e2c7..c0f320fcf698 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,6 +4062,18 @@ libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
 libumfpack.so.5 SuiteSparse-5.10.1_1
+libbtf.so.1 SuiteSparse-5.10.1_2
+libcolamd.so.2 SuiteSparse-5.10.1_2
+libklu.so.1 SuiteSparse-5.10.1_2
+librbio.so.2 SuiteSparse-5.10.1_2
+libccolamd.so.2 SuiteSparse-5.10.1_2
+libspqr.so.2 SuiteSparse-5.10.1_2
+libldl.so.2 SuiteSparse-5.10.1_2
+libcamd.so.2 SuiteSparse-5.10.1_2
+libmongoose.so.2 SuiteSparse-5.10.1_2
+libsuitesparseconfig.so.5 SuiteSparse-5.10.1_2
+libmetis.so SuiteSparse-5.10.1_2
+libspliplu.so.1 SuiteSparse-5.10.1_2
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 23f75ff6dd7a..aee5e6bf1a02 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,10 +1,10 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
 version=5.10.1
-revision=1
-make_build_args="BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB"
+revision=2
+make_build_args="BLAS=-lblas LAPACK=-llapack"
 hostmakedepends="cmake chrpath"
-makedepends="tbb-devel libgomp-devel lapack-devel mpfr-devel"
+makedepends="libgomp-devel lapack-devel mpfr-devel"
 short_desc="Suite of sparse matrix software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="custom:multiple"

From 7755f333421fdcdbe3a44845865bfc52fce96b68 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:16:00 -0500
Subject: [PATCH 04/11] sysdig: revbump for new tbb.

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

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 02c943c9f828..8760f669e23f 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From 8a1abb984df86ac41bec9c226817f95068cd6978 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:16:37 -0500
Subject: [PATCH 05/11] OpenSubdiv: revbump for new tbb.

---
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 +++++++++++++++++++++++
 srcpkgs/OpenSubdiv/template               |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch

diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
new file mode 100644
index 000000000000..5a812c84b211
--- /dev/null
+++ b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
@@ -0,0 +1,29 @@
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f..8dec0e1 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,7 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index fd32e6bd6949..0d6867b5a6d3 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,11 +1,12 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=1
+revision=2
 wrksrc="OpenSubdiv-${version//./_}"
 build_style=cmake
-configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
 # TODO: CUDA/OpenCL support
+# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DNO_GLTESTS=1 -DNO_CUDA=1"
 makedepends="libXrandr-devel libXinerama-devel libXcursor-devel zlib-devel
  libgomp-devel glfw-devel glew-devel tbb-devel libXxf86vm-devel"
 short_desc="Open-Source subdivision surface library"

From a090e6e44b9e1bdc87fcea6069dc80a201edd831 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:17:39 -0500
Subject: [PATCH 06/11] openvdb: update to 9.0.0.

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c0f320fcf698..b7bc2bc7659f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 391e234989dc646e79405a530e5b08d430d93a4b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:17:59 -0500
Subject: [PATCH 07/11] openimageio: revbump for new openvdb.

---
 srcpkgs/openimageio/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index de8e1cd04409..5ba69d2b35a1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.2.15.1
-revision=1
+revision=2
 wrksrc="oiio-Release-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -59,6 +59,9 @@ openimageio-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 8a0d3c8809c03e82aab1a5cb34196a68b9bebf28 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:18:16 -0500
Subject: [PATCH 08/11] openimagedenoise: revbump for new tbb.

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 8190e029a08b..2519a207b7df 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.2
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake

From fd4a88c223809253459d9b866a07a229b3bb5a6e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:18:50 -0500
Subject: [PATCH 09/11] PrusaSlicer: update to 2.4.0.

---
 srcpkgs/PrusaSlicer/patches/cross.patch | 11 -----------
 srcpkgs/PrusaSlicer/template            | 11 +++++++++--
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index d64a450d9e9f..000000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/avrdude/CMakeLists.txt	2020-06-04 09:19:26.017251215 +0200
-+++ b/src/avrdude/CMakeLists.txt	2020-06-04 09:19:36.468250771 +0200
-@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen
- add_custom_command(
-     DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
-     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
--    COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-+    COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
- 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c612c47d785b 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.3.0
+version=2.4.0
 revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
@@ -16,9 +16,16 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
 
+post_extract() {
+	# this test suite fails on musl
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+	fi
+}
+
 Slic3rPE_package() {
 	build_style=meta
 	depends="${sourcepkg}>=${version}_${revision}"

From c9ca3d8918c817fb586e8633bdef4bb29e506b9b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:20:34 -0500
Subject: [PATCH 10/11] embree: update to 3.13.2.

---
 common/shlibs                                       |  2 +-
 .../patches/uintNN-is-part-of-ispc-1.13.patch       | 12 ------------
 srcpkgs/embree/template                             | 13 +++++++------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch

diff --git a/common/shlibs b/common/shlibs
index b7bc2bc7659f..d00bcb653e67 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2379,7 +2379,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-2021.5.0_1
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
deleted file mode 100644
index 5d0b02f3b2e5..000000000000
--- a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: embree-2.17.7/tutorials/common/common.isph
-===================================================================
---- embree-2.17.7.orig/tutorials/common/common.isph
-+++ embree-2.17.7/tutorials/common/common.isph
-@@ -16,7 +16,3 @@
- 
- #pragma once
- 
--typedef unsigned int64 uint64;
--typedef unsigned int32 uint32;
--typedef unsigned int16 uint16;
--typedef unsigned int8  uint8;
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..4d0607977dde 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,19 +1,20 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
 makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel"
+ libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
 short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
+checksum=dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4cae6d5e9ac5bf59c60aa4061479dcc47b726055 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:21:12 -0500
Subject: [PATCH 11/11] blender: revbump for new tbb.

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

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

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

* Re: [PR PATCH] [Updated] [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (50 preceding siblings ...)
  2022-01-25  4:23 ` [PR PATCH] [Updated] [ci skip] " cinerea0
@ 2022-01-28  0:23 ` cinerea0
  2022-01-28  6:27 ` [PR PATCH] [Closed]: " ericonr
                   ` (6 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: cinerea0 @ 2022-01-28  0:23 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages tbb
https://github.com/void-linux/void-packages/pull/35077

[ci skip] tbb: update to 2021.5.0; update reverse dependencies
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [x] blender
- [x] embree
- [x] occt
- [x] openimagedenoise
- [x] OpenSubdiv
- [x] openvdb
- [x] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [x] openimageio

Closes #32166 and closes #35105.

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

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

From e65f8957ed397c017cd5f772739f045a4f0f7ecf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:09:48 -0500
Subject: [PATCH 01/11] tbb: update to 2021.5.0.

---
 common/shlibs                            |  5 +-
 srcpkgs/tbb/patches/hostname-usage.patch | 11 ----
 srcpkgs/tbb/patches/musl.patch           | 22 ++++----
 srcpkgs/tbb/patches/rtld_deepbind.patch  | 14 +++++
 srcpkgs/tbb/template                     | 71 +++++++-----------------
 5 files changed, 47 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tbb/patches/hostname-usage.patch
 create mode 100644 srcpkgs/tbb/patches/rtld_deepbind.patch

diff --git a/common/shlibs b/common/shlibs
index 6fe46eaaeb05..8c628094e2c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2376,12 +2376,9 @@ 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_debug.so.2 tbb-4.3_1
-libtbb.so.2 tbb-4.3_1
-libtbbmalloc_debug.so.2 tbb-4.3_1
+libtbb.so.12 tbb-2021.5.0_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 4aefeff192b5..000000000000
--- 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
index a8867eb53793..ca44a7d0db9c 100644
--- a/srcpkgs/tbb/patches/musl.patch
+++ b/srcpkgs/tbb/patches/musl.patch
@@ -1,18 +1,20 @@
---- 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 @@
+diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp
+index 6cf1f49f64..3acbaa8d9d 100644
+--- a/src/tbbmalloc_proxy/proxy.cpp
++++ b/src/tbbmalloc_proxy/proxy.cpp
+@@ -24,6 +24,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
+ #if defined(__GLIBC_PREREQ)
+ #if !__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>
+@@ -35,6 +36,7 @@
  #undef aligned_alloc
- #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ #endif // defined(__GLIBC_PREREQ)
 +#endif // defined(__GLIBC__)
- #endif // __linux__ && !__ANDROID__
+ #include <cstdlib>
+ #endif // __unix__ && !__ANDROID__
  
- #include "proxy.h"
diff --git a/srcpkgs/tbb/patches/rtld_deepbind.patch b/srcpkgs/tbb/patches/rtld_deepbind.patch
new file mode 100644
index 000000000000..14bb2dbc6a0e
--- /dev/null
+++ b/srcpkgs/tbb/patches/rtld_deepbind.patch
@@ -0,0 +1,14 @@
+# https://github.com/oneapi-src/oneTBB/pull/684/commits/453a9c555d3fae5df3b42d98621b17d401d622f0
+diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp
+index 3f1342503..5330d7107 100644
+--- a/src/tbb/dynamic_link.cpp
++++ b/src/tbb/dynamic_link.cpp
+@@ -413,7 +413,7 @@ namespace r1 {
+         int flags = RTLD_NOW;
+         if (local_binding) {
+             flags = flags | RTLD_LOCAL;
+-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS
++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS
+             flags = flags | RTLD_DEEPBIND;
+ #endif
+         } else {
diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index aeef6ebdd061..eb28180ad2ab 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,76 +1,45 @@
 # Template file for 'tbb'
 pkgname=tbb
-version=2020.U3
+version=2021.5.0
 revision=1
-# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps)
-_ver=${version/./_}
-wrksrc="oneTBB-${_ver}"
-build_style=gnu-makefile
-hostmakedepends="cmake"
+wrksrc="oneTBB-${version}"
+build_style=cmake
+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=e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a
+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"
-		;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" libucontext-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
+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
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
+fi
 
+post_extract() {
 	# 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 277c799d3247c2e4cb245007be7cc26dfac1ef29 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:10:04 -0500
Subject: [PATCH 02/11] occt: revbump for new tbb.

tbb build dependency removed because occt relies
on deprecated behavior.
---
 srcpkgs/occt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index bbf04b932396..cd4facdc3c53 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -2,14 +2,14 @@
 pkgname=occt
 reverts=7.5.0_1
 version=7.4.0p1
-revision=4
+revision=5
 _gittag="V${version//./_}"
 wrksrc=occt-${_gittag}
 build_style=cmake
-configure_args="-DUSE_FREEIMAGE=ON -DUSE_TBB=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
+configure_args="-DUSE_FREEIMAGE=ON -DUSE_GL2PS=ON -DUSE_VTK=OFF
  -DINSTALL_SAMPLES=ON"
-makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tbb-devel
- tcl-devel tk-devel"
+makedepends="freetype-devel glu-devel freeimage-devel gl2ps-devel tcl-devel
+ tk-devel"
 short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="custom:LGPL-2.1-only-with-exceptions"

From 9f81666b412cb2af19a22feb3cfa16d1e82212b6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:14:00 -0500
Subject: [PATCH 03/11] SuiteSparse: revbump for new tbb.

tbb build dependency removed because of reliance
on deprecated behavior.
DrTimothyAldenDavis/SuiteSparse#10.
---
 common/shlibs                | 12 ++++++++++++
 srcpkgs/SuiteSparse/template |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8c628094e2c7..c0f320fcf698 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,6 +4062,18 @@ libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
 libumfpack.so.5 SuiteSparse-5.10.1_1
+libbtf.so.1 SuiteSparse-5.10.1_2
+libcolamd.so.2 SuiteSparse-5.10.1_2
+libklu.so.1 SuiteSparse-5.10.1_2
+librbio.so.2 SuiteSparse-5.10.1_2
+libccolamd.so.2 SuiteSparse-5.10.1_2
+libspqr.so.2 SuiteSparse-5.10.1_2
+libldl.so.2 SuiteSparse-5.10.1_2
+libcamd.so.2 SuiteSparse-5.10.1_2
+libmongoose.so.2 SuiteSparse-5.10.1_2
+libsuitesparseconfig.so.5 SuiteSparse-5.10.1_2
+libmetis.so SuiteSparse-5.10.1_2
+libspliplu.so.1 SuiteSparse-5.10.1_2
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
 libcliquer.so.1 cliquer-1.22_1
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 23f75ff6dd7a..aee5e6bf1a02 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,10 +1,10 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
 version=5.10.1
-revision=1
-make_build_args="BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB"
+revision=2
+make_build_args="BLAS=-lblas LAPACK=-llapack"
 hostmakedepends="cmake chrpath"
-makedepends="tbb-devel libgomp-devel lapack-devel mpfr-devel"
+makedepends="libgomp-devel lapack-devel mpfr-devel"
 short_desc="Suite of sparse matrix software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="custom:multiple"

From 7755f333421fdcdbe3a44845865bfc52fce96b68 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:16:00 -0500
Subject: [PATCH 04/11] sysdig: revbump for new tbb.

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

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 02c943c9f828..8760f669e23f 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From 8a1abb984df86ac41bec9c226817f95068cd6978 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:16:37 -0500
Subject: [PATCH 05/11] OpenSubdiv: revbump for new tbb.

---
 srcpkgs/OpenSubdiv/patches/tbb-2021.patch | 29 +++++++++++++++++++++++
 srcpkgs/OpenSubdiv/template               |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/OpenSubdiv/patches/tbb-2021.patch

diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
new file mode 100644
index 000000000000..5a812c84b211
--- /dev/null
+++ b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch
@@ -0,0 +1,29 @@
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f..8dec0e1 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
++++ b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,7 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include <tbb/task_scheduler_init.h>
++#include <tbb/global_control.h>
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-    if (numThreads == -1) {
+-        tbb::task_scheduler_init init;
+-    } else {
+-        tbb::task_scheduler_init init(numThreads);
++    if (numThreads != -1) {
++		tbb::global_control tbb_global_control(
++			tbb::global_control::max_allowed_parallelism,
++			numThreads
++		);
+     }
+ }
+ 
diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template
index fd32e6bd6949..0d6867b5a6d3 100644
--- a/srcpkgs/OpenSubdiv/template
+++ b/srcpkgs/OpenSubdiv/template
@@ -1,11 +1,12 @@
 # Template file for 'OpenSubdiv'
 pkgname=OpenSubdiv
 version=3.4.3
-revision=1
+revision=2
 wrksrc="OpenSubdiv-${version//./_}"
 build_style=cmake
-configure_args="-DOpenGL_GL_PREFERENCE=GLVND"
 # TODO: CUDA/OpenCL support
+# NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable
+configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DNO_GLTESTS=1 -DNO_CUDA=1"
 makedepends="libXrandr-devel libXinerama-devel libXcursor-devel zlib-devel
  libgomp-devel glfw-devel glew-devel tbb-devel libXxf86vm-devel"
 short_desc="Open-Source subdivision surface library"

From a090e6e44b9e1bdc87fcea6069dc80a201edd831 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:17:39 -0500
Subject: [PATCH 06/11] openvdb: update to 9.0.0.

---
 common/shlibs            |  2 +-
 srcpkgs/openvdb/template | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c0f320fcf698..b7bc2bc7659f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3894,7 +3894,7 @@ libjanet.so.1.19 janet-1.19.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
-libopenvdb.so.7.0 openvdb-7.0.0_1
+libopenvdb.so.9.0 openvdb-9.0.0_1
 libAlembic.so.1.7 alembic-1.7.13_1
 libmodsecurity.so.3 modsecurity-3.0.4_1
 libraven.so.0 budgie-desktop-10.5.1_1
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 73ca06bfd53a..bece35aa1d4c 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,28 +1,27 @@
 # Template file for 'openvdb'
 pkgname=openvdb
-version=7.0.0
+version=9.0.0
 revision=1
 build_style=cmake
 configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
 hostmakedepends="pkg-config"
-makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel glfw-devel
- libXxf86vm-devel"
+makedepends="boost-devel tbb-devel ilmbase-devel libopenexr-devel c-blosc-devel
+ glfw-devel libXxf86vm-devel jemalloc-devel"
 short_desc="Sparse volume data structure and tools"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://openvdb.org"
 distfiles="https://github.com/AcademySoftwareFoundation/openvdb/archive/v${version}.tar.gz"
-checksum=97bc8ae35ef7ccbf49a4e25cb73e8c2eccae6b235bac86f2150707efcd1e910d
+checksum=ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+
+# reduce spam in log output
+CXXFLAGS="-Wno-deprecated-declarations"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_FLAGS=-latomic"
 fi
 
-post_patch() {
-	[ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0
-	vsed -i 's,ZLIB::ZLIB,ZLIB::ZLIB atomic,' openvdb/CMakeLists.txt
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 391e234989dc646e79405a530e5b08d430d93a4b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:17:59 -0500
Subject: [PATCH 07/11] openimageio: revbump for new openvdb.

---
 srcpkgs/openimageio/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index de8e1cd04409..5ba69d2b35a1 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=2.2.15.1
-revision=1
+revision=2
 wrksrc="oiio-Release-${version}"
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
@@ -59,6 +59,9 @@ openimageio-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/share/cmake
 		vmove "usr/lib/*.so"
 	}
 }

From 8a0d3c8809c03e82aab1a5cb34196a68b9bebf28 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:18:16 -0500
Subject: [PATCH 08/11] openimagedenoise: revbump for new tbb.

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 8190e029a08b..2519a207b7df 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
 version=1.4.2
-revision=1
+revision=2
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake

From fd4a88c223809253459d9b866a07a229b3bb5a6e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:18:50 -0500
Subject: [PATCH 09/11] PrusaSlicer: update to 2.4.0.

---
 srcpkgs/PrusaSlicer/patches/cross.patch | 11 -----------
 srcpkgs/PrusaSlicer/template            | 11 +++++++++--
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch
deleted file mode 100644
index d64a450d9e9f..000000000000
--- a/srcpkgs/PrusaSlicer/patches/cross.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/avrdude/CMakeLists.txt	2020-06-04 09:19:26.017251215 +0200
-+++ b/src/avrdude/CMakeLists.txt	2020-06-04 09:19:36.468250771 +0200
-@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen
- add_custom_command(
-     DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
-     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
--    COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-+    COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h
-     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
- 
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index dd0e76cb8017..c612c47d785b 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.3.0
+version=2.4.0
 revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
@@ -16,9 +16,16 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
+checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
 
+post_extract() {
+	# this test suite fails on musl
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+	fi
+}
+
 Slic3rPE_package() {
 	build_style=meta
 	depends="${sourcepkg}>=${version}_${revision}"

From c9ca3d8918c817fb586e8633bdef4bb29e506b9b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:20:34 -0500
Subject: [PATCH 10/11] embree: update to 3.13.2.

---
 common/shlibs                                       |  2 +-
 .../patches/uintNN-is-part-of-ispc-1.13.patch       | 12 ------------
 srcpkgs/embree/template                             | 13 +++++++------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch

diff --git a/common/shlibs b/common/shlibs
index b7bc2bc7659f..d00bcb653e67 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2379,7 +2379,7 @@ libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1
 libtbbmalloc_proxy.so.2 tbb-4.3_1
 libtbbmalloc.so.2 tbb-4.3_1
 libtbb.so.12 tbb-2021.5.0_1
-libembree.so.2 embree-2.5.1_1
+libembree.so.3 embree-3.13.2_1
 libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1
 libp8-platform.so.2 p8-platform-2.1.0.1_1
diff --git a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch b/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
deleted file mode 100644
index 5d0b02f3b2e5..000000000000
--- a/srcpkgs/embree/patches/uintNN-is-part-of-ispc-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: embree-2.17.7/tutorials/common/common.isph
-===================================================================
---- embree-2.17.7.orig/tutorials/common/common.isph
-+++ embree-2.17.7/tutorials/common/common.isph
-@@ -16,7 +16,3 @@
- 
- #pragma once
- 
--typedef unsigned int64 uint64;
--typedef unsigned int32 uint32;
--typedef unsigned int16 uint16;
--typedef unsigned int8  uint8;
diff --git a/srcpkgs/embree/template b/srcpkgs/embree/template
index 575b9bcb401c..4d0607977dde 100644
--- a/srcpkgs/embree/template
+++ b/srcpkgs/embree/template
@@ -1,19 +1,20 @@
 # Template file for 'embree'
 pkgname=embree
-version=2.17.7
-revision=2
-archs="x86_64"
+version=3.13.2
+revision=1
+archs="x86_64*"
 build_style=cmake
 configure_args="-DTBB_ROOT=/usr -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF"
 hostmakedepends="ispc"
 makedepends="libfreeglut-devel libXmu-devel tbb-devel MesaLib-devel libpng-devel
- libopenexr-devel libjpeg-turbo-devel libmagick-devel"
+ libopenexr-devel libjpeg-turbo-devel libmagick-devel glfw-devel"
 short_desc="High Performance Ray Tracing Kernels"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://embree.github.io/"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=c0694f287fa1fbb382aba3a895702e248d92f7e89c0e5f64aefee965482ec04c
+changelog="https://raw.githubusercontent.com/embree/embree/master/CHANGELOG.md"
+distfiles="https://github.com/embree/embree/archive/refs/tags/v${version}.tar.gz"
+checksum=dcda827e5b7a606c29d00c1339f1ef00f7fa6867346bc46a2318e8f0a601c6f9
 
 embree-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4cae6d5e9ac5bf59c60aa4061479dcc47b726055 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 24 Jan 2022 23:21:12 -0500
Subject: [PATCH 11/11] blender: revbump for new tbb.

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

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

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

* Re: [PR PATCH] [Closed]: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (51 preceding siblings ...)
  2022-01-28  0:23 ` cinerea0
@ 2022-01-28  6:27 ` ericonr
  2022-01-31 20:29 ` notthewave
                   ` (5 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: ericonr @ 2022-01-28  6:27 UTC (permalink / raw)
  To: ml

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

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

[ci skip] tbb: update to 2021.5.0; update reverse dependencies
https://github.com/void-linux/void-packages/pull/35077

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

#### Testing the changes
- I tested the changes in this PR: **YES**

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Reverse Dependencies:
- [x] blender
- [x] embree
- [x] occt
- [x] openimagedenoise
- [x] OpenSubdiv
- [x] openvdb
- [x] PrusaSlicer
- [x] SuiteSparse
- [x] sysdig
- [x] openimageio

Closes #32166 and closes #35105.

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

* Re: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (52 preceding siblings ...)
  2022-01-28  6:27 ` [PR PATCH] [Closed]: " ericonr
@ 2022-01-31 20:29 ` notthewave
  2022-01-31 20:52 ` Duncaen
                   ` (4 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: notthewave @ 2022-01-31 20:29 UTC (permalink / raw)
  To: ml

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

New comment by notthewave on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1026180518

Comment:
since this was reverted in cbda3de66d09d595bc2ae8ce3bfe9cee01a9d150 what needs to be done to get this merged again?

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

* Re: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (53 preceding siblings ...)
  2022-01-31 20:29 ` notthewave
@ 2022-01-31 20:52 ` Duncaen
  2022-01-31 23:57 ` paper42
                   ` (3 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: Duncaen @ 2022-01-31 20:52 UTC (permalink / raw)
  To: ml

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1026198357

Comment:
toolchain/gcc/libstdc++ needs to be updated.

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

* Re: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (54 preceding siblings ...)
  2022-01-31 20:52 ` Duncaen
@ 2022-01-31 23:57 ` paper42
  2022-02-01  0:01 ` Duncaen
                   ` (2 subsequent siblings)
  58 siblings, 0 replies; 60+ messages in thread
From: paper42 @ 2022-01-31 23:57 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1026330031

Comment:
EasyEffects uses a fuction that was removed in the new tbb release and tbb support isn't optional.

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

* Re: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (55 preceding siblings ...)
  2022-01-31 23:57 ` paper42
@ 2022-02-01  0:01 ` Duncaen
  2022-02-01  0:07 ` Duncaen
  2022-02-01  0:07 ` Duncaen
  58 siblings, 0 replies; 60+ messages in thread
From: Duncaen @ 2022-02-01  0:01 UTC (permalink / raw)
  To: ml

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1026332415

Comment:
libstdc++ uses it when tbb is installed or used, thats why the toolchain needs to be updated, easyeffects is fine.

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

* Re: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (56 preceding siblings ...)
  2022-02-01  0:01 ` Duncaen
@ 2022-02-01  0:07 ` Duncaen
  2022-02-01  0:07 ` Duncaen
  58 siblings, 0 replies; 60+ messages in thread
From: Duncaen @ 2022-02-01  0:07 UTC (permalink / raw)
  To: ml

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1026332415

Comment:
libstdc++ uses it when tbb is installed or used, thats why the toolchain needs to be updated, easyeffects is fine.

Edit: easyeffects just uses std::execution, which the breaks.

https://github.com/wwmm/easyeffects/commit/dfa0e853e0480eb9937747302b86e0dedc58054e

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

* Re: [ci skip] tbb: update to 2021.5.0; update reverse dependencies
  2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
                   ` (57 preceding siblings ...)
  2022-02-01  0:07 ` Duncaen
@ 2022-02-01  0:07 ` Duncaen
  58 siblings, 0 replies; 60+ messages in thread
From: Duncaen @ 2022-02-01  0:07 UTC (permalink / raw)
  To: ml

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/35077#issuecomment-1026332415

Comment:
libstdc++ uses it when tbb is installed or used, thats why the toolchain needs to be updated, easyeffects is fine.

Edit: easyeffects just uses std::execution, which breaks with the tbb update and is fixed in gcc-11+.

https://github.com/wwmm/easyeffects/commit/dfa0e853e0480eb9937747302b86e0dedc58054e

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

end of thread, other threads:[~2022-02-01  0:07 UTC | newest]

Thread overview: 60+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-16  1:21 [PR PATCH] tbb: update to 2021.5.0; update reverse dependencies cinerea0
2022-01-16  3:35 ` [PR PATCH] [Updated] " cinerea0
2022-01-16  4:03 ` cinerea0
2022-01-16  5:36 ` [PR PATCH] [Closed]: " cinerea0
2022-01-16  6:22 ` [PR PATCH] [Updated] " cinerea0
2022-01-16  7:00 ` cinerea0
2022-01-16  7:45 ` cinerea0
2022-01-16 15:16 ` notthewave
2022-01-16 15:19 ` notthewave
2022-01-16 15:42 ` notthewave
2022-01-16 15:42 ` notthewave
2022-01-16 15:43 ` notthewave
2022-01-16 15:51 ` notthewave
2022-01-16 15:52 ` notthewave
2022-01-16 15:52 ` notthewave
2022-01-16 18:41 ` [PR REVIEW] " ericonr
2022-01-16 18:41 ` ericonr
2022-01-16 18:41 ` ericonr
2022-01-16 23:42 ` cinerea0
2022-01-17  1:35 ` [PR PATCH] [Updated] " cinerea0
2022-01-17  3:17 ` cinerea0
2022-01-17  4:37 ` cinerea0
2022-01-17  5:06 ` cinerea0
2022-01-17  6:49 ` cinerea0
2022-01-17  6:53 ` cinerea0
2022-01-17 16:03 ` [PR PATCH] [Updated] " cinerea0
2022-01-17 17:41 ` cinerea0
2022-01-17 19:00 ` cinerea0
2022-01-17 19:57 ` cinerea0
2022-01-19 20:53 ` cinerea0
2022-01-19 23:57 ` cinerea0
2022-01-20 15:45 ` cinerea0
2022-01-20 17:58 ` cinerea0
2022-01-20 18:27 ` cinerea0
2022-01-20 19:27 ` cinerea0
2022-01-20 21:20 ` cinerea0
2022-01-20 21:37 ` cinerea0
2022-01-20 22:20 ` cinerea0
2022-01-20 22:43 ` cinerea0
2022-01-20 23:49 ` [PR PATCH] [Updated] " cinerea0
2022-01-21  0:51 ` cinerea0
2022-01-21  1:23 ` cinerea0
2022-01-21  2:59 ` cinerea0
2022-01-21  3:55 ` cinerea0
2022-01-21  4:19 ` [PR PATCH] [Updated] " cinerea0
2022-01-21  5:49 ` cinerea0
2022-01-21 16:55 ` cinerea0
2022-01-24 17:09 ` cinerea0
2022-01-24 20:48 ` cinerea0
2022-01-24 22:03 ` cinerea0
2022-01-25  2:51 ` cinerea0
2022-01-25  4:23 ` [PR PATCH] [Updated] [ci skip] " cinerea0
2022-01-28  0:23 ` cinerea0
2022-01-28  6:27 ` [PR PATCH] [Closed]: " ericonr
2022-01-31 20:29 ` notthewave
2022-01-31 20:52 ` Duncaen
2022-01-31 23:57 ` paper42
2022-02-01  0:01 ` Duncaen
2022-02-01  0:07 ` Duncaen
2022-02-01  0:07 ` Duncaen

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).