Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package embree for openSUSE:Factory checked in at 2022-11-04 17:37:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/embree (Old) and /work/SRC/openSUSE:Factory/.embree.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "embree" Fri Nov 4 17:37:55 2022 rev:15 rq:1033497 version:3.13.5 Changes: -------- --- /work/SRC/openSUSE:Factory/embree/embree.changes 2022-10-29 20:18:50.654766100 +0200 +++ /work/SRC/openSUSE:Factory/.embree.new.2275/embree.changes 2022-11-04 17:41:40.886915661 +0100 @@ -1,0 +2,14 @@ +Thu Nov 3 07:56:31 UTC 2022 - Hans-Peter Jansen <h...@urpla.net> + +- Obsolete the -devel-static package + +------------------------------------------------------------------- +Wed Nov 2 02:29:29 UTC 2022 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Build embree as shared library, blender no longer requires a + static library build. +- Reduce memory constraints, use limit_build to avoid build + failures due to OOM. +- Fix build on ARM (gh#embree/embree#383, gh#embree/embree#410) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ embree.spec ++++++ --- /var/tmp/diff_new_pack.LFyRQL/_old 2022-11-04 17:41:41.454918628 +0100 +++ /var/tmp/diff_new_pack.LFyRQL/_new 2022-11-04 17:41:41.458918649 +0100 @@ -17,6 +17,8 @@ # +%define libname libembree3 + Name: embree Version: 3.13.5 Release: 0 @@ -28,11 +30,11 @@ BuildRequires: cmake >= 3.1.0 BuildRequires: gcc-c++ BuildRequires: ispc +BuildRequires: memory-constraints BuildRequires: pkgconfig -# can't build static with TBB 2021 -#BuildRequires: tbb-devel +BuildRequires: tbb-devel BuildRequires: pkgconfig(glfw3) -# SSE2 is required: https://github.com/embree/embree#supported-platforms +# SSE2 resp. NEON is required: https://github.com/embree/embree#supported-platforms ExclusiveArch: x86_64 aarch64 %description @@ -41,33 +43,36 @@ who want to improve the performance of their photo-realistic rendering application by leveraging Embree's ray tracing kernels. -Note: -This version is specifically dedicated to Blender Cycles, as it is using the -build options that are required for it. In order to reduce the risk of -incompatibilities, it is built as static libraries, which is also enforced by -the Blender Cycles build for the time being. - -%package devel-static +%package devel Summary: Development files for embree Group: Development/Libraries/C and C++ -Provides: %{name} = %{version} +Requires: %{libname} = %{version} +Obsoletes: %{name}-devel-static <= %{version} + +%description devel +This package contains the C++ header and CMake config files. + +%package -n %{libname} +Summary: Shared library providing Embree raytracing kernels +Group: System/Libraries + +%description -n %{libname} +Embree is a collection of ray tracing kernels. -%description devel-static -This package contains the C++ header files and static libraries for %{name}, -specifically compiled for Blender Cycles needs. +This package contains the shared library. %prep -%setup -q +%autosetup -p1 %build -# we need fat lto objects here -%global _lto_cflags %{_lto_cflags} -ffat-lto-objects -export CXXFLAGS="%{optflags}" -# blender insists in using static embree -# Tasking system: can't build static with TBB 2021 gh#embree#embree#348 +%limit_build -m 1700 +%ifarch aarch64 +# https://github.com/embree/embree/issues/410 +%global optflags %{optflags} -flax-vector-conversions +%endif %cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DEMBREE_STATIC_LIB=ON \ + -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF \ + -DEMBREE_STATIC_LIB=OFF \ -DEMBREE_LIB_INSTALL_DIR=%{_libdir} \ -DEMBREE_ISPC_SUPPORT=ON \ -DEMBREE_TASKING_SYSTEM=INTERNAL \ @@ -77,6 +82,9 @@ %ifarch x86_64 -DEMBREE_MAX_ISA=AVX2 \ %endif +%ifarch aarch64 + -DEMBREE_ARM=ON \ +%endif -DEMBREE_TUTORIALS=OFF %cmake_build @@ -86,11 +94,17 @@ rm -r %{buildroot}%{_mandir} rm -r %{buildroot}/usr/share/doc -%files devel-static +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig + +%files -n %{libname} +%{_libdir}/*.so.* + +%files devel %license LICENSE.txt %doc CHANGELOG.md README.md %{_includedir}/embree3 %{_libdir}/cmake/%{name}-%{version} -%{_libdir}/*.a +%{_libdir}/*.so %changelog ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.LFyRQL/_old 2022-11-04 17:41:41.494918837 +0100 +++ /var/tmp/diff_new_pack.LFyRQL/_new 2022-11-04 17:41:41.498918858 +0100 @@ -2,18 +2,8 @@ <constraints> <hardware> <memory> - <size unit="G">32</size> + <size unit="G">6</size> </memory> </hardware> - <overwrite> - <conditions> - <arch>aarch64</arch> - </conditions> - <hardware> - <memory> - <size unit="G">8</size> - </memory> - </hardware> - </overwrite> </constraints>
