Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2019-11-21 12:59:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Thu Nov 21 12:59:39 2019 rev:123 rq:750044 version:2.80 Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-11-10 22:53:35.718534680 +0100 +++ /work/SRC/openSUSE:Factory/.blender.new.26869/blender.changes 2019-11-21 12:59:39.918509428 +0100 @@ -1,0 +2,23 @@ +Wed Nov 20 09:46:30 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- use build conditionals for python_36 selection +- remove superflous WITH_SYSTEM_OPENJPEG build flag + +------------------------------------------------------------------- +Tue Nov 19 20:11:02 UTC 2019 - Stefan Brüns <[email protected]> + +- Replace two uses of _PyObject_LookupAttr (Python 3.7 C API) with + equivalent calls from Python 3.6, Python 3.6 is sufficient now. + * Add make_python_3.6_compatible.diff +- Replace cmake(TBB) BuildRequires with equivalent tbb-devel, the + latter is also available on Leap 15.x. +- Correct URL and Source, http causes a permanent redirect. + +------------------------------------------------------------------- +Fri Nov 8 19:43:33 UTC 2019 - Stefan Brüns <[email protected]> + +- Use upstream default for JACK_DYNLOAD (i.e. off), this is a + feature for portable builds (see https://developer.blender.org/D878), + Jack is already pulled in via libav*. + +------------------------------------------------------------------- @@ -9,0 +33,10 @@ + +------------------------------------------------------------------- +Thu Nov 7 09:12:30 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- raise memory constraints (phys: 2 -> 4 GB, total: 4 -> 8 GB) + +------------------------------------------------------------------- +Mon Nov 4 11:34:14 UTC 2019 - Hans-Peter Jansen <[email protected]> + +- distinguishable menu entry New: ---- make_python_3.6_compatible.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.Fv0nrT/_old 2019-11-21 12:59:40.782509161 +0100 +++ /var/tmp/diff_new_pack.Fv0nrT/_new 2019-11-21 12:59:40.786509161 +0100 @@ -1,7 +1,7 @@ # # spec file for package blender # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # Copyright (c) 2019 LISA GMbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -29,6 +29,10 @@ %bcond_without osl %bcond_without system_audaspace +%if 0%{suse_version} < 1550 +%bcond_without python_36 +%endif + # Set this to 1 for fixing bugs. %define debugbuild 0 # Find the version of python3 that blender is going to build against. @@ -44,15 +48,19 @@ Summary: A 3D Modelling And Rendering Package License: GPL-2.0-or-later Group: Productivity/Graphics/3D Editors -Url: http://www.blender.org/ +URL: https://www.blender.org/ # http://download.blender.org/source/ -Source0: http://download.blender.org/source/%{name}-%{version}.tar.gz -Source1: http://download.blender.org/source/%{name}-%{version}.tar.gz.md5sum +Source0: https://download.blender.org/source/%{name}-%{version}.tar.gz +Source1: https://download.blender.org/source/%{name}-%{version}.tar.gz.md5sum Source2: geeko.blend Source3: geeko.README Source4: blender-sample Source8: %{name}.appdata.xml 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 +%endif #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -115,7 +123,11 @@ 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) @@ -144,7 +156,7 @@ %endif %if %{with openvdb} BuildRequires: openvdb-devel -BuildRequires: cmake(TBB) +BuildRequires: tbb-devel BuildRequires: pkgconfig(blosc) %endif %if %{with osl} @@ -204,7 +216,10 @@ popd %setup -q -%autopatch -p1 +%patch0 -p1 +%if %{with python_36} +%patch1 -p1 +%endif rm -rf extern/glew rm -rf extern/libopenjpeg @@ -212,8 +227,7 @@ %build %limit_build -m 1000 - -echo %{optflags} +echo "optflags: " %{optflags} # sse options only on supported archs %ifarch %{ix86} x86_64 sseflags='-msse -msse2' @@ -237,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 ${sseflags} -fopenmp " \ + -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC ${sseflags} -fopenmp " \ %endif -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ @@ -284,12 +298,10 @@ -DWITH_IMAGE_HDR:BOOL=ON \ -DWITH_IMAGE_OPENEXR:BOOL=ON \ -DWITH_IMAGE_OPENJPEG:BOOL=ON \ - -DOPENJPEG_LIBRARY:FILE=%{_libdir}/libopenjp2.so \ -DWITH_IMAGE_TIFF:BOOL=ON \ -DWITH_INPUT_NDOF:BOOL=ON \ -DWITH_INTERNATIONAL:BOOL=ON \ -DWITH_JACK:BOOL=ON \ - -DWITH_JACK_DYNLOAD:BOOL=ON \ -DWITH_LZMA:BOOL=ON \ -DWITH_LZO:BOOL=ON \ -DWITH_SYSTEM_LZO:BOOL=ON \ @@ -378,6 +390,9 @@ find %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/ -name "*.h" -print -delete %endif +# distinguishable menu entry +sed -i 's/^Name=Blender$/Name=Blender %{_version}/g' %{buildroot}%{_datadir}/applications/%{name}.desktop + # don't package thumbnailer rm %{buildroot}%{_bindir}/%{name}-thumbnailer.py ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.Fv0nrT/_old 2019-11-21 12:59:40.822509150 +0100 +++ /var/tmp/diff_new_pack.Fv0nrT/_new 2019-11-21 12:59:40.822509150 +0100 @@ -4,10 +4,10 @@ <size unit="G">20</size> </disk> <physicalmemory> - <size unit="G">2</size> + <size unit="G">4</size> </physicalmemory> <memory> - <size unit="G">4</size> + <size unit="G">8</size> </memory> </hardware> ++++++ make_python_3.6_compatible.diff ++++++ Index: b/CMakeLists.txt =================================================================== --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -772,8 +772,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() if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules") 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 @@ -8651,9 +8651,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); } @@ -8662,8 +8664,8 @@ static PyObject *pyrna_register_class(Py } break; } - case -1: { - return NULL; + case 0: { + break; } } @@ -8757,9 +8759,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); } @@ -8768,8 +8772,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;
