Github messages for voidlinux
 help / color / mirror / Atom feed
From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [ci skip] tbb: update to 2021.5.0; update reverse dependencies
Date: Fri, 28 Jan 2022 01:23:04 +0100	[thread overview]
Message-ID: <20220128002304.QwGk7gCDITtOWtr0L4s1YN_5MQHDvbcXpFF8tzkkEXc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35077@inbox.vuxu.org>

[-- 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"

  parent reply	other threads:[~2022-01-28  0:23 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-16  1:21 [PR PATCH] " 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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220128002304.QwGk7gCDITtOWtr0L4s1YN_5MQHDvbcXpFF8tzkkEXc@z \
    --to=cinerea0@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).