Attachment 147891 Details for Bug 194028 – osl update 1.5.11

[patch] osl update 1.5.11

openshadinglanguage.patch.txt (text/plain), 5.04 KB, created by Shane on 2014-10-01 17:36:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2014-10-01 17:36:42 UTC

Size: 5.04 KB

patch

obsolete

>diff -Nru openshadinglanguage.orig/Makefile openshadinglanguage/Makefile
>--- openshadinglanguage.orig/Makefile	2014-10-02 03:04:52.627455603 +0930
>+++ openshadinglanguage/Makefile	2014-10-02 02:10:42.421455183 +0930
>@@ -2,29 +2,28 @@
> # $FreeBSD$
> 
> PORTNAME=	openshadinglanguage
>-PORTVERSION=	1.4.2
>-PORTREVISION=	2
>+PORTVERSION=	1.5.11
> CATEGORIES=	graphics devel
> 
> MAINTAINER=	FreeBSD@Shaneware.biz
> COMMENT=	Advanced shading language for production GI renderers
> 
>-LICENSE=	BSD
>+LICENSE=	BSD3CLAUSE
> 
>-BUILD_DEPENDS=	llvm-config33:${PORTSDIR}/devel/llvm33 \
>-		clang33>=3.3_3:${PORTSDIR}/lang/clang33
>+BUILD_DEPENDS=	llvm-config34:${PORTSDIR}/devel/llvm34 \
>+		clang34:${PORTSDIR}/lang/clang34
> LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
> 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
> 		libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
>-RUN_DEPENDS=	llvm-config33:${PORTSDIR}/devel/llvm33
>+RUN_DEPENDS=	llvm-config34:${PORTSDIR}/devel/llvm34
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	imageworks
> GH_PROJECT=	OpenShadingLanguage
> GH_TAGNAME=	Release-${PORTVERSION}
>-GH_COMMIT=	2c3574d
>+GH_COMMIT=	9c3ba5b
> 
>-CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33"
>+CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34"
> USE_LDCONFIG=	yes
> USES=		bison cmake:outsource
> 
>diff -Nru openshadinglanguage.orig/distinfo openshadinglanguage/distinfo
>--- openshadinglanguage.orig/distinfo	2014-10-02 03:04:52.626455603 +0930
>+++ openshadinglanguage/distinfo	2014-10-01 21:27:10.860454701 +0930
>@@ -1,2 +1,2 @@
>-SHA256 (openshadinglanguage-1.4.2.tar.gz) = c1b20727c9dcfe35c6608e433ff89a73ce8bf4a184598e9bcaae7d09fb6e66ca
>-SIZE (openshadinglanguage-1.4.2.tar.gz) = 11527572
>+SHA256 (openshadinglanguage-1.5.11.tar.gz) = 756712f3a28ab0b0c304d0732703486b0f9daf023dd9f751bbad53f65efb8ec4
>+SIZE (openshadinglanguage-1.5.11.tar.gz) = 11560150
>diff -Nru openshadinglanguage.orig/files/patch-CMakeLists.txt openshadinglanguage/files/patch-CMakeLists.txt
>--- openshadinglanguage.orig/files/patch-CMakeLists.txt	2014-10-02 03:04:52.547455789 +0930
>+++ openshadinglanguage/files/patch-CMakeLists.txt	2014-09-25 08:50:05.288687026 +0930
>@@ -1,5 +1,5 @@
>---- ./CMakeLists.txt.orig	2013-11-26 05:11:29.000000000 +1030
>-+++ ./CMakeLists.txt	2013-11-28 23:52:39.202491493 +1030
>+--- CMakeLists.txt.orig	2014-07-30 17:38:26 UTC
>++++ CMakeLists.txt
> @@ -10,10 +10,8 @@
>  set (OSO_FILE_VERSION_MAJOR 1)
>  set (OSO_FILE_VERSION_MINOR 0)
>@@ -22,7 +22,7 @@
>  if (NOT CMAKE_BUILD_TYPE)
>      set (CMAKE_BUILD_TYPE "Release")
>  endif ()
>-@@ -124,12 +124,11 @@
>+@@ -136,12 +136,11 @@
>      endif ()
>  endif ()
>  
>@@ -40,7 +40,7 @@
>  
>  set (VERBOSE OFF CACHE BOOL "Print lots of messages while compiling")
>  set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")
>-@@ -167,7 +166,6 @@
>+@@ -184,7 +183,6 @@
>  
>  if (CMAKE_COMPILER_IS_CLANG AND OSL_USE_LIBCPP)
>      message (STATUS "Using libc++")
>@@ -48,7 +48,7 @@
>  endif ()
>  
>  set (CMAKE_MODULE_PATH
>-@@ -202,6 +200,10 @@
>+@@ -219,6 +217,10 @@
>  
>  message (STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}")
>  
>@@ -59,7 +59,7 @@
>  
>  ###########################################################################
>  if (MSVC)
>-@@ -232,6 +234,13 @@
>+@@ -249,6 +251,13 @@
>  add_subdirectory (src/include)
>  add_subdirectory (src/doc)
>  
>diff -Nru openshadinglanguage.orig/files/patch-src__testshade__testshade.cpp openshadinglanguage/files/patch-src__testshade__testshade.cpp
>--- openshadinglanguage.orig/files/patch-src__testshade__testshade.cpp	1970-01-01 09:30:00.000000000 +0930
>+++ openshadinglanguage/files/patch-src__testshade__testshade.cpp	2014-09-26 01:12:47.127547028 +0930
>@@ -0,0 +1,11 @@
>+--- src/testshade/testshade.cpp.orig	2014-07-30 17:38:26 UTC
>++++ src/testshade/testshade.cpp
>+@@ -731,7 +731,7 @@
>+         int num_layers = 0;
>+         shadingsys->getattribute (shadergroup.get(), "num_layers", num_layers);
>+         if (num_layers > 0) {
>+-            std::vector<const char *> layers (num_layers, NULL);
>++            std::vector<const char *> layers (size_t(num_layers), NULL);
>+             shadingsys->getattribute (shadergroup.get(), "layer_names",
>+                                       TypeDesc(TypeDesc::STRING, num_layers),
>+                                       &layers[0]);
>diff -Nru openshadinglanguage.orig/pkg-plist openshadinglanguage/pkg-plist
>--- openshadinglanguage.orig/pkg-plist	2014-10-02 03:04:52.594455454 +0930
>+++ openshadinglanguage/pkg-plist	2014-10-01 21:27:10.861454646 +0930
>@@ -9,6 +9,7 @@
> include/OSL/export.h
> include/OSL/genclosure.h
> include/OSL/Imathx.h
>+include/OSL/llvm_util.h
> include/OSL/matrix22.h
> include/OSL/optautomata.h
> include/OSL/oslclosure.h
>@@ -17,6 +18,8 @@
> include/OSL/oslexec.h
> include/OSL/oslquery.h
> include/OSL/oslversion.h
>+include/OSL/rendererservices.h
>+include/OSL/shaderglobals.h
> lib/liboslcomp.so
> lib/liboslcomp.so.1
> lib/liboslexec.so
>@@ -44,6 +47,6 @@
> %%DATADIR%%/shaders/stdosl.h
> %%DATADIR%%/shaders/ubersurface.osl
> %%DATADIR%%/shaders/ubersurface.oso
>-@dirrm include/OSL
>-@dirrm %%DATADIR%%/shaders
>-@dirrm %%DATADIR%%
>+@dir include/OSL
>+@dir %%DATADIR%%/shaders
>+@dir %%DATADIR%%

Actions: View | Diff

Attachments on bug 194028: 147820 | 147891