Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-02-19 18:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Wed Feb 19 18:43:17 2020 rev:21 rq:775224 version:2.82 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes 2020-02-16 18:30:40.694792063 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender.changes 2020-02-19 18:43:30.138449743 +0100 @@ -1,0 +2,17 @@ +Tue Feb 18 02:47:36 UTC 2020 - Marcus Rueckert <mrueck...@suse.de> + +- Update to version 2.82: + https://wiki.blender.org/wiki/Reference/Release_Notes/2.82 +- dropped patches: + 0001-Fix-T71680-_PyObject_LookupAttr-memory-leak.patch + 0006-add_ppc64el-s390x_support.patch +- refreshed patches: + - make_python_3.6_compatible.patch + dropped the memory leak fix from the patch +- track series file in spec file to make quilt easier +- enable _smp_mflags. seems to work with 2.82 +- drop unused options from the spec file: + WITH_RAYOPTIMIZATION + WITH_MOD_SMOKE + +------------------------------------------------------------------- Old: ---- 0001-Fix-T71680-_PyObject_LookupAttr-memory-leak.patch 0006-add_ppc64el-s390x_support.patch blender-2.81a.tar.xz blender-2.81a.tar.xz.md5sum New: ---- blender-2.82.tar.xz blender-2.82.tar.xz.md5sum series ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.ZvrDRt/_old 2020-02-19 18:43:31.250452074 +0100 +++ /var/tmp/diff_new_pack.ZvrDRt/_new 2020-02-19 18:43:31.250452074 +0100 @@ -46,7 +46,7 @@ %define _suffix %(echo %{_version} | tr -d '.') Name: blender -Version: 2.81a +Version: 2.82 Release: 0 Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later @@ -59,13 +59,9 @@ Source3: geeko.README Source4: blender-sample Source8: %{name}.appdata.xml -Patch0: 0006-add_ppc64el-s390x_support.patch +Source99: series # only rely on patch availibility, if python_36 is requested -# this patch also fixes a memory leak -Patch1: make_python_3.6_compatible.patch -# PATCH-FIX-UPSTREAM 0001-Fix-T71680-_PyObject_LookupAttr-memory-leak.patch h...@urpla.net -# if the former patch isn't applied, fix underlying memory leak -Patch2: 0001-Fix-T71680-_PyObject_LookupAttr-memory-leak.patch +Patch0: make_python_3.6_compatible.patch #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -226,11 +222,8 @@ popd %setup -q -%patch0 -p1 %if %{with python_36} -%patch1 -p1 -%else -%patch2 -p1 +%patch0 -p1 %endif rm -rf extern/glew @@ -315,7 +308,6 @@ -DWITH_SYSTEM_LZO:BOOL=ON \ -DWITH_MOD_FLUID:BOOL=ON \ -DWITH_MOD_REMESH:BOOL=ON \ - -DWITH_MOD_SMOKE:BOOL=ON \ %ifnarch x86_64 -DWITH_MOD_OCEANSIM:BOOL=OFF \ %else @@ -353,11 +345,6 @@ -DPYTHON_INCLUDE_DIRS=%{_includedir}/python$pver \ -DWITH_PYTHON_INSTALL_NUMPY=OFF \ -DWITH_QUADRIFLOW:BOOL=ON \ -%ifnarch x86_64 - -DWITH_RAYOPTIMIZATION:BOOL=OFF \ -%else - -DWITH_RAYOPTIMIZATION:BOOL=ON \ -%endif -DWITH_SDL:BOOL=ON \ -DWITH_TBB:BOOL=ON \ -DWITH_SYSTEM_GLEW:BOOL=ON \ @@ -366,7 +353,7 @@ -DWITH_DOC_MANPAGE:BOOL=ON \ -DCYCLES_CUDA_BINARIES_ARCH="sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75" -make $_smp_mflags +make %{_smp_mflags} %install echo "release version = %{_version}" ++++++ blender-2.81a.tar.xz -> blender-2.82.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/blender/blender-2.81a.tar.xz /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender-2.82.tar.xz differ: char 26, line 1 ++++++ blender-2.81a.tar.xz.md5sum -> blender-2.82.tar.xz.md5sum ++++++ --- /work/SRC/openSUSE:Leap:15.2/blender/blender-2.81a.tar.xz.md5sum 2020-02-16 18:30:40.670792050 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender-2.82.tar.xz.md5sum 2020-02-19 18:43:30.106449677 +0100 @@ -1 +1 @@ -fd106a2c3debfd215617d31197883173 blender-2.81a.tar.xz +322f044e5be09e136d85e31493d9e704 blender-2.82.tar.xz ++++++ make_python_3.6_compatible.patch ++++++ --- /var/tmp/diff_new_pack.ZvrDRt/_old 2020-02-19 18:43:31.354452292 +0100 +++ /var/tmp/diff_new_pack.ZvrDRt/_new 2020-02-19 18:43:31.354452292 +0100 @@ -1,8 +1,8 @@ -Index: b/CMakeLists.txt +Index: blender-2.82/CMakeLists.txt =================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -789,8 +789,8 @@ if(WITH_PYTHON) +--- blender-2.82.orig/CMakeLists.txt ++++ blender-2.82/CMakeLists.txt +@@ -730,8 +730,8 @@ if(WITH_PYTHON) # Do this before main 'platform_*' checks, # because UNIX will search for the old Python paths which may not exist. # giving errors about missing paths before this case is met. @@ -13,24 +13,22 @@ endif() file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons") -Index: b/source/blender/python/intern/bpy_rna.c +Index: blender-2.82/source/blender/python/intern/bpy_rna.c =================================================================== ---- a/source/blender/python/intern/bpy_rna.c -+++ b/source/blender/python/intern/bpy_rna.c -@@ -8685,9 +8685,11 @@ static PyObject *pyrna_register_class(Py - } +--- blender-2.82.orig/source/blender/python/intern/bpy_rna.c ++++ blender-2.82/source/blender/python/intern/bpy_rna.c +@@ -8683,8 +8683,9 @@ static PyObject *pyrna_register_class(Py - /* Call classed register method. */ + /* Call classed register method. + * Note that zero falls through, no attribute, no error. */ - switch (_PyObject_LookupAttr(py_class, bpy_intern_str_register, &py_cls_meth)) { + switch (PyObject_HasAttr(py_class, bpy_intern_str_register)) { case 1: { + py_cls_meth = PyObject_GetAttr(py_class, bpy_intern_str_register); PyObject *ret = PyObject_CallObject(py_cls_meth, NULL); -+ Py_DECREF(py_cls_meth); + Py_DECREF(py_cls_meth); if (ret) { - Py_DECREF(ret); - } -@@ -8696,8 +8698,8 @@ static PyObject *pyrna_register_class(Py +@@ -8695,8 +8696,8 @@ static PyObject *pyrna_register_class(Py } break; } @@ -41,20 +39,17 @@ } } -@@ -8791,9 +8793,11 @@ static PyObject *pyrna_unregister_class( - } +@@ -8791,7 +8792,8 @@ static PyObject *pyrna_unregister_class( - /* Call classed unregister method. */ + /* Call classed unregister method. + * Note that zero falls through, no attribute, no error. */ - switch (_PyObject_LookupAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) { + switch (PyObject_HasAttr(py_class, bpy_intern_str_unregister)) { + py_cls_meth = PyObject_GetAttr(py_class, bpy_intern_str_unregister); case 1: { PyObject *ret = PyObject_CallObject(py_cls_meth, NULL); -+ Py_DECREF(py_cls_meth); - if (ret) { - Py_DECREF(ret); - } -@@ -8802,8 +8806,8 @@ static PyObject *pyrna_unregister_class( + Py_DECREF(py_cls_meth); +@@ -8803,8 +8805,8 @@ static PyObject *pyrna_unregister_class( } break; } @@ -65,10 +60,10 @@ } } -Index: b/source/blender/python/intern/bpy_capi_utils.h +Index: blender-2.82/source/blender/python/intern/bpy_capi_utils.h =================================================================== ---- a/source/blender/python/intern/bpy_capi_utils.h -+++ b/source/blender/python/intern/bpy_capi_utils.h +--- blender-2.82.orig/source/blender/python/intern/bpy_capi_utils.h ++++ blender-2.82/source/blender/python/intern/bpy_capi_utils.h @@ -21,8 +21,8 @@ #ifndef __BPY_CAPI_UTILS_H__ #define __BPY_CAPI_UTILS_H__ ++++++ series ++++++ 0006-add_ppc64el-s390x_support.patch make_python_3.6_compatible.patch