Attachment #186156 for bug #220784

View | Details | Raw Unified | Return to bug 220784
Collapse All | Expand All

Lines 1-3 Link Here

(-)openshadinglanguage/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1478806482	1	TIMESTAMP = 1503300284
2	SHA256 (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 46226af0592297172e856635eac50327255f1a307244162c1feb47581e72a109	2	SHA256 (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 5b9ad6814fd55e68f4ac50e4214120629ab9175142dc93aac350d0f54bea745a
3	SIZE (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 13739852	3	SIZE (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 14572479




--- src/doc/CMakeLists.txt.orig	2017-07-01 03:52:54 UTC
+++ src/doc/CMakeLists.txt
@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
                  markdeep.min.js
                  )
 
-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
+install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)
 
 install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
                 "${PROJECT_SOURCE_DIR}/INSTALL.md"
                 "${PROJECT_SOURCE_DIR}/CHANGES.md"
                 "${PROJECT_SOURCE_DIR}/README.md"
-          DESTINATION doc )
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
 
 
 file (GLOB testshade_figures "Figures/testshade/*.jpg")
 install (FILES ${testshade_figures}
-         DESTINATION doc/Figures/testshade )
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/Figures/testshade )




# $FreeBSD$

PORTNAME=	openshadinglanguage
PORTVERSION=	1.8.10
DISTVERSIONPREFIX=	Release-
PORTREVISION=	2
CATEGORIES=	graphics devel

MAINTAINER=	FreeBSD@Shaneware.biz


LICENSE=	BSD3CLAUSE

BUILD_DEPENDS=	llvm-config40:devel/llvm40
		clang34>=3.4_1:lang/clang34
LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
		libIlmImf.so:graphics/OpenEXR \
		libImath.so:graphics/ilmbase \
		libOpenImageIO.so:graphics/openimageio
RUN_DEPENDS=	llvm-config40:devel/llvm40

USES=		bison cmake:outsource compiler:c++11-lang ncurses
USE_GITHUB=	yes
GH_ACCOUNT=	imageworks
GH_PROJECT=	OpenShadingLanguage

CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config40" \
		-DENABLERTTI:BOOL=OFF -DUSE_BOOST_WAVE:BOOL=OFF
USE_LDCONFIG=	yes

post-patch:




include/OSL/oslcomp.h
include/OSL/oslconfig.h
include/OSL/oslexec.h
include/OSL/oslnoise.h
include/OSL/oslquery.h
include/OSL/oslversion.h
include/OSL/rendererservices.h
include/OSL/shaderglobals.h
lib/liboslcomp.so
lib/liboslexec.so
lib/liboslnoise.so
lib/liboslquery.so
lib/libtestshade.so
lib/osl.imageio.so
%%DATADIR%%/CHANGES.md
%%DATADIR%%/Figures/testshade/fBm_default.jpg
%%DATADIR%%/Figures/testshade/fBm_freq.jpg
%%DATADIR%%/Figures/testshade/fBm_gain.jpg
%%DATADIR%%/Figures/testshade/fBm_lac.jpg
%%DATADIR%%/Figures/testshade/fBm_octaves.jpg
%%DATADIR%%/Figures/testshade/makenoise.jpg
%%DATADIR%%/Figures/testshade/noisetex.jpg
%%DATADIR%%/Figures/testshade/show_uv.jpg
%%DATADIR%%/INSTALL.md
%%DATADIR%%/LICENSE
%%DATADIR%%/markdeep.min.js
%%DATADIR%%/osl-languagespec.pdf
%%DATADIR%%/README.md
%%DATADIR%%/shaders/emitter.osl
%%DATADIR%%/shaders/emitter.oso
%%DATADIR%%/shaders/glass.osl

%%DATADIR%%/shaders/stdosl.h
%%DATADIR%%/shaders/ubersurface.osl
%%DATADIR%%/shaders/ubersurface.oso
%%DATADIR%%/testshade.md.html

Return to bug 220784

Lines 1-16 Link Here

(-)openshadinglanguage/files/patch-src_doc_CMakeLists.txt (-7 / +12 lines)
1	--- src/doc/CMakeLists.txt.orig 2015-03-10 21:57:05 UTC	1	--- src/doc/CMakeLists.txt.orig 2017-07-01 03:52:54 UTC
2	+++ src/doc/CMakeLists.txt	2	+++ src/doc/CMakeLists.txt
3	@@ -1,11 +1,11 @@	3	@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
4	set (public_docs osl-languagespec.pdf)	4	markdeep.min.js
5	# Some day: CLA-INDIVIDUAL CLA-CORPORATE	5	)
6		6
7	-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)	7	-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
8	+install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)	8	+install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)
9		9
10	install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"	10	install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
11	"${PROJECT_SOURCE_DIR}/INSTALL"	11	"${PROJECT_SOURCE_DIR}/INSTALL.md"
12	"${PROJECT_SOURCE_DIR}/CHANGES"	12	"${PROJECT_SOURCE_DIR}/CHANGES.md"
13	"${PROJECT_SOURCE_DIR}/README.md"	13	"${PROJECT_SOURCE_DIR}/README.md"
14	- DESTINATION . )	14	- DESTINATION doc )
15	+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )	15	+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
16		16
		17
		18	file (GLOB testshade_figures "Figures/testshade/*.jpg")
		19	install (FILES ${testshade_figures}
		20	- DESTINATION doc/Figures/testshade )
		21	+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/Figures/testshade )

