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-07-23 23:41:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Fri Jul 23 23:41:02 2021 rev:150 rq:907137 version:2.93.1 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2021-03-30 21:06:13.053101394 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.1899/blender.changes 2021-07-23 23:41:04.821841400 +0200 @@ -1,0 +2,23 @@ +Mon Jul 5 09:12:45 UTC 2021 - Hans-Peter Jansen <[email protected]> + +- Remove old tarball +- Supplement Yavor's changelog +- Adjust reproducible.patch +- Switch to Python 3.9 build, remove 3.6 compatibility code + If this package is wanted for Leap, please add an conditional + to build it with a local Python >= Python 3.9, and fix the fallout +- Remove make_python_3.6_compatible.patch +- Refine OpenColorIO dependency (>= 2.0) + +------------------------------------------------------------------- +Sun Jul 4 19:23:56 UTC 2021 - Yavor Uzunov <[email protected]> + +- Update to 2.93.1 + https://www.blender.org/download/releases/2-93/ + +------------------------------------------------------------------- +Sun Jul 4 19:18:29 UTC 2021 - Yavor Uzunov <[email protected]> + +- Fixed typo in "blender.appdata.xml" + +------------------------------------------------------------------- Old: ---- blender-2.92.0.tar.xz blender-2.92.0.tar.xz.md5sum make_python_3.6_compatible.patch New: ---- blender-2.93.1.tar.xz blender-2.93.1.tar.xz.md5sum ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.3oCdKI/_old 2021-07-23 23:41:06.561839177 +0200 +++ /var/tmp/diff_new_pack.3oCdKI/_new 2021-07-23 23:41:06.565839172 +0200 @@ -39,10 +39,6 @@ %bcond_with usd %bcond_with openxr -%if 0%{?suse_version} < 1550 -%bcond_without python_36 -%endif - %if 0%{?gcc_version} < 10 #global force_gcc_version 9 %bcond_without clang @@ -59,7 +55,7 @@ %define debugbuild 0 # Find the version of python3 that blender is going to build against. -%define py3version %(pkg-config python3 --modversion) +%define py3version %(pkg-config python3.9 --modversion) # blender has versions like x.xxy which have x.xx (notice the missing # trailing y) in the directory path. This makes this additional variable @@ -68,7 +64,7 @@ %define _suffix %(echo %{_version} | tr -d '.') Name: blender -Version: 2.92.0 +Version: 2.93.1 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later @@ -86,12 +82,10 @@ Source9: SUSE-NVIDIA-GPU-rendering.txt Source10: SUSE-NVIDIA-OptiX-rendering.txt Source99: series -# PATCH-FIX-OPENSUSE Python 3.6 compatibility -Patch0: make_python_3.6_compatible.patch # PATCH-FIX-OPENSUSE https://developer.blender.org/D5858 -Patch1: reproducible.patch +Patch0: reproducible.patch #!BuildIgnore: libGLwM1 -BuildRequires: OpenColorIO-devel +BuildRequires: OpenColorIO-devel >= 2.0 BuildRequires: OpenEXR-devel BuildRequires: OpenImageIO BuildRequires: OpenImageIO-devel @@ -138,6 +132,7 @@ BuildRequires: libboost_wave-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libpulse-devel BuildRequires: libspnav-devel BuildRequires: libtiff-devel BuildRequires: llvm-devel @@ -147,8 +142,8 @@ BuildRequires: perl-Text-Iconv BuildRequires: pkg-config BuildRequires: potrace-devel -BuildRequires: python3-numpy-devel -BuildRequires: python3-requests +BuildRequires: python39-numpy-devel +BuildRequires: python39-requests BuildRequires: shared-mime-info BuildRequires: update-desktop-files BuildRequires: xz @@ -160,6 +155,7 @@ BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glw) +BuildRequires: pkgconfig(python-3.9) %if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(gmpxx) %else @@ -173,11 +169,6 @@ BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libxml-2.0) -%if %{with python_36} -BuildRequires: pkgconfig(python3) >= 3.6 -%else -BuildRequires: pkgconfig(python3) >= 3.7 -%endif BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xfixes) @@ -225,10 +216,9 @@ %ifarch x86_64 Requires: %{name}-cycles-devel = %{version} %endif -Requires: python3-base >= %{py3version} -Requires: python3-numpy -Requires: python3-requests -Requires: python3-xml +Requires: python39-base +Requires: python39-numpy +Requires: python39-requests Requires(post): hicolor-icon-theme Requires(postun):hicolor-icon-theme Provides: %{name}-%{_suffix} = %{version} @@ -288,10 +278,7 @@ popd %setup -q -%if %{with python_36} %patch0 -p1 -%endif -%patch1 -p1 rm -rf extern/glew rm -rf extern/libopenjpeg @@ -314,8 +301,8 @@ echo "optflags: " %{optflags} # Find python3 version and abiflags -export psver=$(pkg-config python3 --modversion) -export pver=$(pkg-config python3 --modversion)$(python3-config --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,8 +411,8 @@ -DPYTHON_LIBRARY=python$pver \ -DPYTHON_INCLUDE_DIRS=%{_includedir}/python$pver \ -DWITH_PYTHON_INSTALL_NUMPY=OFF \ - -DPYTHON_NUMPY_PATH:PATH=%{python3_sitearch} \ - -DPYTHON_NUMPY_INCLUDE_DIRS:PATH=%{python3_sitearch}/numpy/core/include \ + -DPYTHON_NUMPY_PATH:PATH=%{python39_sitearch} \ + -DPYTHON_NUMPY_INCLUDE_DIRS:PATH=%{python39_sitearch}/numpy/core/include \ -DWITH_QUADRIFLOW:BOOL=ON \ -DWITH_SDL:BOOL=ON \ -DWITH_TBB:BOOL=ON \ ++++++ blender-2.92.0.tar.xz -> blender-2.93.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/blender/blender-2.92.0.tar.xz /work/SRC/openSUSE:Factory/.blender.new.1899/blender-2.93.1.tar.xz differ: char 26, line 1 ++++++ blender-2.92.0.tar.xz.md5sum -> blender-2.93.1.tar.xz.md5sum ++++++ --- /work/SRC/openSUSE:Factory/blender/blender-2.92.0.tar.xz.md5sum 2021-03-30 21:06:12.841101162 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.1899/blender-2.93.1.tar.xz.md5sum 2021-07-23 23:41:04.805841420 +0200 @@ -1 +1 @@ -edcbd38e7cdbeeba301de1d57a7ff33c blender-2.92.0.tar.xz +54219edb12d5145a6881885c6fc7475e blender-2.93.1.tar.xz ++++++ blender.appdata.xml ++++++ --- /var/tmp/diff_new_pack.3oCdKI/_old 2021-07-23 23:41:06.661839049 +0200 +++ /var/tmp/diff_new_pack.3oCdKI/_new 2021-07-23 23:41:06.661839049 +0200 @@ -41,7 +41,7 @@ </screenshot> <screenshot> <image height="720" width="1280">https://www.blender.org/wp-content/uploads/2012/11/caminandes_edit_final.jpg?c5b6e6</image> - <caption>Video editin in blender</caption> + <caption>Video editing in blender</caption> </screenshot> </screenshots> <update_contact>[email protected]</update_contact> ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.3oCdKI/_old 2021-07-23 23:41:06.701838998 +0200 +++ /var/tmp/diff_new_pack.3oCdKI/_new 2021-07-23 23:41:06.701838998 +0200 @@ -15,11 +15,11 @@ Differential Revision: https://developer.blender.org/D5858 -Index: blender-2.91.0/source/blender/datatoc/datatoc_icon.c +Index: b/source/blender/datatoc/datatoc_icon.c =================================================================== ---- blender-2.91.0.orig/source/blender/datatoc/datatoc_icon.c -+++ blender-2.91.0/source/blender/datatoc/datatoc_icon.c -@@ -308,7 +308,8 @@ static bool icon_merge(const char *file_ +--- a/source/blender/datatoc/datatoc_icon.c ++++ b/source/blender/datatoc/datatoc_icon.c +@@ -404,7 +404,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,8 +29,8 @@ const struct dirent *fname; char filepath[1024]; char *filename; -@@ -319,8 +320,8 @@ static bool icondir_to_png(const char *p - unsigned int canvas_w = 0, canvas_h = 0; +@@ -419,8 +420,8 @@ static bool icondir_to_png(const char *p + icon_merge_context_init(&context); errno = 0; - dir = opendir(path_src); @@ -40,7 +40,7 @@ printf( "%s: failed to dir '%s', (%s)\n", __func__, path_src, errno ? strerror(errno) : "unknown"); return false; -@@ -330,7 +331,8 @@ static bool icondir_to_png(const char *p +@@ -430,7 +431,8 @@ static bool icondir_to_png(const char *p path_str_len = path_ensure_slash(filepath); filename = &filepath[path_str_len]; @@ -50,22 +50,24 @@ if (path_test_extension(fname->d_name, ".dat")) { strcpy(filename, fname->d_name); -@@ -342,9 +344,10 @@ static bool icondir_to_png(const char *p +@@ -442,11 +444,12 @@ static bool icondir_to_png(const char *p fail++; } } + free(fname); } + icon_merge_context_free(&context); + - closedir(dir); + free(namelist); if (found == 0) { printf("%s: dir '%s' has no icons\n", __func__, path_src); -Index: blender-2.91.0/source/blender/datatoc/datatoc_icon.py +Index: b/source/blender/datatoc/datatoc_icon.py =================================================================== ---- blender-2.91.0.orig/source/blender/datatoc/datatoc_icon.py -+++ blender-2.91.0/source/blender/datatoc/datatoc_icon.py +--- a/source/blender/datatoc/datatoc_icon.py ++++ b/source/blender/datatoc/datatoc_icon.py @@ -113,7 +113,7 @@ def icondir_to_png(path_src, file_dst): import os import array
