Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2019-11-28 10:13:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Thu Nov 28 10:13:36 2019 rev:124 rq:751182 version:2.81 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-11-21 12:59:39.918509428 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new.26869/blender.changes 2019-11-28 10:14:23.375637330 +0100 @@ -1,0 +2,19 @@ +Mon Nov 25 21:25:58 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- Disable OIDN for all builds, until accepted in Factory + +------------------------------------------------------------------- +Thu Nov 21 19:09:12 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- Update to version 2.81: + *way* too many changes to list here, for an overview, check: + https://wiki.blender.org/wiki/Reference/Release_Notes/2.81 +- Add OpenImageDenoise support +- Sync build options with blender_release.cmake +- Remove SSE compile options, they are enabled for x86_64 by default +- Rebase both patches: + * 0006-add_ppc64el-s390x_support.patch + * make_python_3.6_compatible.patch +- delete make_python_3.6_compatible.diff by renaming. + +------------------------------------------------------------------- Old: ---- blender-2.80.tar.gz blender-2.80.tar.gz.md5sum make_python_3.6_compatible.diff New: ---- blender-2.81.tar.xz blender-2.81.tar.xz.md5sum make_python_3.6_compatible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.616O6K/_old 2019-11-28 10:14:25.051637347 +0100 +++ /var/tmp/diff_new_pack.616O6K/_new 2019-11-28 10:14:25.055637347 +0100 @@ -1,8 +1,8 @@ # # spec file for package blender # -# Copyright (c) 2019 SUSE LLC. -# Copyright (c) 2019 LISA GMbH, Bingen, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,10 @@ %bcond_without collada %ifarch x86_64 %bcond_without embree +%bcond_with oidn %else %bcond_with embree +%bcond_with oidn %endif %bcond_without opensubdiv %bcond_without openvdb @@ -43,15 +45,15 @@ %define _version %(echo %{version} | cut -b 1-4) Name: blender -Version: 2.80 +Version: 2.81 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/ # http://download.blender.org/source/ -Source0: https://download.blender.org/source/%{name}-%{version}.tar.gz -Source1: https://download.blender.org/source/%{name}-%{version}.tar.gz.md5sum +Source0: https://download.blender.org/source/%{name}-%{version}.tar.xz +Source1: https://download.blender.org/source/%{name}-%{version}.tar.xz.md5sum Source2: geeko.blend Source3: geeko.README Source4: blender-sample @@ -59,7 +61,7 @@ Patch0: 0006-add_ppc64el-s390x_support.patch # only rely on patch availibility, if python_36 is requested %if %{with python_36} -Patch1: make_python_3.6_compatible.diff +Patch1: make_python_3.6_compatible.patch %endif #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel @@ -94,7 +96,6 @@ BuildRequires: libpng-devel BuildRequires: libspnav-devel BuildRequires: libtiff-devel -BuildRequires: libtool BuildRequires: llvm-devel BuildRequires: lzo-devel BuildRequires: memory-constraints @@ -151,6 +152,9 @@ %if %{with embree} BuildRequires: embree-devel-static %endif +%if %{with oidn} +BuildRequires: OpenImageDenoise-devel +%endif %if %{with opensubdiv} BuildRequires: OpenSubdiv-devel %endif @@ -228,10 +232,6 @@ %build %limit_build -m 1000 echo "optflags: " %{optflags} -# sse options only on supported archs -%ifarch %{ix86} x86_64 -sseflags='-msse -msse2' -%endif # Find python3 version and abiflags export psver=$(pkg-config python3 --modversion) export pver=$(pkg-config python3 --modversion)$(python3-config --abiflags) @@ -251,8 +251,8 @@ -DWITH_MEM_VALGRIND:BOOL=ON \ -DWITH_ASSERT_ABORT:BOOL=ON \ %else - -DCMAKE_C_FLAGS:STRING="$CFLAGS %{optflags} -fPIC ${sseflags} -fopenmp " \ - -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC ${sseflags} -fopenmp " \ + -DCMAKE_C_FLAGS:STRING="$CFLAGS %{optflags} -fPIC -fopenmp " \ + -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC -fopenmp " \ %endif -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ @@ -324,6 +324,9 @@ -DWITH_OPENCOLLADA:BOOL=OFF \ %endif -DWITH_OPENCOLORIO:BOOL=ON \ +%if %{with oidn} + -DWITH_OPENIMAGEDENOISE:BOOL=ON \ +%endif -DWITH_OPENIMAGEIO:BOOL=ON \ -DWITH_OPENMP:BOOL=ON \ %if %{with opensubdiv} @@ -341,17 +344,20 @@ -DPYTHON_LIBRARY=python$pver \ -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 \ -DWITH_X11_XINPUT:BOOL=ON \ -DWITH_X11_XF86VMODE:BOOL=ON \ -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 %install ++++++ 0006-add_ppc64el-s390x_support.patch ++++++ --- /var/tmp/diff_new_pack.616O6K/_old 2019-11-28 10:14:25.079637347 +0100 +++ /var/tmp/diff_new_pack.616O6K/_new 2019-11-28 10:14:25.079637347 +0100 @@ -6,13 +6,13 @@ intern/numaapi/source/build_config.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h -index 444adcc..488238c 100644 +Index: b/intern/numaapi/source/build_config.h +=================================================================== --- a/intern/numaapi/source/build_config.h +++ b/intern/numaapi/source/build_config.h -@@ -307,6 +307,26 @@ - # define ARCH_CPU_32_BITS 1 - # define ARCH_CPU_BIG_ENDIAN 1 +@@ -318,6 +318,16 @@ + # else + # error Please define your endianness # endif +#elif (defined(__PPC64__) || defined(__PPC__)) && defined(__BIG_ENDIAN__) +# define ARCH_CPU_PPC64_FAMILY 1 @@ -24,22 +24,12 @@ +# define ARCH_CPU_PPC64 1 +# define ARCH_CPU_64_BITS 1 +# define ARCH_CPU_LITTLE_ENDIAN 1 -+#elif defined(__s390x__) -+# define ARCH_CPU_S390_FAMILY 1 -+# define ARCH_CPU_S390X 1 -+# define ARCH_CPU_64_BITS 1 -+# define ARCH_CPU_BIG_ENDIAN 1 -+#elif defined(__s390__) -+# define ARCH_CPU_S390_FAMILY 1 -+# define ARCH_CPU_S390 1 -+# define ARCH_CPU_31_BITS 1 -+# define ARCH_CPU_BIG_ENDIAN 1 - #else - # error Please add support for your architecture in build_config.h - #endif -@@ -337,6 +357,12 @@ - #if !defined(ARCH_CPU_MIPS64_FAMILY) - # define ARCH_CPU_MIPS64_FAMILY 0 + #elif defined(__s390x__) + # define ARCH_CPU_S390_FAMILY 1 + # define ARCH_CPU_S390X 1 +@@ -338,6 +348,12 @@ + #if !defined(ARCH_CPU_BIG_ENDIAN) + # define ARCH_CPU_BIG_ENDIAN 0 #endif +#if !defined(ARCH_CPU_PPC64_FAMILY) +# define ARCH_CPU_PPC64_FAMILY 0 @@ -48,5 +38,5 @@ +# define ARCH_CPU_S390_FAMILY 0 +#endif - //////////////////////////////////////////////////////////////////////////////// - // Sizes of platform-dependent types. + #if !defined(ARCH_CPU_32_BITS) + # define ARCH_CPU_32_BITS 0 ++++++ blender-2.81.tar.xz.md5sum ++++++ bbb3c2ad7253ef3c6a6047b2f64074f3 blender-2.81.tar.xz ++++++ make_python_3.6_compatible.patch ++++++ Index: b/CMakeLists.txt =================================================================== --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -789,8 +789,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. - if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.7") - message(FATAL_ERROR "At least Python 3.7 is required to build") + if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.6") + message(FATAL_ERROR "At least Python 3.6 is required to build") endif() file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons") Index: b/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 } /* Call classed register method. */ - 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); if (ret) { Py_DECREF(ret); } @@ -8696,8 +8698,8 @@ static PyObject *pyrna_register_class(Py } break; } - case -1: { - return NULL; + case 0: { + break; } } @@ -8791,9 +8793,11 @@ static PyObject *pyrna_unregister_class( } /* Call classed unregister method. */ - 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( } break; } - case -1: { - return NULL; + case 0: { + break; } } Index: b/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 @@ -21,8 +21,8 @@ #ifndef __BPY_CAPI_UTILS_H__ #define __BPY_CAPI_UTILS_H__ -#if PY_VERSION_HEX < 0x03070000 -# error "Python 3.7 or greater is required, you'll need to update your Python." +#if PY_VERSION_HEX < 0x03060000 +# error "Python 3.6 or greater is required, you'll need to update your Python." #endif struct EnumPropertyItem;
