Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package blender for openSUSE:Factory checked
in at 2022-04-05 19:55:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blender (Old)
and /work/SRC/openSUSE:Factory/.blender.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender"
Tue Apr 5 19:55:30 2022 rev:158 rq:966943 version:3.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/blender/blender.changes 2022-02-21
17:47:32.767610923 +0100
+++ /work/SRC/openSUSE:Factory/.blender.new.1900/blender.changes
2022-04-05 19:55:52.661949773 +0200
@@ -1,0 +2,52 @@
+Tue Apr 5 07:14:16 UTC 2022 - Hans-Peter Jansen <h...@urpla.net>
+
+- Disable %{ix86} builds due to missing OpenShadingLanguage
+
+-------------------------------------------------------------------
+Mon Mar 28 08:09:55 UTC 2022 - Hans-Peter Jansen <h...@urpla.net>
+
+- Combine cycles devel package within blender
+- Remove unused %post{,un} sections, these caches/databases are
+ updated by rpm triggers
+- Updated blender.appdata.xml
+
+-------------------------------------------------------------------
+Sun Mar 20 15:01:45 UTC 2022 - Hans-Peter Jansen <h...@urpla.net>
+
+- Optix enabled build depends on package nvidia-optix-headers now
+ (disabled by default due to copyright issues)
+
+-------------------------------------------------------------------
+Tue Mar 15 18:10:45 UTC 2022 - Hans-Peter Jansen <h...@urpla.net>
+
+- Define %py3pkg literally allows use within {Build,}Requires
+- Guard unzip/wget requirements %{with optix}.
+
+-------------------------------------------------------------------
+Tue Mar 15 17:21:32 UTC 2022 - Hans-Peter Jansen <h...@urpla.net>
+
+- Add a OptiX build conditional, disabled by default and switched to
+ a dynamic approach to handle the the OptiX support. This way, no
+ copyrighted bits are packaged.
+
+-------------------------------------------------------------------
+Sun Mar 13 18:52:26 UTC 2022 - Hans-Peter Jansen <h...@urpla.net>
+
+- Adapt build for Python 3.10 (required minimum version)
+- Add optix includes that prepares the runtime OptiX renderer
+ Similar to other renderers, the OptiX renderer is generated on the
+ first use, given a proper local installation
+- Drop outdated patch blender-293-openexr3.patch
+
+-------------------------------------------------------------------
+Thu Mar 10 16:38:41 UTC 2022 - Marcus Rueckert <mrueck...@suse.de>
+
+- Update to 3.1.0
+ https://www.blender.org/download/releases/3-1/
+ https://wiki.blender.org/wiki/Reference/Release_Notes/3.1
+- drop patches included in update
+ 0001-Fix-T94661-Out-of-bounds-memory-access-due-to-malfor.patch
+ 0001-Fix-T94629-The-IMB_flip-API-would-fail-with-large-im.patch
+ 0001-Fix-T89542-Crash-when-loading-certain-.hdr-files.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Fix-T89542-Crash-when-loading-certain-.hdr-files.patch
0001-Fix-T94629-The-IMB_flip-API-would-fail-with-large-im.patch
0001-Fix-T94661-Out-of-bounds-memory-access-due-to-malfor.patch
blender-293-openexr3.patch
blender-3.0.1.tar.xz
blender-3.0.1.tar.xz.md5sum
New:
----
blender-3.1.0.tar.xz
blender-3.1.0.tar.xz.md5sum
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.7kHAGI/_old 2022-04-05 19:55:55.309920250 +0200
+++ /var/tmp/diff_new_pack.7kHAGI/_new 2022-04-05 19:55:55.317920161 +0200
@@ -27,6 +27,9 @@
%bcond_with oidn
%endif
+%bcond_with optix
+%define optix_version 7.4
+
%if 0%{?gcc_version} < 10
%bcond_without clang
%bcond_with lld
@@ -41,13 +44,17 @@
# Set this to 1 for fixing bugs.
%define debugbuild 0
+
# Find the version of python3 that blender is going to build against.
-%define py3version %(pkg-config python3.9 --modversion)
+%define py3ver 3.10
+%define py3pkg python310
+
# 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-3)
%define _suffix %(echo %{_version} | tr -d '.')
+
%bcond_without alembic
%bcond_without collada
%bcond_without opensubdiv
@@ -58,8 +65,9 @@
# TBD
%bcond_with usd
%bcond_with openxr
+
Name: blender
-Version: 3.0.1
+Version: 3.1.0
Release: 0
Summary: A 3D Modelling And Rendering Package
License: GPL-2.0-or-later
@@ -79,14 +87,9 @@
Source99: series
# PATCH-FIX-OPENSUSE https://developer.blender.org/D5858
Patch0: reproducible.patch
-# https://github.com/bartoszek/AUR-blender-2.83-git/blob/master/openexr3.patch
-Patch1: blender-293-openexr3.patch
-# PATCH-FIX-OPENSUSE https://developer.blender.org/T94661 Fix for CVE-2022-0544
-Patch2: 0001-Fix-T94661-Out-of-bounds-memory-access-due-to-malfor.patch
-# PATCH-FIX-OPENSUSE https://developer.blender.org/T94629 Fix for CVE-2022-0545
-Patch3: 0001-Fix-T94629-The-IMB_flip-API-would-fail-with-large-im.patch
-# PATCH-FIX-OPENSUSE https://developer.blender.org/T94572 Fix for CVE-2022-0546
-Patch4: 0001-Fix-T89542-Crash-when-loading-certain-.hdr-files.patch
+BuildRequires: %{py3pkg}-devel
+BuildRequires: %{py3pkg}-numpy-devel
+BuildRequires: %{py3pkg}-requests
BuildRequires: OpenColorIO-devel >= 2.0
BuildRequires: OpenEXR-devel
BuildRequires: OpenImageIO
@@ -129,8 +132,6 @@
BuildRequires: perl-Text-Iconv
BuildRequires: pkgconfig
BuildRequires: potrace-devel
-BuildRequires: python39-numpy-devel
-BuildRequires: python39-requests
BuildRequires: shared-mime-info
BuildRequires: update-desktop-files
BuildRequires: xz
@@ -162,9 +163,9 @@
BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib)
#!BuildIgnore: libGLwM1
-Requires: python39-base
-Requires: python39-numpy
-Requires: python39-requests
+Requires: %{py3pkg}-base
+Requires: %{py3pkg}-numpy
+Requires: %{py3pkg}-requests
Requires(post): hicolor-icon-theme
Requires(postun):hicolor-icon-theme
Recommends: %name-demo = %version
@@ -220,6 +221,9 @@
BuildRequires: tbb-devel
BuildRequires: pkgconfig(blosc)
%endif
+%if %{with optix}
+BuildRequires: nvidia-optix-headers
+%endif
%if %{with osl}
BuildRequires: OpenShadingLanguage-devel
%endif
@@ -228,7 +232,8 @@
Requires: audaspace-plugins
%endif
%ifarch x86_64
-Requires: %{name}-cycles-devel = %{version}
+Obsoletes: %{name}-cycles-devel = %{version}
+Provides: %{name}-cycles-devel = %{version}
%endif
ExcludeArch: %{ix86}
@@ -250,18 +255,9 @@
as well as an integrated game engine for real-time interactive 3D
and game creation and playback with cross-platform compatibility.
-%ifarch x86_64
-%package cycles-devel
-Summary: Headers for cycles rendering with %{name}-%{version}
-#This package is for blender with cycles OSL
-License: Apache-2.0
-Group: Development/Sources
-Requires: %{name}-%{_suffix} = %{version}
-BuildArch: noarch
-
-%description cycles-devel
-These are the cycles headers that blender uses for rendering with
-specific gpus
+%if %{with optix}
+This build has enabled support for OptiX Version %{optix_version}.
+Check %{_docdir}/SUSE-NVIDIA-OptiX-rendering.txt.
%endif
%package demo
@@ -294,7 +290,7 @@
sed -i 's|NOT WITH_SYSTEM_GLEW|WITH_SYSTEM_GLEW|'
source/blender/gpu/CMakeLists.txt
%endif
-for i in `grep -rl "%{_bindir}/env python3"`;do sed -i
'1s@^#!.*@#!%{_bindir}/python3@' ${i} ;done
+for i in `grep -rl "%{_bindir}/env python"`;do sed -i
'1s@^#!.*@#!%{_bindir}/python%{py3ver}@' ${i} ;done
%build
export SUSE_ASNEEDED=0
@@ -310,9 +306,6 @@
%endif
echo "optflags: " %{optflags}
-# Find python3 version and abiflags
-export psver=$(pkg-config python-3.9 --modversion)
-export pver=$(pkg-config python-3.9 --modversion)$(python3.9-config --abiflags)
mkdir -p build && pushd build
# lean against build_files/cmake/config/blender_release.cmake
@@ -424,13 +417,13 @@
-DWITH_PUGIXML:BOOL=ON \
-DWITH_PYTHON:BOOL=ON \
-DWITH_PYTHON_INSTALL:BOOL=OFF \
- -DPYTHON_VERSION=$psver \
+ -DPYTHON_VERSION=%{py3ver} \
-DPYTHON_LIBPATH=%{_libexecdir} \
- -DPYTHON_LIBRARY=python$pver \
- -DPYTHON_INCLUDE_DIRS=%{_includedir}/python$pver \
+ -DPYTHON_LIBRARY=python%{py3ver} \
+ -DPYTHON_INCLUDE_DIRS=%{_includedir}/python%{py3ver} \
-DWITH_PYTHON_INSTALL_NUMPY=OFF \
- -DPYTHON_NUMPY_PATH:PATH=%{python39_sitearch} \
- -DPYTHON_NUMPY_INCLUDE_DIRS:PATH=%{python39_sitearch}/numpy/core/include
\
+ -DPYTHON_NUMPY_PATH:PATH=%{_libdir}/python%{py3ver}/site-packages \
+
-DPYTHON_NUMPY_INCLUDE_DIRS:PATH=%{_libdir}/python%{py3ver}/site-packages/numpy/core/include
\
-DWITH_QUADRIFLOW:BOOL=ON \
-DWITH_SDL:BOOL=ON \
-DWITH_TBB:BOOL=ON \
@@ -453,10 +446,14 @@
%if %{with openxr}
-DWITH_XR_OPENXR:BOOL=ON \
%endif
+%if %{with optix}
-DWITH_CYCLES_DEVICE_OPTIX:BOOL=ON \
+ -DOPTIX_INCLUDE_DIR:PATH=%{_includedir}/optix/include \
-DOPTIX_ROOT_DIR:PATH=/opt/nvidia/optix \
- -DWITH_CYCLES_CUDA_BINARIES:BOOL=ON \
- -DWITH_CYCLES_CUBIN_COMPILER:BOOL=OFF
+%endif
+ -DWITH_CYCLES_CUDA_BINARIES:BOOL=OFF \
+ -DWITH_CYCLES_CUBIN_COMPILER:BOOL=OFF \
+ -DWITH_CYCLES_HIP_BINARIES:BOOL=ON
make %{?_smp_mflags}
@@ -524,17 +521,15 @@
%exclude %{_docdir}/%{name}/geeko_example_scene.*
%{_datadir}/%{name}/%{_version}/scripts/
%{_datadir}/%{name}/%{_version}/datafiles/
+%ifarch x86_64
+%{_datadir}/%{name}/%{_version}/scripts/addons/cycles
+%endif
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}*.svg
%dir %{_datadir}/appdata
%{_datadir}/appdata/%{name}.appdata.xml
%doc %{_docdir}/%{name}
-%ifarch x86_64
-%files cycles-devel
-%{_datadir}/%{name}/%{_version}/scripts/addons/cycles
-%endif
-
%files demo
%doc %{_docdir}/%{name}/geeko_example_scene.*
++++++ SUSE-NVIDIA-OptiX-rendering.txt ++++++
--- /var/tmp/diff_new_pack.7kHAGI/_old 2022-04-05 19:55:55.361919670 +0200
+++ /var/tmp/diff_new_pack.7kHAGI/_new 2022-04-05 19:55:55.365919626 +0200
@@ -12,7 +12,7 @@
https://developer.nvidia.com/designworks/optix/download
-At the time of this writing, this was Version 7.1.0.
+At the time of this writing, this was Version 7.4.0.
The further description refers to this version.
You need to unpack it in a specific location (as root). Since we need to
specify
@@ -22,11 +22,11 @@
$ su
# mkdir -p /opt/nvidia
# cd /opt/nvidia
-# sh ~user/Downloads/NVIDIA-OptiX-SDK-7.1.0-linux64-x86_64.sh
+# sh ~user/Downloads/NVIDIA-OptiX-SDK-7.4.0-linux64-x86_64.sh
# # Answer all questions with yes.
# # Note: adjust path accordingly
-# ln -s NVIDIA-OptiX-SDK-7.1.0-linux64-x86_64 optix
+# ln -s NVIDIA-OptiX-SDK-7.4.0-linux64-x86_64 optix
Now set up OptiX environment, e.g. in ~/.profile or in /etc/profile.local:
++++++ blender-3.0.1.tar.xz -> blender-3.1.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/blender/blender-3.0.1.tar.xz
/work/SRC/openSUSE:Factory/.blender.new.1900/blender-3.1.0.tar.xz differ: char
26, line 1
++++++ blender-3.0.1.tar.xz.md5sum -> blender-3.1.0.tar.xz.md5sum ++++++
--- /work/SRC/openSUSE:Factory/blender/blender-3.0.1.tar.xz.md5sum
2022-02-05 23:23:49.631660411 +0100
+++ /work/SRC/openSUSE:Factory/.blender.new.1900/blender-3.1.0.tar.xz.md5sum
2022-04-05 19:55:52.637950041 +0200
@@ -1 +1 @@
-41cccf2fe68b9b307204e9b9b2278b0c blender-3.0.1.tar.xz
+483e16f010cc8c2363ba05b716fde3d0 blender-3.1.0.tar.xz
++++++ blender.appdata.xml ++++++
--- /var/tmp/diff_new_pack.7kHAGI/_old 2022-04-05 19:55:55.413919091 +0200
+++ /var/tmp/diff_new_pack.7kHAGI/_new 2022-04-05 19:55:55.413919091 +0200
@@ -1,49 +1,87 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<component>
- <id type="desktop">blender.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <name>Blender</name>
- <project_license>GPL-2.0+</project_license>
- <summary>3D modeling, animation, rendering and post-production</summary>
- <url type="homepage">http://www.blender.org/</url>
- <description>
- <p>Blender is the free and open source 3D creation suite. It supports the
entirety of the 3D pipeline???modeling, rigging, animation, simulation,
rendering, compositing and motion tracking, even video editing and game
creation. Advanced users employ Blender???s API for Python scripting to
customize the application and write specialized tools; often these are included
in Blender???s future releases. Blender is well suited to individuals and small
studios who benefit from its unified pipeline and responsive development
process. Use Blender to create TV commercials, to make
-technical visualizations, business graphics, to do some morphing, or design
user interfaces.</p>
- <p>Blender is cross-platform and runs equally well on Linux, Windows and
Macintosh computers. Its interface uses OpenGL to provide a consistent
experience. </p>
- <p>Features:</p>
- <ul>
- <li>Photorealistic Rendering featuring a powerful new unbiased rendering
engine called Cycles that offers stunning ultra-realistic rendering</li>
- <li>Comprehensive array of modeling tools to make creating, transforming
and editing your models a breeze</li>
- <li>Blender???s new rendering engine includes complete node support for
full customization, physically accurate shaders like glass, translucency and
SSS, Open Shading Language (OSL) support for coding unique shaders and much
more</li>
- <li>An impressive set of rigging tools including: Envelope, skeleton and
automatic skinning, easy weight painting, mirror functionality, bone layers and
colored groups for organization and B-spline interpolated bones</li>
- <li>Animation toolset featuring Automated walk-cycles along paths,
Character animation pose editor, Non Linear Animation (NLA) for independent
movements, IK forward/inverse kinematics for fast poses and Sound
synchronization</li>
- <li>Sculpting using 20 different brush types, Multi-res sculpting
support, Dynamic Topology sculpting, Mirrored sculpting and more</li>
- <li>Easily unwrap your mesh right inside Blender, and use image textures
or paint your own directly onto the model.
-Blender allows for: Fast Cube, Cylinder, Sphere and Camera projections,
Conformal and Angle Based unwrapping (with edge seams and vertex pinning),
Painting directly onto the mesh, Multiple UV layers, and UV layout image
exporting</li>
- <li>A fully fledged compositor built right in, which means no more
exporting to third party programs; you can do it all without leaving the
program</li>
- <li>Great looking simulations with tools including Fluid, Smoke, Hair,
Cloth, Particles and Rigid Body Physics simulators</li>
- <li>Included in Blender is a complete game engine, allowing you to
create a fully featured 3d game right inside Blender</li>
- <li>Camera and Object tracking</li>
- <li>A vast array of extensions, courtesy a large community of
enthusiasts and developers</li>
- <li>Built-in Video Editor</li>
- <li>Import/export support for many different programs</li>
- <li>A completely customizable layout</li>
- </ul>
- </description>
- <screenshots>
- <screenshot type="default">
- <image height="809"
width="1440">https://www.blender.org/wp-content/uploads/2012/11/Flexible-UI.png?c5b6e6</image>
- <caption>Blender user interface</caption>
- </screenshot>
- <screenshot>
- <image height="707"
width="1256">https://www.blender.org/wp-content/uploads/2012/11/materials_screenshot.png?c5b6e6</image>
- <caption>Rendering materials in blender</caption>
- </screenshot>
- <screenshot>
- <image height="720"
width="1280">https://www.blender.org/wp-content/uploads/2012/11/caminandes_edit_final.jpg?c5b6e6</image>
- <caption>Video editing in blender</caption>
- </screenshot>
- </screenshots>
- <update_contact>bf-committ...@blender.org</update_contact>
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>org.blender.Blender</id>
+ <launchable type="desktop-id">org.blender.Blender.desktop</launchable>
+ <name>Blender</name>
+ <summary>Free and open source 3D creation suite</summary>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0</project_license>
+ <description>
+ <p>
+ Blender is the free and open source 3D creation suite. It supports
+ the entirety of the 3D pipeline ??? modeling, rigging, animation,
+ simulation, rendering, compositing, motion tracking, and video
+ editing.
+ </p>
+
+ <p>
+ Blender is a public project, made by hundreds of people from
around the
+ world; by studios and individual artists, professionals and
hobbyists,
+ scientists, students, VFX experts, animators, game artists,
modders, and
+ the list goes on.
+ </p>
+ </description>
+ <url type="homepage">https://www.blender.org</url>
+ <url type="help">https://www.blender.org/support/</url>
+ <url type="bugtracker">https://developer.blender.org</url>
+ <url
type="donation">https://www.blender.org/foundation/donation-payment/</url>
+ <screenshots>
+ <screenshot type="default">
+
<image>https://download.blender.org/demo/screenshots/blender_screenshot_1.jpg</image>
+ </screenshot>
+ <screenshot>
+
<image>https://download.blender.org/demo/screenshots/blender_screenshot_2.jpg</image>
+ </screenshot>
+ <screenshot>
+
<image>https://download.blender.org/demo/screenshots/blender_screenshot_3.jpg</image>
+ </screenshot>
+ <screenshot>
+
<image>https://download.blender.org/demo/screenshots/blender_screenshot_4.jpg</image>
+ </screenshot>
+ </screenshots>
+ <content_rating type="oars-1.1"/>
+ <releases>
+ <release version="3.1.0" date="2022-03-09"/>
+ <release version="3.0.1" date="2022-01-26"/>
+ <release version="3.0.0" date="2021-12-03"/>
+ <release version="2.93.6" date="2021-11-17"/>
+ <release version="2.93.5" date="2021-10-06"/>
+ <release version="2.93.4" date="2021-09-01"/>
+ <release version="2.93.3" date="2021-08-18">
+ <description>
+ <p>Enhancements:</p>
+ <ul>
+ <li>Fix multiple bugs</li>
+ </ul>
+ </description>
+ </release>
+ <release version="2.93.1" date="2021-06-23">
+ <description>
+ <p>Enhancements:</p>
+ <ul>
+ <li>Fix multiple bugs</li>
+ </ul>
+ </description>
+ </release>
+ <release version="2.93" date="2021-06-02">
+ <description>
+ <p>New features:</p>
+ <ul>
+ <li>More geometry nodes</li>
+ <li>Mask loops & patterns</li>
+ <li>Mask textures</li>
+ <li>Line art modifier</li>
+ <li>New fill tool in Greasepencil</li>
+ </ul>
+ <p>Enhancements:</p>
+ <ul>
+ <li>EEVEE depth of field</li>
+ <li>Interpolate tool rewritten</li>
+ <li>Better volumetrics in EEVEE</li>
+ <li>Cycles persistence</li>
+ </ul>
+ </description>
+ </release>
+ </releases>
</component>
++++++ series ++++++
--- /var/tmp/diff_new_pack.7kHAGI/_old 2022-04-05 19:55:55.457918601 +0200
+++ /var/tmp/diff_new_pack.7kHAGI/_new 2022-04-05 19:55:55.461918555 +0200
@@ -1,8 +1,4 @@
-# only rely on patch availibility, if python_36 is requested
-make_python_3.6_compatible.patch
# PATCH-FIX-OPENSUSE https://developer.blender.org/D5858
reproducible.patch
-# PATCH-FIX-OPENSUSE -- 32bit arch compatibility
-0001-Dont-hide-required-uint64-atomic-ops-when-available.patch
-fix_linking.patch
+blender-293-openexr3.patch
