Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2021-12-05 22:46:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Sun Dec 5 22:46:03 2021 rev:153 rq:935655 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2021-10-28 18:31:26.568414732 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.31177/blender.changes 2021-12-05 22:46:30.725563754 +0100 @@ -1,0 +2,16 @@ +Sat Dec 4 03:41:17 UTC 2021 - Marcus Rueckert <mrueck...@suse.de> + +- Update to 3.0.0 + https://www.blender.org/download/releases/3-0/ + https://wiki.blender.org/wiki/Reference/Release_Notes/3.0 +- drop opencl support +- enable haru support for grease pencil + new BR: libharu-devel +- build against system version of eigen3 and glew +- add BR for libzstd as it is the new default compression for + blender files +- enable clang support +- refresh patches: + reproducible.patch + +------------------------------------------------------------------- Old: ---- blender-2.93.5.tar.xz blender-2.93.5.tar.xz.md5sum New: ---- blender-3.0.0.tar.xz blender-3.0.0.tar.xz.md5sum ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.IS3O5Z/_old 2021-12-05 22:46:32.365558410 +0100 +++ /var/tmp/diff_new_pack.IS3O5Z/_new 2021-12-05 22:46:32.369558397 +0100 @@ -46,20 +46,20 @@ # blender has versions like x.xxy which have x.xx (notice the missing # trailing y) in the directory path. This makes this additional variable # necessary. -%define _version %(echo %{version} | cut -b 1-4) +%define _version %(echo %{version} | cut -b 1-3) %define _suffix %(echo %{_version} | tr -d '.') %bcond_without alembic %bcond_without collada -%bcond_without opencl %bcond_without opensubdiv %bcond_without openvdb %bcond_without osl %bcond_with system_audaspace +%bcond_without system_glew # TBD %bcond_with usd %bcond_with openxr Name: blender -Version: 2.93.5 +Version: 3.0.0 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later @@ -110,6 +110,7 @@ BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel BuildRequires: libboost_wave-devel +BuildRequires: libharu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel @@ -129,6 +130,7 @@ BuildRequires: xz BuildRequires: xz-devel BuildRequires: cmake(pugixml) +BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) @@ -142,6 +144,7 @@ BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(python-3.9) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(x11) @@ -201,9 +204,6 @@ %if %{with oidn} BuildRequires: OpenImageDenoise-devel %endif -%if %{with opencl} -BuildRequires: opencl-headers -%endif %if %{with opensubdiv} BuildRequires: OpenSubdiv-devel %endif @@ -277,13 +277,15 @@ %setup -q %autopatch -p1 -#rm -rf extern/glew rm -rf extern/libopenjpeg +%if %{with system_glew} +rm -rf extern/glew # silence warning about missing includedir -#mkdir -p extern/glew/include -for i in `grep -rl "%{_bindir}/env python3"`;do sed -i '1s@^#!.*@#!%{_bindir}/python3@' ${i} ;done +mkdir -p extern/glew/include +sed -i 's|NOT WITH_SYSTEM_GLEW|WITH_SYSTEM_GLEW|' source/blender/gpu/CMakeLists.txt +%endif -#sed -i 's|NOT WITH_SYSTEM_GLEW|WITH_SYSTEM_GLEW|' source/blender/gpu/CMakeLists.txt +for i in `grep -rl "%{_bindir}/env python3"`;do sed -i '1s@^#!.*@#!%{_bindir}/python3@' ${i} ;done %build export SUSE_ASNEEDED=0 @@ -319,6 +321,7 @@ -DWITH_ASSERT_ABORT:BOOL=OFF \ %endif -DCMAKE_CXX_STANDARD=17 \ + -DWITH_CLANG:BOOL=ON \ -DWITH_LLVM:BOOL=ON \ -DLLVM_LIBRARY:FILE=%{_libdir}/libLLVM.so \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -358,11 +361,12 @@ -DWITH_CYCLES_EMBREE:BOOL=OFF \ %endif %endif + -DWITH_HARU:BOOL=ON \ -DWITH_DRACO:BOOL=ON \ -DWITH_FFTW3:BOOL=ON \ -DWITH_FREESTYLE:BOOL=ON \ -DWITH_GMP:BOOL=ON \ - -DWITH_HARU:BOOL=OFF \ + -DWITH_HARU:BOOL=ON \ -DWITH_IK_ITASC:BOOL=ON \ -DWITH_IK_SOLVER:BOOL=ON \ -DWITH_IMAGE_CINEON:BOOL=ON \ @@ -377,6 +381,7 @@ -DWITH_LIBMV_SCHUR_SPECIALIZATIONS:BOOL=ON \ -DWITH_LZMA:BOOL=ON \ -DWITH_LZO:BOOL=ON \ + -DWITH_SYSTEM_EIGEN3:BOOL=ON \ -DWITH_SYSTEM_LZO:BOOL=ON \ -DWITH_MOD_FLUID:BOOL=ON \ %ifnarch x86_64 @@ -430,13 +435,14 @@ -DWITH_GHOST_XDND:BOOL=ON \ -DWITH_X11_XINPUT:BOOL=ON \ -DWITH_X11_XF86VMODE:BOOL=ON \ +%if %{with system_glew} + -DWITH_SYSTEM_GLEW:BOOL=ON \ +%else -DWITH_SYSTEM_GLEW:BOOL=OFF \ +%endif %if %{with openxr} -DWITH_XR_OPENXR:BOOL=ON \ %endif -%if %{with opencl} - -DWITH_CYCLES_DEVICE_OPENCL:BOOL=ON \ -%endif -DWITH_CYCLES_DEVICE_OPTIX:BOOL=ON \ -DOPTIX_ROOT_DIR:PATH=/opt/nvidia/optix \ -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \ @@ -470,8 +476,6 @@ install -D -m 0644 %{SOURCE9} %{buildroot}%{_docdir}/%{name}/ install -D -m 0644 %{SOURCE10} %{buildroot}%{_docdir}/%{name}/ -chmod -f 0644 %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/modules/console_python.py - %fdupes %{buildroot}%{_datadir}/%{name}/%{_version}/ %find_lang %{name} %{?no_lang_C} rm -rf %{buildroot}%{_datadir}/locale/languages @@ -484,7 +488,7 @@ sed -i 's/^Name=Blender$/Name=Blender %{_version}/g' %{buildroot}%{_datadir}/applications/%{name}.desktop # don't package thumbnailer -rm %{buildroot}%{_bindir}/%{name}-thumbnailer.py +# rm %{buildroot}%{_bindir}/%{name}-thumbnailer.py %if 0%{?sles_version} %suse_update_desktop_file -i -n %{name} ++++++ blender-2.93.5.tar.xz -> blender-3.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/blender/blender-2.93.5.tar.xz /work/SRC/openSUSE:Factory/.blender.new.31177/blender-3.0.0.tar.xz differ: char 26, line 1 ++++++ blender-2.93.5.tar.xz.md5sum -> blender-3.0.0.tar.xz.md5sum ++++++ --- /work/SRC/openSUSE:Factory/blender/blender-2.93.5.tar.xz.md5sum 2021-10-28 18:31:26.544414718 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.31177/blender-3.0.0.tar.xz.md5sum 2021-12-05 22:46:30.709563806 +0100 @@ -1 +1 @@ -d1b175ee9d17704afe8cfebb1d56c76e blender-2.93.5.tar.xz +347963e2b916c0e9346a70a1c48bcb8f blender-3.0.0.tar.xz ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.IS3O5Z/_old 2021-12-05 22:46:32.497557980 +0100 +++ /var/tmp/diff_new_pack.IS3O5Z/_new 2021-12-05 22:46:32.497557980 +0100 @@ -15,11 +15,11 @@ Differential Revision: https://developer.blender.org/D5858 -Index: b/source/blender/datatoc/datatoc_icon.c +Index: blender-3.0.0/source/blender/datatoc/datatoc_icon.c =================================================================== ---- a/source/blender/datatoc/datatoc_icon.c -+++ b/source/blender/datatoc/datatoc_icon.c -@@ -404,7 +404,8 @@ static bool icon_merge(struct IconMergeC +--- blender-3.0.0.orig/source/blender/datatoc/datatoc_icon.c ++++ blender-3.0.0/source/blender/datatoc/datatoc_icon.c +@@ -402,7 +402,8 @@ static bool icon_merge(struct IconMergeC static bool icondir_to_png(const char *path_src, const char *file_dst) { /* Takes a path full of 'dat' files and writes out */ @@ -29,7 +29,7 @@ const struct dirent *fname; char filepath[1024]; char *filename; -@@ -419,8 +420,8 @@ static bool icondir_to_png(const char *p +@@ -417,8 +418,8 @@ static bool icondir_to_png(const char *p icon_merge_context_init(&context); errno = 0; @@ -40,7 +40,7 @@ printf( "%s: failed to dir '%s', (%s)\n", __func__, path_src, errno ? strerror(errno) : "unknown"); return false; -@@ -430,7 +431,8 @@ static bool icondir_to_png(const char *p +@@ -428,7 +429,8 @@ static bool icondir_to_png(const char *p path_str_len = path_ensure_slash(filepath); filename = &filepath[path_str_len]; @@ -50,7 +50,7 @@ if (path_test_extension(fname->d_name, ".dat")) { strcpy(filename, fname->d_name); -@@ -442,11 +444,12 @@ static bool icondir_to_png(const char *p +@@ -440,11 +442,12 @@ static bool icondir_to_png(const char *p fail++; } } @@ -64,10 +64,10 @@ if (found == 0) { printf("%s: dir '%s' has no icons\n", __func__, path_src); -Index: b/source/blender/datatoc/datatoc_icon.py +Index: blender-3.0.0/source/blender/datatoc/datatoc_icon.py =================================================================== ---- a/source/blender/datatoc/datatoc_icon.py -+++ b/source/blender/datatoc/datatoc_icon.py +--- blender-3.0.0.orig/source/blender/datatoc/datatoc_icon.py ++++ blender-3.0.0/source/blender/datatoc/datatoc_icon.py @@ -113,7 +113,7 @@ def icondir_to_png(path_src, file_dst): import os import array