Lines 2-10 Link Here

(-)openshadinglanguage/Makefile (-8 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openshadinglanguage	4	PORTNAME= openshadinglanguage
5	PORTVERSION= 1.7.5	5	PORTVERSION= 1.8.10
6	DISTVERSIONPREFIX= Release-	6	DISTVERSIONPREFIX= Release-
7	PORTREVISION= 2
8	CATEGORIES= graphics devel	7	CATEGORIES= graphics devel
9		8
10	MAINTAINER= FreeBSD@Shaneware.biz	9	MAINTAINER= FreeBSD@Shaneware.biz
Lines 12-32 Link Here
12		11
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
14		13
15	BUILD_DEPENDS= llvm-config34:devel/llvm34 \	14	BUILD_DEPENDS= llvm-config40:devel/llvm40
16	clang34>=3.4_1:lang/clang34
17	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	15	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
18	libIlmImf.so:graphics/OpenEXR \	16	libIlmImf.so:graphics/OpenEXR \
19	libImath.so:graphics/ilmbase \	17	libImath.so:graphics/ilmbase \
20	libOpenImageIO.so:graphics/openimageio	18	libOpenImageIO.so:graphics/openimageio
21	RUN_DEPENDS= llvm-config34:devel/llvm34	19	RUN_DEPENDS= llvm-config40:devel/llvm40
22		20
23	USES= bison cmake:outsource compiler:c++11-lib ncurses	21	USES= bison cmake:outsource compiler:c++11-lang ncurses
24	USE_GITHUB= yes	22	USE_GITHUB= yes
25	GH_ACCOUNT= imageworks	23	GH_ACCOUNT= imageworks
26	GH_PROJECT= OpenShadingLanguage	24	GH_PROJECT= OpenShadingLanguage
27		25
28	CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34" \	26	CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config40" \
29	-DENABLERTTI:BOOL=ON	27	-DENABLERTTI:BOOL=OFF -DUSE_BOOST_WAVE:BOOL=OFF
30	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
31		29
32	post-patch:	30	post-patch:

Lines 16-35 Link Here

(-)openshadinglanguage/pkg-plist (-3 / +15 lines)
16	include/OSL/oslcomp.h	16	include/OSL/oslcomp.h
17	include/OSL/oslconfig.h	17	include/OSL/oslconfig.h
18	include/OSL/oslexec.h	18	include/OSL/oslexec.h
		19	include/OSL/oslnoise.h
19	include/OSL/oslquery.h	20	include/OSL/oslquery.h
20	include/OSL/oslversion.h	21	include/OSL/oslversion.h
21	include/OSL/rendererservices.h	22	include/OSL/rendererservices.h
22	include/OSL/shaderglobals.h	23	include/OSL/shaderglobals.h
23	lib/liboslcomp.so	24	lib/liboslcomp.so
24	lib/liboslexec.so	25	lib/liboslexec.so
		26	lib/liboslnoise.so
25	lib/liboslquery.so	27	lib/liboslquery.so
26	lib/libtestshade.so	28	lib/libtestshade.so
27	lib/osl.imageio.so	29	lib/osl.imageio.so
28	%%DATADIR%%/CHANGES	30	%%DATADIR%%/CHANGES.md
29	%%DATADIR%%/INSTALL	31	%%DATADIR%%/Figures/testshade/fBm_default.jpg
		32	%%DATADIR%%/Figures/testshade/fBm_freq.jpg
		33	%%DATADIR%%/Figures/testshade/fBm_gain.jpg
		34	%%DATADIR%%/Figures/testshade/fBm_lac.jpg
		35	%%DATADIR%%/Figures/testshade/fBm_octaves.jpg
		36	%%DATADIR%%/Figures/testshade/makenoise.jpg
		37	%%DATADIR%%/Figures/testshade/noisetex.jpg
		38	%%DATADIR%%/Figures/testshade/show_uv.jpg
		39	%%DATADIR%%/INSTALL.md
30	%%DATADIR%%/LICENSE	40	%%DATADIR%%/LICENSE
31	%%DATADIR%%/README.md	41	%%DATADIR%%/markdeep.min.js
32	%%DATADIR%%/osl-languagespec.pdf	42	%%DATADIR%%/osl-languagespec.pdf
		43	%%DATADIR%%/README.md
33	%%DATADIR%%/shaders/emitter.osl	44	%%DATADIR%%/shaders/emitter.osl
34	%%DATADIR%%/shaders/emitter.oso	45	%%DATADIR%%/shaders/emitter.oso
35	%%DATADIR%%/shaders/glass.osl	46	%%DATADIR%%/shaders/glass.osl
Lines 44-46 Link Here
44	%%DATADIR%%/shaders/stdosl.h	55	%%DATADIR%%/shaders/stdosl.h
45	%%DATADIR%%/shaders/ubersurface.osl	56	%%DATADIR%%/shaders/ubersurface.osl
46	%%DATADIR%%/shaders/ubersurface.oso	57	%%DATADIR%%/shaders/ubersurface.oso
		58	%%DATADIR%%/testshade.md.html