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.changes 2020-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 <stefan.bru...@rwth-aachen.de>
+
+- 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 <stefan.bru...@rwth-aachen.de>
+
+- 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 @@
<size unit="G">20</size>
</disk>
<physicalmemory>
- <size unit="G">4</size>
+ <size unit="G">2</size>
</physicalmemory>
<memory>
- <size unit="G">8</size>
+ <size unit="G">4</size>
</memory>
</hardware>
-
+
<overwrite>
<!-- x86_64 has extra features like embree -->
<conditions>
++++++ blender-add-OSL-1_11-compat.patch ++++++
>From 7d85b6431fc331d9869f945bf7c9f3353b7b8c95 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <bre...@blender.org>
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
OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg,
ustring dataname,
TypeDesc datatype,
void *data)
+#endif
{
OSLTextureHandle *handle = (OSLTextureHandle *)texture_handle;
diff --git a/intern/cycles/kernel/osl/osl_services.h
b/intern/cycles/kernel/osl/osl_services.h
index d32dace23bf..894d6e471ba 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -173,7 +173,12 @@ class OSLRenderServices : public OSL::RendererServices {
void *val,
bool derivatives) override;
+#if OSL_LIBRARY_VERSION_CODE >= 11100
+ TextureSystem::TextureHandle *get_texture_handle(ustring filename,
+ OSL::ShadingContext
*context) override;
+#else
TextureSystem::TextureHandle *get_texture_handle(ustring filename) override;
+#endif
bool good(TextureSystem::TextureHandle *texture_handle) override;
@@ -224,6 +229,17 @@ class OSLRenderServices : public OSL::RendererServices {
float *dresultdt,
ustring *errormessage) override;
+#if OSL_LIBRARY_VERSION_CODE >= 11100
+ bool get_texture_info(ustring filename,
+ TextureHandle *texture_handle,
+ TexturePerthread *texture_thread_info,
+ OSL::ShadingContext *shading_context,
+ int subimage,
+ ustring dataname,
+ TypeDesc datatype,
+ void *data,
+ ustring *errormessage) override;
+#else
bool get_texture_info(OSL::ShaderGlobals *sg,
ustring filename,
TextureHandle *texture_handle,
@@ -231,6 +247,7 @@ class OSLRenderServices : public OSL::RendererServices {
ustring dataname,
TypeDesc datatype,
void *data) override;
+#endif
static bool get_background_attribute(
KernelGlobals *kg, ShaderData *sd, ustring name, TypeDesc type, bool
derivatives, void *val);
