Accepting request 745978 from home:plater:blender

- Update to release 1.10.7 which fixes build with new llvm. OBS-URL: https://build.opensuse.org/request/show/745978 OBS-URL: https://build.opensuse.org/package/show/graphics/OpenShadingLanguage?expand=0&rev=8
2019-11-06 12:12:25 +00:00 · 2019-11-06 12:12:25 +00:00 · 2bc984d153
commit 2bc984d153
parent 2c5b4157f8
5 changed files with 72 additions and 42 deletions
--- a/0001-Generalize-lookup-of-stdosl.h-in-install-directory-a.patch
+++ b/0001-Generalize-lookup-of-stdosl.h-in-install-directory-a.patch
@ -35,10 +35,10 @@ the example above "/usr/share/OpenShadingLanguage/shaders/stdosl.h".
 7 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 src/liboslcomp/oslcomp_shaders_dir.h.in

-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 02feab53..05d5e959 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+Index: OpenShadingLanguage-Release-1.10.7/CMakeLists.txt
+===================================================================
+--- OpenShadingLanguage-Release-1.10.7.orig/CMakeLists.txt	2019-10-01 08:05:04.000000000 +0200
+++ OpenShadingLanguage-Release-1.10.7/CMakeLists.txt	2019-11-06 11:56:09.880927045 +0200
@@ -53,6 +53,15 @@ if (CMAKE_USE_FOLDERS)
     set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 endif ()
@ -54,11 +54,11 @@ index 02feab53..05d5e959 100644
 +
 include (GNUInstallDirs)
 
- set (CMAKE_MODULE_PATH
-diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt
-index 549aa549..15d9d026 100644
--- a/src/liboslcomp/CMakeLists.txt
-+++ b/src/liboslcomp/CMakeLists.txt
+ list (APPEND CMAKE_MODULE_PATH
+Index: OpenShadingLanguage-Release-1.10.7/src/liboslcomp/CMakeLists.txt
+===================================================================
+--- OpenShadingLanguage-Release-1.10.7.orig/src/liboslcomp/CMakeLists.txt	2019-10-01 08:05:04.000000000 +0200
+++ OpenShadingLanguage-Release-1.10.7/src/liboslcomp/CMakeLists.txt	2019-11-06 11:56:09.880927045 +0200
@@ -29,6 +29,8 @@ else ()
 
 endif ()
@ -68,11 +68,11 @@ index 549aa549..15d9d026 100644
 TARGET_LINK_LIBRARIES ( oslcomp ${OPENIMAGEIO_LIBRARIES} ${ILMBASE_LIBRARIES}
                        ${Boost_LIBRARIES} ${CMAKE_DL_LIBS}
                        ${CLANG_LIBRARIES} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS}
-diff --git a/src/liboslcomp/oslcomp.cpp b/src/liboslcomp/oslcomp.cpp
-index a89212aa..d4deda70 100644
--- a/src/liboslcomp/oslcomp.cpp
-+++ b/src/liboslcomp/oslcomp.cpp
-@@ -36,6 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Index: OpenShadingLanguage-Release-1.10.7/src/liboslcomp/oslcomp.cpp
+===================================================================
+--- OpenShadingLanguage-Release-1.10.7.orig/src/liboslcomp/oslcomp.cpp	2019-10-01 08:05:04.000000000 +0200
+++ OpenShadingLanguage-Release-1.10.7/src/liboslcomp/oslcomp.cpp	2019-11-06 11:56:09.880927045 +0200
+@@ -36,6 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 #include <cerrno>
 
 #include "oslcomp_pvt.h"
@ -80,7 +80,7 @@ index a89212aa..d4deda70 100644
 
 #include <OpenImageIO/platform.h>
 #include <OpenImageIO/sysutil.h>
-@@ -478,6 +479,14 @@ find_stdoslpath (const std::vector<std::string>& includepaths)
+@@ -485,6 +486,14 @@ find_stdoslpath (const std::vector<std::
         }
     }
 
@ -95,11 +95,10 @@ index a89212aa..d4deda70 100644
     // Try looking for "oslc" binary in the $PATH, and if so, look in
     // ../../shaders/stdosl.h
     std::vector<std::string> exec_path_dirs;
-diff --git a/src/liboslcomp/oslcomp_shaders_dir.h.in b/src/liboslcomp/oslcomp_shaders_dir.h.in
-new file mode 100644
-index 00000000..0638252f
--- /dev/null
-+++ b/src/liboslcomp/oslcomp_shaders_dir.h.in
+Index: OpenShadingLanguage-Release-1.10.7/src/liboslcomp/oslcomp_shaders_dir.h.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ OpenShadingLanguage-Release-1.10.7/src/liboslcomp/oslcomp_shaders_dir.h.in	2019-11-06 11:56:09.880927045 +0200
@@ -0,0 +1,7 @@
 +#ifndef OSL_SHADERS_INSTALL_DIR
 +
@ -108,10 +107,10 @@ index 00000000..0638252f
 +#define OSL_SHADERS_INSTALL_DIR "@INSTALL_FULL_SHADERDIR@/shaders/"
 +
 +#endif // OSL_SHADERS_INSTALL_DIR
-diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
-index eb8f0fa9..ff5595cc 100644
--- a/src/liboslexec/CMakeLists.txt
-+++ b/src/liboslexec/CMakeLists.txt
+Index: OpenShadingLanguage-Release-1.10.7/src/liboslexec/CMakeLists.txt
+===================================================================
+--- OpenShadingLanguage-Release-1.10.7.orig/src/liboslexec/CMakeLists.txt	2019-10-01 08:05:04.000000000 +0200
+++ OpenShadingLanguage-Release-1.10.7/src/liboslexec/CMakeLists.txt	2019-11-06 11:56:09.880927045 +0200
@@ -41,6 +41,7 @@ if (NOT BUILDSTATIC)
 endif ()
 
@ -120,27 +119,24 @@ index eb8f0fa9..ff5595cc 100644
 
 FILE ( GLOB exec_headers "*.h" )
 FILE ( GLOB compiler_headers "../liboslcomp/*.h" )
-diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt
-index 9b263ffa..594c09cb 100644
--- a/src/shaders/CMakeLists.txt
-+++ b/src/shaders/CMakeLists.txt
+Index: OpenShadingLanguage-Release-1.10.7/src/shaders/CMakeLists.txt
+===================================================================
+--- OpenShadingLanguage-Release-1.10.7.orig/src/shaders/CMakeLists.txt	2019-10-01 08:05:04.000000000 +0200
+++ OpenShadingLanguage-Release-1.10.7/src/shaders/CMakeLists.txt	2019-11-06 11:56:09.880927045 +0200
@@ -63,4 +63,4 @@ add_custom_target (shaders ALL
                    SOURCES ${shader_source} ${shader_headers})
 
 install (FILES ${shader_headers} ${shader_source} ${shader_objs}
 -        DESTINATION shaders)
 +        DESTINATION ${INSTALL_FULL_SHADERDIR}/shaders)
