Attachment #147891 for bug #194028




# $FreeBSD$

PORTNAME=	openshadinglanguage
PORTVERSION=	1.5.11
PORTREVISION=	2
CATEGORIES=	graphics devel

MAINTAINER=	FreeBSD@Shaneware.biz
COMMENT=	Advanced shading language for production GI renderers

LICENSE=	BSD3CLAUSE

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-config34:${PORTSDIR}/devel/llvm34

USE_GITHUB=	yes
GH_ACCOUNT=	imageworks
GH_PROJECT=	OpenShadingLanguage
GH_TAGNAME=	Release-${PORTVERSION}
GH_COMMIT=	9c3ba5b

CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34"
USE_LDCONFIG=	yes
USES=		bison cmake:outsource


Lines 1-2 Link Here

(-)openshadinglanguage/distinfo (-2 / +2 lines)
1	SHA256 (openshadinglanguage-1.4.2.tar.gz) = c1b20727c9dcfe35c6608e433ff89a73ce8bf4a184598e9bcaae7d09fb6e66ca	1	SHA256 (openshadinglanguage-1.5.11.tar.gz) = 756712f3a28ab0b0c304d0732703486b0f9daf023dd9f751bbad53f65efb8ec4
2	SIZE (openshadinglanguage-1.4.2.tar.gz) = 11527572	2	SIZE (openshadinglanguage-1.5.11.tar.gz) = 11560150




--- 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)

 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE "Release")
 endif ()
@@ -136,12 +136,11 @@
     endif ()
 endif ()
 

 
 set (VERBOSE OFF CACHE BOOL "Print lots of messages while compiling")
 set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")
