commit blender for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-05-18 11:00:44 Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.2738 (New) Package is "blender" Mon May 18 11:00:44 2020 rev:26 rq:806152 version:2.82a Changes: --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes2020-04-28 20:11:34.308585904 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.2738/blender.changes 2020-05-18 11:00:46.154807197 +0200 @@ -1,0 +2,15 @@ +Thu May 14 16:54:12 UTC 2020 - Stefan Brüns + +- Readjust _constraints, x86_64 had the lowest constraint, but the + most enabled features. The constraint was raised twice due to + merging changes. 4G for anything but x86_64 is sufficient. + +--- +Tue May 12 14:11:17 UTC 2020 - Stefan Brüns + +- Replace blender-bad-override.patch with upstream change, + blender-add-OSL-1_11-compat.patch. The previous patch was just + wrong, removing an override specifier just silences the compiler, + ignoring the error it is meant to catch. + +--- Old: blender-bad-override.patch New: blender-add-OSL-1_11-compat.patch Other differences: -- ++ blender.spec ++ --- /var/tmp/diff_new_pack.p8N9ob/_old 2020-05-18 11:00:46.762808456 +0200 +++ /var/tmp/diff_new_pack.p8N9ob/_new 2020-05-18 11:00:46.766808464 +0200 @@ -1,7 +1,7 @@ # # spec file for package blender # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -31,7 +31,7 @@ %bcond_without osl %bcond_without system_audaspace -%if 0%{suse_version} < 1550 +%if 0%{?suse_version} < 1550 %bcond_without python_36 %endif @@ -67,7 +67,8 @@ Patch0: make_python_3.6_compatible.patch # PATCH-FIX-OPENSUSE https://developer.blender.org/D5858 Patch1: reproducible.patch -Patch2: blender-bad-override.patch +# PATCH-FIX-UPSTREAM https://developer.blender.org/T76044 +Patch2: blender-add-OSL-1_11-compat.patch #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel ++ _constraints ++ --- /var/tmp/diff_new_pack.p8N9ob/_old 2020-05-18 11:00:46.842808621 +0200 +++ /var/tmp/diff_new_pack.p8N9ob/_new 2020-05-18 11:00:46.842808621 +0200 @@ -4,13 +4,13 @@ 20 - 4 + 2 - 8 + 4 - + ++ blender-add-OSL-1_11-compat.patch ++ >From 7d85b6431fc331d9869f945bf7c9f3353b7b8c95 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 28 Apr 2020 13:46:36 +0200 Subject: [PATCH] Fix T76044: update Cycles to build with OSL 1.11 master --- intern/cycles/kernel/osl/osl_services.cpp | 18 ++ intern/cycles/kernel/osl/osl_services.h | 17 + 2 files changed, 35 insertions(+) diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 2857de533f3..5292b5f8055 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -1011,7 +1011,13 @@ bool OSLRenderServices::get_userdata( return false; /* disabled by lockgeom */ } +#if OSL_LIBRARY_VERSION_CODE >= 11100 +TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(ustring filename, + OSL::ShadingContext *) +#else + TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(ustring filename) +#endif { OSLTextureHandleMap::iterator it = textures.find(filename); @@ -1365,6 +1371,17 @@ bool OSLRenderServices::environment(ustring filename, return status; } +#if OSL_LIBRARY_VERSION_CODE >= 11100 +bool OSLRenderServices::get_texture_info(ustring filename, + TextureHandle *texture_handle, + TexturePerthread *, + OSL::ShadingContext *, + int subimage, + ustring dataname, + TypeDesc datatype, + void *data, + ustring *) +#else bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg, ustring filename, TextureHandle *texture_handle, @@ -1372,6 +1389,7 @@ bool
commit blender for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-04-28 20:11:33 Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.2738 (New) Package is "blender" Tue Apr 28 20:11:33 2020 rev:25 rq:798240 version:2.82a Changes: --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes2020-04-14 14:22:06.805325196 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.2738/blender.changes 2020-04-28 20:11:34.308585904 +0200 @@ -1,0 +2,6 @@ +Fri Apr 24 07:13:07 UTC 2020 - Dave Plater + +- Add blender-bad-override.patch to fix build with + OpenShadingLanguage >= 2.0.0 + +--- Old: _service _servicedata New: blender-bad-override.patch Other differences: -- ++ blender.spec ++ --- /var/tmp/diff_new_pack.Nn2qqJ/_old 2020-04-28 20:11:34.880587092 +0200 +++ /var/tmp/diff_new_pack.Nn2qqJ/_new 2020-04-28 20:11:34.884587100 +0200 @@ -1,7 +1,7 @@ # # spec file for package blender # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -37,8 +37,10 @@ # Set this to 1 for fixing bugs. %define debugbuild 0 + # Find the version of python3 that blender is going to build against. %define py3version %(pkg-config python3 --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 # necessary. @@ -52,9 +54,9 @@ License:GPL-2.0-or-later Group: Productivity/Graphics/3D Editors URL:https://www.blender.org/ -# http://git.blender.org/ -Source0:%{name}-%{version}.tar.xz -Source1:%{name}-%{version}.tar.xz.md5sum +# Please leave the source url intact +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 @@ -65,6 +67,7 @@ Patch0: make_python_3.6_compatible.patch # PATCH-FIX-OPENSUSE https://developer.blender.org/D5858 Patch1: reproducible.patch +Patch2: blender-bad-override.patch #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -72,6 +75,7 @@ BuildRequires: OpenImageIO-devel BuildRequires: SDL2-devel BuildRequires: binutils-gold +BuildRequires: clang-devel BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: distribution-release @@ -231,6 +235,7 @@ %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 rm -rf extern/glew rm -rf extern/libopenjpeg @@ -259,7 +264,7 @@ -DWITH_ASSERT_ABORT:BOOL=ON \ %else -DCMAKE_C_FLAGS:STRING="$CFLAGS %{optflags} -fPIC -fopenmp " \ - -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC -fopenmp " \ + -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS %{optflags} -fPIC -fopenmp" \ %endif -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ ++ blender-bad-override.patch ++ From: Dave Plater Date: Fri 24 Apr 09:27:47 SAST 2020 Subject: override error Upstream: submitted Two functions in intern/cycles/kernel/osl/osl_services.h are marked override but produce a build error: - is marked as an override but no suitable method found to override Index: b/intern/cycles/kernel/osl/osl_services.h === --- a/intern/cycles/kernel/osl/osl_services.h 2020-03-09 17:53:47.0 +0200 +++ b/intern/cycles/kernel/osl/osl_services.h 2020-04-23 15:17:18.300372819 +0200 @@ -173,7 +173,7 @@ class OSLRenderServices : public OSL::Re void *val, bool derivatives) override; - TextureSystem::TextureHandle *get_texture_handle(ustring filename) override; + TextureSystem::TextureHandle *get_texture_handle(ustring filename) ; bool good(TextureSystem::TextureHandle *texture_handle) override; @@ -230,7 +230,7 @@ class OSLRenderServices : public OSL::Re int subimage, ustring dataname, TypeDesc datatype, -void *data) override; +void *data) ; static bool get_background_attribute( KernelGlobals *kg, ShaderData *sd, ustring name, TypeDesc type, bool derivatives, void *val);
commit blender for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-04-14 14:21:54 Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.3248 (New) Package is "blender" Tue Apr 14 14:21:54 2020 rev:24 rq:793605 version:2.82a Changes: --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes2020-03-15 07:14:44.169077867 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.3248/blender.changes 2020-04-14 14:22:06.805325196 +0200 @@ -1,0 +2,6 @@ +Fri Apr 3 00:57:42 UTC 2020 - Bernhard Wiedemann + +- Add reproducible.patch to sort file lists + to make package build reproducible (boo#1041090) + +--- New: reproducible.patch Other differences: -- ++ blender.spec ++ --- /var/tmp/diff_new_pack.IuDf6J/_old 2020-04-14 14:22:07.693325859 +0200 +++ /var/tmp/diff_new_pack.IuDf6J/_new 2020-04-14 14:22:07.697325862 +0200 @@ -63,6 +63,8 @@ Source99: series # only rely on patch availibility, if python_36 is requested Patch0: make_python_3.6_compatible.patch +# PATCH-FIX-OPENSUSE https://developer.blender.org/D5858 +Patch1: reproducible.patch #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -228,6 +230,7 @@ %if %{with python_36} %patch0 -p1 %endif +%patch1 -p1 rm -rf extern/glew rm -rf extern/libopenjpeg ++ reproducible.patch ++ commit 2115054bb8a41bb7ddffce32e396d9ffced300b1 Author: Bernhard M. Wiedemann Date: Sat Sep 7 06:19:50 2019 +0200 Sort list of .dat files Sort list of .dat files in .png generation to make builds reproducible. See https://reproducible-builds.org/ for why this matters. Note: scandir is only available on POSIX-compliant platforms (Linux, BSD, MacOSX, cygwin) - so others would need some compat layer. Reviewers: mont29 Differential Revision: https://developer.blender.org/D5858 diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index 82c5470943f..98a2aabc01c 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -308,7 +308,8 @@ static bool icon_merge(const char *file_src, static bool icondir_to_png(const char *path_src, const char *file_dst) { /* Takes a path full of 'dat' files and writes out */ - DIR *dir; + struct dirent **namelist; + int dirn; const struct dirent *fname; char filepath[1024]; char *filename; @@ -319,8 +320,8 @@ static bool icondir_to_png(const char *path_src, const char *file_dst) unsigned int canvas_w = 0, canvas_h = 0; errno = 0; - dir = opendir(path_src); - if (dir == NULL) { + dirn = scandir(path_src, , NULL, alphasort); + if (dirn == -1) { 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 *path_src, const char *file_dst) path_str_len = path_ensure_slash(filepath); filename = [path_str_len]; - while ((fname = readdir(dir)) != NULL) { + while (dirn--) { +fname = namelist[dirn]; if (path_test_extension(fname->d_name, ".dat")) { strcpy(filename, fname->d_name); @@ -342,9 +344,10 @@ static bool icondir_to_png(const char *path_src, const char *file_dst) fail++; } } +free(fname); } - closedir(dir); + free(namelist); if (found == 0) { printf("%s: dir '%s' has no icons\n", __func__, path_src); diff --git a/source/blender/datatoc/datatoc_icon.py b/source/blender/datatoc/datatoc_icon.py index 16092431195..83007fa7d4d 100755 --- a/source/blender/datatoc/datatoc_icon.py +++ b/source/blender/datatoc/datatoc_icon.py @@ -111,7 +111,7 @@ def icondir_to_png(path_src, file_dst): import os import array -files = [os.path.join(path_src, f) for f in os.listdir(path_src) if f.endswith(".dat")] +files = [os.path.join(path_src, f) for f in sorted(os.listdir(path_src)) if f.endswith(".dat")] # First check if we need to bother. if os.path.exists(file_dst):
commit blender for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-03-15 07:13:38 Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.3160 (New) Package is "blender" Sun Mar 15 07:13:38 2020 rev:23 rq:785017 version:2.82a Changes: --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes2020-03-06 12:43:24.722835063 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.3160/blender.changes 2020-03-15 07:14:44.169077867 +0100 @@ -1,0 +2,16 @@ +Fri Mar 13 16:54:31 UTC 2020 - Hans-Peter Jansen + +- Update to version 2.82a: + * Move 2.82a from beta to release + * Fix shader build error + * Fix T74425: Cannot texture paint an images sequence anymore + * Fix T73369: corner pin & sun-beam nodes gizmos are too big + * Fix T63892: Tools cannot be registered into some contexts (e.g. PAINT_TEXTURE) + * Fix T74225: Image (from sequence) cannot be loaded + * Fix Vertex weight gradient tool show wrong weight/strength values in the UI + * Fix bone envelopes displaying wrong when armature is scaled + * Fix T72028: Crash switching to vertex paint + * Keymap: Add front/back Alt-MMB absolute view axis switching +- Use git scm service to fetch the source + +--- Old: blender-2.82.tar.xz blender-2.82.tar.xz.md5sum New: _service _servicedata blender-2.82a.tar.xz blender-2.82a.tar.xz.md5sum Other differences: -- ++ blender.spec ++ --- /var/tmp/diff_new_pack.ovhzgm/_old 2020-03-15 07:14:45.165078390 +0100 +++ /var/tmp/diff_new_pack.ovhzgm/_new 2020-03-15 07:14:45.169078392 +0100 @@ -46,15 +46,15 @@ %define _suffix %(echo %{_version} | tr -d '.') Name: blender -Version:2.82 +Version:2.82a 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.xz -Source1: https://download.blender.org/source/%{name}-%{version}.tar.xz.md5sum +# http://git.blender.org/ +Source0:%{name}-%{version}.tar.xz +Source1:%{name}-%{version}.tar.xz.md5sum Source2:geeko.blend Source3:geeko.README Source4:blender-sample @@ -373,8 +373,8 @@ xargs -0r grep -l '#!' | xargs -d'\n' chmod -f 0755; # Copy text files to correct place. mkdir -p %{buildroot}%{_docdir}/%{name} -cp -rv %{buildroot}%{_datadir}/doc/blender/* %{buildroot}%{_docdir}/%{name}/ -rm -rf %{buildroot}%{_datadir}/doc/blender +mv -v %{buildroot}%{_datadir}/doc/blender/* %{buildroot}%{_docdir}/%{name}/ +rmdir %{buildroot}%{_datadir}/doc/blender # install blender sample. install -D -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ install -D -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ ++ _service ++ git https://git.blender.org/blender.git 2.82a v2.82a enable h...@urpla.net enable xz *.tar ++ _servicedata ++ https://git.blender.org/blender.git 375c7dc4caf449d40f11d3fd40fa1372636e76d3++ blender-2.82.tar.xz -> blender-2.82a.tar.xz ++ /work/SRC/openSUSE:Leap:15.2/blender/blender-2.82.tar.xz /work/SRC/openSUSE:Leap:15.2/.blender.new.3160/blender-2.82a.tar.xz differ: char 26, line 1 ++ blender-2.82.tar.xz.md5sum -> blender-2.82a.tar.xz.md5sum ++ --- /work/SRC/openSUSE:Leap:15.2/blender/blender-2.82.tar.xz.md5sum 2020-02-19 18:43:30.106449677 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.3160/blender-2.82a.tar.xz.md5sum 2020-03-15 07:14:44.149077857 +0100 @@ -1 +1 @@ -322f044e5be09e136d85e31493d9e704 blender-2.82.tar.xz +3e9d669185b83d5d2cb1b38dcf64d5ec blender-2.82a.tar.xz
commit blender for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-03-06 12:40:11 Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.26092 (New) Package is "blender" Fri Mar 6 12:40:11 2020 rev:22 rq:781470 version:2.82 Changes: --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes2020-02-19 18:43:30.138449743 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender.changes 2020-03-06 12:43:24.722835063 +0100 @@ -1,0 +2,16 @@ +Sat Feb 29 15:50:02 UTC 2020 - Hans-Peter Jansen + +- remove lang recommends +- provide/obsolete blender-282-devel + +--- +Sun Feb 23 16:08:53 UTC 2020 - Hans-Peter Jansen + +- Add SUSE-NVIDIA-GPU-rendering.txt + +--- +Wed Feb 19 22:39:08 UTC 2020 - Hans-Peter Jansen + +- improve cuda configuration + +--- New: SUSE-NVIDIA-GPU-rendering.txt Other differences: -- ++ blender.spec ++ --- /var/tmp/diff_new_pack.52e1Fg/_old 2020-03-06 12:43:26.962836425 +0100 +++ /var/tmp/diff_new_pack.52e1Fg/_new 2020-03-06 12:43:26.986836440 +0100 @@ -59,12 +59,14 @@ Source3:geeko.README Source4:blender-sample Source8:%{name}.appdata.xml +Source9:SUSE-NVIDIA-GPU-rendering.txt Source99: series # only rely on patch availibility, if python_36 is requested Patch0: make_python_3.6_compatible.patch #!BuildIgnore: libGLwM1 BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel +BuildRequires: OpenImageIO BuildRequires: OpenImageIO-devel BuildRequires: SDL2-devel BuildRequires: binutils-gold @@ -180,7 +182,6 @@ Requires(postun): hicolor-icon-theme Provides: %{name}-%{_suffix} = %{version} Obsoletes: %{name}-%{_suffix} < %{version} -Recommends: %{name}-lang %description Blender is a 3D modelling and rendering package. It is the in-house @@ -206,7 +207,9 @@ #This package is for blender with cycles OSL License:Apache-2.0 Group: Development/Sources -Obsoletes: blender-devel <= %{version} +Obsoletes: %{name}-devel <= %{version} +Provides: %{name}-%{_suffix} = %{version} +Obsoletes: %{name}-%{_suffix} < %{version} BuildArch: noarch %description cycles-devel @@ -351,6 +354,8 @@ -DWITH_X11_XINPUT:BOOL=ON \ -DWITH_X11_XF86VMODE:BOOL=ON \ -DWITH_DOC_MANPAGE:BOOL=ON \ + -DCYCLES_CUDA_BINARIES:BOOL=ON \ + -DCYCLES_CUBIN_COMPILER:BOOL=OFF \ -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} @@ -374,10 +379,11 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/ install -D -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/ install -D -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/ - # install appdata file mkdir -p %{buildroot}%{_datadir}/appdata/ install -D -m 0644 %{SOURCE8} %{buildroot}%{_datadir}/appdata/ +# GPU rendering text +install -D -m 0644 %{SOURCE9} %{buildroot}%{_docdir}/%{name}/ chmod -f 0644 %{buildroot}%{_datadir}/%{name}/%{_version}/scripts/modules/console_python.py ++ SUSE-NVIDIA-GPU-rendering.txt ++ NVIDIA GPU rendering on openSUSE Prerequisites A CUDA-enabled GPU If you are designated for this task, determine your exact GPU model with: $ sudo hwinfo --gfxcard Look up the model of your card (the part in square brackets of the Model: line at https://developer.nvidia.com/cuda-gpus. If the "Compute Capability" level for your GPU is 3.0 at least, your set. Install the x11-video-nvidiaG0x driver. Please follow https://en.opensuse.org/SDB:NVIDIA_drivers and come back, when you're ready. Next, you need to install the cuda libraries from NVIDIA. This is documented here: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/ Short version (at the time of this writing): $ sudo zypper addrepo http://developer.download.nvidia.com/compute/cuda/repos/opensuse15/x86_64/cuda-opensuse15.repo $ sudo zypper refresh $ sudo zypper install cuda-toolkit-10-2 Be careful, other cuda packages may want to deinstall the NVIDIA driver, which would be better avoided at this point. Please add any user, that want to use NVIDIA GPU rendering, to the video group: $ sudo usermod -a -G video Now set up CUDA environment, e.g. in ~/.bashrc or in /etc/profile.local: export PATH=/usr/local/cuda-10.2/bin:/usr/local/cuda-10.2/NsightCompute-2019.1${PATH:+:${PATH}} export LD_LIBRARY_PATH=/usr/local/cuda-10.2/lib64:${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} Relogin or reboot to activate
commit blender for openSUSE:Leap:15.2
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.changes2020-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 + +- 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
commit blender for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package blender for openSUSE:Leap:15.2 checked in at 2020-02-16 18:30:00 Comparing /work/SRC/openSUSE:Leap:15.2/blender (Old) and /work/SRC/openSUSE:Leap:15.2/.blender.new.26092 (New) Package is "blender" Sun Feb 16 18:30:00 2020 rev:20 rq:774544 version:2.81a Changes: --- /work/SRC/openSUSE:Leap:15.2/blender/blender.changes2020-01-15 14:48:38.249349979 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender.changes 2020-02-16 18:30:40.694792063 +0100 @@ -1,0 +2,14 @@ +Wed Feb 5 20:34:02 UTC 2020 - Hans-Peter Jansen + +- Update to version 2.81a: + bugfix release, check: + https://wiki.blender.org/wiki/Reference/Release_Notes/2.81/a + +--- +Sun Jan 12 12:41:31 UTC 2020 - Hans-Peter Jansen + +- Recommends lang package +- Add Provides to deal with suffixed blender packages (blender-xxx) + gracefully + +--- Old: blender-2.81.tar.xz blender-2.81.tar.xz.md5sum New: blender-2.81a.tar.xz blender-2.81a.tar.xz.md5sum Other differences: -- ++ blender.spec ++ --- /var/tmp/diff_new_pack.R9vx5A/_old 2020-02-16 18:30:41.982792737 +0100 +++ /var/tmp/diff_new_pack.R9vx5A/_new 2020-02-16 18:30:42.018792756 +0100 @@ -1,7 +1,7 @@ # # spec file for package blender # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -43,9 +43,10 @@ # trailing y) in the directory path. This makes this additional variable # necessary. %define _version %(echo %{version} | cut -b 1-4) +%define _suffix %(echo %{_version} | tr -d '.') Name: blender -Version:2.81 +Version:2.81a Release:0 Summary:A 3D Modelling And Rendering Package License:GPL-2.0-or-later @@ -181,6 +182,9 @@ Requires: python3-xml Requires(post):hicolor-icon-theme Requires(postun): hicolor-icon-theme +Provides: %{name}-%{_suffix} = %{version} +Obsoletes: %{name}-%{_suffix} < %{version} +Recommends: %{name}-lang %description Blender is a 3D modelling and rendering package. It is the in-house ++ blender-2.81.tar.xz -> blender-2.81a.tar.xz ++ /work/SRC/openSUSE:Leap:15.2/blender/blender-2.81.tar.xz /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender-2.81a.tar.xz differ: char 27, line 1 ++ blender-2.81.tar.xz.md5sum -> blender-2.81a.tar.xz.md5sum ++ --- /work/SRC/openSUSE:Leap:15.2/blender/blender-2.81.tar.xz.md5sum 2020-01-15 14:48:38.161349926 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.blender.new.26092/blender-2.81a.tar.xz.md5sum 2020-02-16 18:30:40.670792050 +0100 @@ -1 +1 @@ -bbb3c2ad7253ef3c6a6047b2f64074f3 blender-2.81.tar.xz +fd106a2c3debfd215617d31197883173 blender-2.81a.tar.xz