-diff --git a/src/shaders/MaterialX/CMakeLists.txt b/src/shaders/MaterialX/CMakeLists.txt
-index 98f54840..d134fcde 100644
--- a/src/shaders/MaterialX/CMakeLists.txt
-+++ b/src/shaders/MaterialX/CMakeLists.txt
-@@ -196,5 +196,5 @@ add_custom_target (mxshaders ALL
+Index: OpenShadingLanguage-Release-1.10.7/src/shaders/MaterialX/CMakeLists.txt
+===================================================================
+--- OpenShadingLanguage-Release-1.10.7.orig/src/shaders/MaterialX/CMakeLists.txt	2019-10-01 08:05:04.000000000 +0200
+++ OpenShadingLanguage-Release-1.10.7/src/shaders/MaterialX/CMakeLists.txt	2019-11-06 11:56:09.880927045 +0200
+@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL
                    SOURCES ${shader_source} ${mx_shader_headers})
 
 install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls}
 -         DESTINATION shaders/MaterialX)
 +         DESTINATION ${INSTALL_FULL_SHADERDIR}/shaders/MaterialX)
 
-- 
-2.20.1
-
--- a/OpenShadingLanguage-Release-1.10.7.tar.gz
+++ b/OpenShadingLanguage-Release-1.10.7.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c4cce505e2803baa55db11744adb72fad854c2a4cc4f02592f79324ac5bfda1
+size 13542717
--- a/OpenShadingLanguage-Release-1.9.13.tar.gz
+++ b/OpenShadingLanguage-Release-1.9.13.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bcd1d835f210dbc9e73f1d8892bb15c067d269cbb7b77d9fe5054e2f4fee394
-size 15451839
--- a/OpenShadingLanguage.changes
+++ b/OpenShadingLanguage.changes
@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Nov  6 11:38:51 UTC 2019 - Dave Plater <davejplater@gmail.com>
+
+- Update to release 1.10.7 which fixes build with new llvm.
+- Rebased:
+  0001-Generalize-lookup-of-stdosl.h-in-install-directory-a.patch
+- Recent upstream changes:
+  *Adjust for deprecated material in more recent Qt releases. #1043
+  *Fixes for MinGW compiler. #1047
+  *Texture "missingalpha" optional parameter generated incorrect
+   code and crashed. #1044
+  *Fix incorrect optimizations surrounding 'exit()' calls in the
+   middle of certain shader code blocks. #1051
+  *LLVM 9 / clang 9 compatibility. #1058
+  *Fixes to Travis CI system to keep up with OIIO master recently
+   upgrading its minimum required CMake. #1065
+
 -------------------------------------------------------------------
 Sun Jan 13 02:21:24 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

