From 098bb6ee2afee01ebe7e2501070ed588274d9f02 Mon Sep 17 00:00:00 2001 From: cinerea0 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 that there is no aligned_alloc - #undef _GLIBCXX_HAVE_ALIGNED_ALLOC -@@ -37,6 +38,7 @@ - #include +@@ -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 + #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 " 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 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 " 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