Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at 2020-04-25 20:32:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blender (Old) and /work/SRC/openSUSE:Factory/.blender.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender" Sat Apr 25 20:32:42 2020 rev:131 rq:797122 version:2.82a Changes: -------- --- /work/SRC/openSUSE:Factory/blender/blender.changes 2020-04-04 12:25:55.999959763 +0200 +++ /work/SRC/openSUSE:Factory/.blender.new.2738/blender.changes 2020-04-25 20:36:29.991033575 +0200 @@ -1,0 +2,6 @@ +Fri Apr 24 07:13:07 UTC 2020 - Dave Plater <davejpla...@gmail.com> + +- 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.6vgsR8/_old 2020-04-25 20:36:31.267036207 +0200 +++ /var/tmp/diff_new_pack.6vgsR8/_new 2020-04-25 20:36:31.271036215 +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 <davejpla...@gmail.com> 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.000000000 +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);