--- a/OpenShadingLanguage.spec
+++ b/OpenShadingLanguage.spec
@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #

+
 # The library soname versions follow the package version major and minor numbers.
 %define sover %(echo %{version} | cut -d . -f 1,2)
 %define sufx %(echo %{sover}|tr . _)
@ -24,7 +25,7 @@
 # first davejplater@gmail.com or suffix the package with a 110 or something.

 Name:           OpenShadingLanguage
-Version:        1.9.13
+Version:        1.10.7
 Release:        0
 Summary:        A language for programmable shading
 License:        BSD-3-Clause
@ -57,8 +58,8 @@ BuildRequires:  libboost_wave-devel
 BuildRequires:  boost-devel >= 1.55.0
 BuildConflicts: boost-devel >= 1.61.0
 %endif
-BuildRequires:  OpenImageIO-devel
 BuildRequires:  OpenEXR-devel
+BuildRequires:  OpenImageIO-devel
 BuildRequires:  python
 Requires:       %{name}-common-headers = %{version}
 Recommends:     %{name}-doc = %{version}
@ -85,7 +86,9 @@ This package contains documentation.

 %package MaterialX-shaders-source
 Summary:        MaterialX shader nodes
+License:        BSD-3-Clause
 Group:          Development/Languages/Other
+
 Requires:       %{name} = %{version}
 Requires:       %{name}-common-headers

@ -98,7 +101,9 @@ This package contains the code for the MaterialX shader nodes.

 %package example-shaders-source
 Summary:        OSL shader examples
+License:        BSD-3-Clause
 Group:          Development/Languages/Other
+
 Requires:       %{name} = %{version}
 Requires:       %{name}-common-headers

@ -111,7 +116,9 @@ This package contains some OSL example shaders.

 %package common-headers
 Summary:        OSL standard library and auxiliary headers
+License:        BSD-3-Clause
 Group:          Development/Languages/Other
+
 Requires:       %{name} = %{version}

 %description common-headers
@ -124,6 +131,7 @@ as some additional headers useful for writing shaders.

 %package -n liboslcomp%{sufx}
 Summary:        OpenShadingLanguage's compiler component library
+License:        BSD-3-Clause
 Group:          System/Libraries

 %description -n liboslcomp%{sufx}
@ -133,6 +141,7 @@ materials, lights, displacement, and pattern generation.

 %package -n liboslexec%{sufx}
 Summary:        OpenShadingLanguage's execution component library
+License:        BSD-3-Clause
 Group:          System/Libraries

 %description -n liboslexec%{sufx}
@ -142,6 +151,7 @@ materials, lights, displacement, and pattern generation.

 %package -n liboslnoise%{sufx}
 Summary:        OpenShadingLanguage's image noise generation library
+License:        BSD-3-Clause
 Group:          System/Libraries

 %description -n liboslnoise%{sufx}
@ -151,6 +161,7 @@ materials, lights, displacement, and pattern generation.

 %package -n liboslquery%{sufx}
 Summary:        Osl library
+License:        BSD-3-Clause
 Group:          System/Libraries

 %description -n liboslquery%{sufx}
@ -160,6 +171,7 @@ materials, lights, displacement, and pattern generation.

 %package -n libtestshade%{sufx}
 Summary:        Osl library
+License:        BSD-3-Clause
 Group:          System/Libraries

 %description -n libtestshade%{sufx}
@ -169,6 +181,7 @@ materials, lights, displacement, and pattern generation.

 %package -n osl.imageio%{sufx}
 Summary:        Shader interface to OpenImageIO functions
+License:        BSD-3-Clause
 Group:          System/Libraries

 %description -n osl.imageio%{sufx}
@ -178,7 +191,9 @@ materials, lights, displacement, and pattern generation.

 %package        devel
 Summary:        Development files for %{name}
+License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
+
 Requires:       %{name} = %{version}
 Requires:       liboslcomp%{sufx} = %{version}
 Requires:       liboslexec%{sufx} = %{version}
@ -202,11 +217,14 @@ developing applications that use %{name}.
 %if 0%{suse_version} < 1500
 %define llvm_libs %(llvm-config --libfiles | tr ' ' ';')
 %endif
+
 %cmake \
      %{?llvm_libs:-DLLVM_LIBRARY="%{llvm_libs}"} \
      -DLLVM_MCJIT_LIBRARY="" \
      -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \
      -DOSL_INSTALL_SHADERDIR:PATH=%{_datadir}/%{name}
+#Build can't find generated oslcomp_shaders_dir.h because it's under build dir
+cp -v `find ../ -name oslcomp_shaders_dir.h` ../src/liboslcomp/

 make %{?_smp_mflags}

@ -236,7 +254,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %post -n osl.imageio%{sufx} -p /sbin/ldconfig
 %postun -n osl.imageio%{sufx} -p /sbin/ldconfig

-
 %files
 %{_bindir}/*