Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2025-03-20 19:24:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.2696 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Thu Mar 20 19:24:41 2025 rev:187 rq:1254207 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2025-02-26 17:16:39.130513568 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new.2696/blender.changes 2025-03-20 19:25:15.346291653 +0100 @@ -1,0 +2,18 @@ +Tue Mar 18 15:53:49 UTC 2025 - Marcus Rueckert <mrueck...@suse.de> + +- Update to 4.4.0 + https://developer.blender.org/docs/release_notes/4.4/ + https://www.blender.org/download/releases/4-4/ +- build with python 3.13 on TW but keep python 3.11 on Leap +- we can build with system audaspace on Leap again +- refreshed patches cmake_manpage_fix.patch +- drop patches: + Add_missing_system_error_handler.patch + ffmpeg-7-1.patch +- change BR for zstd to cmake(zstd) because the pkgconfig alone was + not enough to find the library +- add pkgconfig(libpipewire-0.3) if we ever switch back to the + intree audaspace +- add support for easily test snapshots + +------------------------------------------------------------------- Old: ---- Add_missing_system_error_handler.patch blender-4.3.2.tar.xz blender-4.3.2.tar.xz.md5sum blender-assets-4.3.2.tar.xz ffmpeg-7-1.patch New: ---- blender-4.4.0.tar.xz blender-4.4.0.tar.xz.md5sum blender-assets-4.4.0.tar.xz blender-assets.obsinfo blender.obsinfo BETA DEBUG BEGIN: Old:- drop patches: Add_missing_system_error_handler.patch ffmpeg-7-1.patch Old: Add_missing_system_error_handler.patch ffmpeg-7-1.patch - change BR for zstd to cmake(zstd) because the pkgconfig alone was BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.9lcBrg/_old 2025-03-20 19:25:16.490338936 +0100 +++ /var/tmp/diff_new_pack.9lcBrg/_new 2025-03-20 19:25:16.494339102 +0100 @@ -20,6 +20,8 @@ %define _dwz_low_mem_die_limit 40000000 %define _dwz_max_die_limit 200000000 +%bcond_with is_snapshot + %ifarch x86_64 %bcond_without embree %bcond_without oidn @@ -40,7 +42,7 @@ %if 0%{?suse_version} >= 1550 %bcond_without system_audaspace %else -%bcond_with system_audaspace +%bcond_without system_audaspace %global force_boost_version 1_75_0 %global force_gcc_version 14 %endif @@ -53,12 +55,21 @@ %define debugbuild 0 # Define the version of python3 that blender is going to build against. +%if 0%{?suse_version} >= 1550 +%define py3ver 3.13 +%define py3pkg python313 +%else %define py3ver 3.11 %define py3pkg python311 +%endif # this is mostly needed on leap for PySound.cpp as we build the intree audaspace -%if 0%{?suse_version} == 1500 +%if %{without system_audaspace} +%if 0%{?suse_version} >= 1600 +%define numpy_include_path %{_libdir}/python%{py3ver}/site-packages/numpy/_core/include/ +%else %define numpy_include_path %{_libdir}/python%{py3ver}/site-packages/numpy/core/include/ %endif +%endif # Blender version: source/blender/blenkernel/BKE_blender_version.h # blender has versions like x.xxy which have x.xx (notice the missing @@ -80,15 +91,19 @@ %global pkg_name blender Name: blender -Version: 4.3.2 +Version: 4.4.0 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later Group: Productivity/Graphics/3D Editors URL: https://www.blender.org/ # Please leave the source url intact +%if %{with is_snapshot} +Source0: %{pkg_name}-%{version}.tar.xz +%else Source0: https://download.blender.org/source/%{pkg_name}-%{version}.tar.xz Source1: https://download.blender.org/source/%{pkg_name}-%{version}.tar.xz.md5sum +%endif # Unfortunately, the "Essentials" library is only availabe using GIT LFS. https://projects.blender.org/blender/blender/issues/128359 Source2: blender-assets-%{version}.tar.xz Source4: geeko.blend @@ -99,12 +114,8 @@ Source9: SUSE-NVIDIA-GPU-rendering.txt Source10: SUSE-NVIDIA-OptiX-rendering.txt Source99: series -# PATCH-FIX-OPENSUSE - fix gcc 13 fallout -Patch1: Add_missing_system_error_handler.patch # PATCH-FIX-UPSTREAM https://projects.blender.org/blender/blender/pulls/115320 -Patch2: cmake_manpage_fix.patch -# PATCH-FIX-UPSTREAM https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/blob/main/ffmpeg-7-1.patch?ref_type=heads -Patch3: ffmpeg-7-1.patch +Patch1: cmake_manpage_fix.patch %if %{with mold} BuildRequires: mold %endif @@ -165,6 +176,7 @@ BuildRequires: xz BuildRequires: xz-devel BuildRequires: cmake(pugixml) +BuildRequires: cmake(zstd) BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(freetype2) @@ -180,11 +192,11 @@ BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libdecor-0) BuildRequires: pkgconfig(libopenjp2) +BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libswresample) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(shaderc) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(vulkan) @@ -246,7 +258,7 @@ BuildRequires: OpenSubdiv-devel %endif %if %{with openvdb} -BuildRequires: openvdb-devel < 12 +BuildRequires: openvdb-devel BuildRequires: tbb-devel BuildRequires: pkgconfig(blosc) %endif @@ -257,7 +269,7 @@ BuildRequires: OpenShadingLanguage-devel > 1.13 %endif %if %{with system_audaspace} -BuildRequires: pkgconfig(audaspace) >= 1.5 +BuildRequires: pkgconfig(audaspace) >= 1.6 Requires: audaspace-deviceplugin Requires: audaspace-fileplugin %endif @@ -309,9 +321,11 @@ %lang_package %prep +%if %{without is_snapshot} pushd "%{_sourcedir}" md5sum -c %{SOURCE1} popd +%endif %autosetup -p1 -n %{pkg_name}-%{version} %setup -T -D -a 2 -q -n %{pkg_name}-%{version} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9lcBrg/_old 2025-03-20 19:25:16.602343565 +0100 +++ /var/tmp/diff_new_pack.9lcBrg/_new 2025-03-20 19:25:16.610343896 +0100 @@ -1,15 +1,21 @@ <services> - <service name="obs_scm" mode="manual"> - <param name="revision">v4.3.2</param> - <param name="version">4.3.2</param> - <param name="url">https://projects.blender.org/blender/blender-assets.git</param> + <!-- + <service name="tar_scm" mode="manual"> + <param name="revision">blender-v4.4-release</param> + <param name="version">4.4.0</param> + <param name="url">https://projects.blender.org/blender/blender.git</param> <param name="scm">git</param> <param name="lfs">enable</param> - <param name="exclude">testing/*</param> - <param name="exclude">working/*</param> - <param name="exclude">icons/*</param> + <param name="exclude">lib/*</param> + <param name="exclude">tests/data/*</param> </service> - <service name="tar" mode="manual"> + --> + <service name="tar_scm" mode="manual"> + <param name="revision">v4.4.0</param> + <param name="version">4.4.0</param> + <param name="url">https://projects.blender.org/blender/blender-assets.git</param> + <param name="scm">git</param> + <param name="lfs">enable</param> <param name="exclude">testing/*</param> <param name="exclude">working/*</param> <param name="exclude">icons/*</param> ++++++ blender-4.3.2.tar.xz -> blender-4.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/blender/blender-4.3.2.tar.xz /work/SRC/openSUSE:Factory/.blender.new.2696/blender-4.4.0.tar.xz differ: char 26, line 1 ++++++ blender-4.3.2.tar.xz.md5sum -> blender-4.4.0.tar.xz.md5sum ++++++ --- /work/SRC/openSUSE:Factory/blender/blender-4.3.2.tar.xz.md5sum 2025-02-11 21:32:22.249430376 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new.2696/blender-4.4.0.tar.xz.md5sum 2025-03-20 19:25:15.098281403 +0100 @@ -1 +1 @@ -da5763a70f32202832b31d57808d756d blender-4.3.2.tar.xz +3119090d2744733970ec2345b1f3db94 blender-4.4.0.tar.xz ++++++ blender-assets-4.3.2.tar.xz -> blender-assets-4.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/blender/blender-assets-4.3.2.tar.xz /work/SRC/openSUSE:Factory/.blender.new.2696/blender-assets-4.4.0.tar.xz differ: char 15, line 1 ++++++ blender-assets.obsinfo ++++++ name: blender-assets version: 4.4.0 mtime: 1738975706 commit: 0418ad6b8e0d962bde30b2d4d828984b9f9c3299 ++++++ blender.obsinfo ++++++ name: blender version: 4.4.0 mtime: 1740837384 commit: 725617c7a007d2343f98a6c2e860a38617f6c427 ++++++ cmake_manpage_fix.patch ++++++ --- /var/tmp/diff_new_pack.9lcBrg/_old 2025-03-20 19:25:16.766350344 +0100 +++ /var/tmp/diff_new_pack.9lcBrg/_new 2025-03-20 19:25:16.770350509 +0100 @@ -1,8 +1,8 @@ -Index: blender-4.3.0/source/creator/CMakeLists.txt +Index: blender/source/creator/CMakeLists.txt =================================================================== ---- blender-4.3.0.orig/source/creator/CMakeLists.txt -+++ blender-4.3.0/source/creator/CMakeLists.txt -@@ -2005,7 +2005,7 @@ detect_leaks=0\"\n\ +--- blender.orig/source/creator/CMakeLists.txt ++++ blender/source/creator/CMakeLists.txt +@@ -2086,7 +2086,7 @@ detect_leaks=0\"\n\ execute_process(\n\ COMMAND\n\ $\{PYTHON_EXECUTABLE\} $\{MANPAGE_GEN\}\n\ ++++++ series ++++++ --- /var/tmp/diff_new_pack.9lcBrg/_old 2025-03-20 19:25:16.854353981 +0100 +++ /var/tmp/diff_new_pack.9lcBrg/_new 2025-03-20 19:25:16.858354146 +0100 @@ -1,9 +1,3 @@ -# PATCH-FIX-OPENSUSE https://developer.blender.org/D5858 -# reproducible.patch -p1 -# PATCH-FIX-OPENSUSE - fix gcc 13 fallout -Add_missing_system_error_handler.patch -p1 # PATCH-FIX-UPSTREAM https://projects.blender.org/blender/blender/pulls/115320 cmake_manpage_fix.patch -# PATCH-FIX-UPSTREAM https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/blob/main/ffmpeg-7-1.patch?ref_type=heads -ffmpeg-7-1.patch
