Hello community,
here is the log from the commit of package blender for openSUSE:Factory checked
in at 2019-01-21 10:48:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blender (Old)
and /work/SRC/openSUSE:Factory/.blender.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender"
Mon Jan 21 10:48:23 2019 rev:109 rq:664052 version:2.79b
Changes:
--------
--- /work/SRC/openSUSE:Factory/blender/blender.changes 2018-08-31
10:45:02.635245699 +0200
+++ /work/SRC/openSUSE:Factory/.blender.new.28833/blender.changes
2019-01-21 10:49:01.840116210 +0100
@@ -1,0 +2,9 @@
+Tue Jan 1 08:47:45 UTC 2019 - davejpla...@gmail.com
+
+- Enabled build with Open Shading Language using initial
+ OpenShadingLanguage version 1.9.13. See boo#1120406
+- Renamed blender-devel to blender-cycles-devel which better
+ reflects the sub packages use and also ensures that the OSL
+ headers are installed with OSL enabled blender.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.K5OlnF/_old 2019-01-21 10:49:05.328111951 +0100
+++ /var/tmp/diff_new_pack.K5OlnF/_new 2019-01-21 10:49:05.328111951 +0100
@@ -1,7 +1,7 @@
#
# spec file for package blender
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,6 +22,7 @@
%define collada 1
%define wplayer 1
%define openvdb 0
+%define osl 1
# Set this to 1 for fixing bugs.
%define debugbuild 0
# Find the version of python3 that blender is going to build against.
@@ -60,9 +61,13 @@
%if 0%{?suse_version} > 1325
BuildRequires: gcc-c++
BuildRequires: libboost_atomic-devel
+BuildRequires: libboost_chrono-devel
+BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
+BuildRequires: libboost_headers-devel
BuildRequires: libboost_locale-devel
BuildRequires: libboost_regex-devel
+BuildRequires: libboost_system-devel
BuildRequires: libboost_thread-devel
%else
BuildRequires: boost-devel
@@ -87,7 +92,6 @@
BuildRequires: libsndfile-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
-BuildRequires: llvm-devel
BuildRequires: lzo-devel
BuildRequires: openal-soft-devel
BuildRequires: pcre-devel
@@ -144,9 +148,13 @@
%endif
BuildRequires: OpenColorIO-devel
BuildRequires: OpenImageIO-devel
+%if 0%{?osl} == 1
+BuildRequires: OpenShadingLanguage-devel
+%endif
+BuildRequires: llvm5-devel
BuildRequires: cmake(pugixml)
%ifarch x86_64
-Requires: %{name}-devel = %{version}
+Requires: %{name}-cycles-devel = %{version}
%endif
%description
@@ -168,13 +176,15 @@
and game creation and playback with cross-platform compatibility.
%ifarch x86_64
-%package devel
+%package cycles-devel
Summary: Headers for cycles rendering
+#This package is for blender with cycles OSL
License: Apache-2.0
Group: Development/Sources
+Obsoletes: blender-devel <= %{version}
BuildArch: noarch
-%description devel
+%description cycles-devel
These are the cycles headers that blender uses for rendering with
specific gpus
%endif
@@ -192,6 +202,7 @@
%patch1 -p1
#%%patch2 -p1
%patch3
+oslinfo --version
rm -rf extern/glew
rm -rf extern/libopenjpeg
@@ -259,6 +270,11 @@
-DWITH_CYCLES:BOOL=OFF \
%else
-DWITH_CYCLES:BOOL=ON \
+%if 0%{?osl} == 1
+ -DWITH_LLVM:BOOL=ON \
+ -DLLVM_LIBRARY:FILE=%{_libdir}/libLLVM.so \
+ -DWITH_CYCLES_OSL:BOOL=ON \
+%endif
-DWITH_OPENIMAGEIO:BOOL=ON \
-DWITH_OPENCOLORIO:BOOL=ON \
%endif
@@ -276,7 +292,7 @@
%endif
-DCMAKE_VERBOSE_MAKEFILE=on \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
- -DCMAKE_EXE_LINKER_FLAGS:STRING="-pie" \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="-pie -lboost_locale" \
-DPYTHON_VERSION=$psver \
-DPYTHON_LIBPATH=%{_libexecdir} \
-DPYTHON_LIBRARY=python$pver \
@@ -404,7 +420,7 @@
%doc %{_docdir}/%{name}
%ifarch x86_64
-%files devel
+%files cycles-devel
%{_datadir}/%{name}/%{_version}/scripts/addons/cycles
%endif