@@ -184,7 +183,6 @@
 
 if (CMAKE_COMPILER_IS_CLANG AND OSL_USE_LIBCPP)
     message (STATUS "Using libc++")

 endif ()
 
 set (CMAKE_MODULE_PATH
@@ -219,6 +217,10 @@
 
 message (STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}")
 

 
 ###########################################################################
 if (MSVC)
@@ -249,6 +251,13 @@
 add_subdirectory (src/include)
 add_subdirectory (src/doc)
 

Line 0 Link Here

(-)openshadinglanguage/files/patch-src__testshade__testshade.cpp (+11 lines)
	1	--- src/testshade/testshade.cpp.orig 2014-07-30 17:38:26 UTC
	2	+++ src/testshade/testshade.cpp
	3	@@ -731,7 +731,7 @@
	4	int num_layers = 0;
	5	shadingsys->getattribute (shadergroup.get(), "num_layers", num_layers);
	6	if (num_layers > 0) {
	7	- std::vector<const char *> layers (num_layers, NULL);
	8	+ std::vector<const char *> layers (size_t(num_layers), NULL);
	9	shadingsys->getattribute (shadergroup.get(), "layer_names",
	10	TypeDesc(TypeDesc::STRING, num_layers),
	11	&layers[0]);

Lines 9-14 Link Here

(-)openshadinglanguage/pkg-plist (-3 / +6 lines)
9	include/OSL/export.h	9	include/OSL/export.h
10	include/OSL/genclosure.h	10	include/OSL/genclosure.h
11	include/OSL/Imathx.h	11	include/OSL/Imathx.h
		12	include/OSL/llvm_util.h
12	include/OSL/matrix22.h	13	include/OSL/matrix22.h
13	include/OSL/optautomata.h	14	include/OSL/optautomata.h
14	include/OSL/oslclosure.h	15	include/OSL/oslclosure.h
Lines 17-22 Link Here
17	include/OSL/oslexec.h	18	include/OSL/oslexec.h
18	include/OSL/oslquery.h	19	include/OSL/oslquery.h
19	include/OSL/oslversion.h	20	include/OSL/oslversion.h
		21	include/OSL/rendererservices.h
		22	include/OSL/shaderglobals.h
20	lib/liboslcomp.so	23	lib/liboslcomp.so
21	lib/liboslcomp.so.1	24	lib/liboslcomp.so.1
22	lib/liboslexec.so	25	lib/liboslexec.so
Lines 44-49 Link Here
44	%%DATADIR%%/shaders/stdosl.h	47	%%DATADIR%%/shaders/stdosl.h
45	%%DATADIR%%/shaders/ubersurface.osl	48	%%DATADIR%%/shaders/ubersurface.osl
46	%%DATADIR%%/shaders/ubersurface.oso	49	%%DATADIR%%/shaders/ubersurface.oso
47	@dirrm include/OSL	50	@dir include/OSL
48	@dirrm %%DATADIR%%/shaders	51	@dir %%DATADIR%%/shaders
49	@dirrm %%DATADIR%%	52	@dir %%DATADIR%%

Return to bug 194028

Lines 2-30 Link Here

(-)openshadinglanguage/Makefile (-8 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openshadinglanguage	4	PORTNAME= openshadinglanguage
5	PORTVERSION= 1.4.2	5	PORTVERSION= 1.5.11
6	PORTREVISION= 2
7	CATEGORIES= graphics devel	6	CATEGORIES= graphics devel
8		7
9	MAINTAINER= FreeBSD@Shaneware.biz	8	MAINTAINER= FreeBSD@Shaneware.biz
10	COMMENT= Advanced shading language for production GI renderers	9	COMMENT= Advanced shading language for production GI renderers
11		10
12	LICENSE= BSD	11	LICENSE= BSD3CLAUSE
13		12
14	BUILD_DEPENDS= llvm-config33:${PORTSDIR}/devel/llvm33 \	13	BUILD_DEPENDS= llvm-config34:${PORTSDIR}/devel/llvm34 \
15	clang33>=3.3_3:${PORTSDIR}/lang/clang33	14	clang34:${PORTSDIR}/lang/clang34
16	LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \	15	LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
17	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \	16	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
18	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio	17	libOpenImageIO.so:${PORTSDIR}/graphics/openimageio
19	RUN_DEPENDS= llvm-config33:${PORTSDIR}/devel/llvm33	18	RUN_DEPENDS= llvm-config34:${PORTSDIR}/devel/llvm34
20		19
21	USE_GITHUB= yes	20	USE_GITHUB= yes
22	GH_ACCOUNT= imageworks	21	GH_ACCOUNT= imageworks
23	GH_PROJECT= OpenShadingLanguage	22	GH_PROJECT= OpenShadingLanguage
24	GH_TAGNAME= Release-${PORTVERSION}	23	GH_TAGNAME= Release-${PORTVERSION}
25	GH_COMMIT= 2c3574d	24	GH_COMMIT= 9c3ba5b
26		25
27	CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33"	26	CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34"
28	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
29	USES= bison cmake:outsource	28	USES= bison cmake:outsource
30		29

Lines 1-5 Link Here

(-)openshadinglanguage/files/patch-CMakeLists.txt (-6 / +6 lines)
1	--- ./CMakeLists.txt.orig 2013-11-26 05:11:29.000000000 +1030	1	--- CMakeLists.txt.orig 2014-07-30 17:38:26 UTC
2	+++ ./CMakeLists.txt 2013-11-28 23:52:39.202491493 +1030	2	+++ CMakeLists.txt
3	@@ -10,10 +10,8 @@	3	@@ -10,10 +10,8 @@
4	set (OSO_FILE_VERSION_MAJOR 1)	4	set (OSO_FILE_VERSION_MAJOR 1)
5	set (OSO_FILE_VERSION_MINOR 0)	5	set (OSO_FILE_VERSION_MINOR 0)
Lines 22-28 Link Here
22	if (NOT CMAKE_BUILD_TYPE)	22	if (NOT CMAKE_BUILD_TYPE)
23	set (CMAKE_BUILD_TYPE "Release")	23	set (CMAKE_BUILD_TYPE "Release")
24	endif ()	24	endif ()
25	@@ -124,12 +124,11 @@	25	@@ -136,12 +136,11 @@
26	endif ()	26	endif ()
27	endif ()	27	endif ()
28		28
Lines 40-46 Link Here
40		40
41	set (VERBOSE OFF CACHE BOOL "Print lots of messages while compiling")	41	set (VERBOSE OFF CACHE BOOL "Print lots of messages while compiling")
42	set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")	42	set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")
43	@@ -167,7 +166,6 @@	43	@@ -184,7 +183,6 @@
44		44
45	if (CMAKE_COMPILER_IS_CLANG AND OSL_USE_LIBCPP)	45	if (CMAKE_COMPILER_IS_CLANG AND OSL_USE_LIBCPP)
46	message (STATUS "Using libc++")	46	message (STATUS "Using libc++")
Lines 48-54 Link Here
48	endif ()	48	endif ()
49		49
50	set (CMAKE_MODULE_PATH	50	set (CMAKE_MODULE_PATH
51	@@ -202,6 +200,10 @@	51	@@ -219,6 +217,10 @@
52		52
53	message (STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}")	53	message (STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}")
54		54
Lines 59-65 Link Here
59		59
60	###########################################################################	60	###########################################################################
61	if (MSVC)	61	if (MSVC)
62	@@ -232,6 +234,13 @@	62	@@ -249,6 +251,13 @@
63	add_subdirectory (src/include)	63	add_subdirectory (src/include)
64	add_subdirectory (src/doc)	64	add_subdirectory (src/doc)
65		65