svn commit: r356308 - in head/graphics: openimageio openshadinglanguage

Guido Falsi madpilot at FreeBSD.org
Tue Jun 3 08:25:09 UTC 2014 

Author: madpilot
Date: Tue Jun  3 08:25:07 2014
New Revision: 356308
URL: http://svnweb.freebsd.org/changeset/ports/356308
QAT: https://qat.redports.org/buildarchive/r356308/

Log:
  - Update OpenImageIO to 1.4.8
  - Use OPTIONS helpers where appropriate
  - Update OpenShadingLanguage to 1.4.2
  
  PR:		190254
  Submitted by:	FreeBSD at ShaneWare.Biz (Maintainer)

Modified:
  head/graphics/openimageio/Makefile
  head/graphics/openimageio/distinfo
  head/graphics/openimageio/pkg-plist
  head/graphics/openshadinglanguage/Makefile
  head/graphics/openshadinglanguage/distinfo

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Tue Jun  3 08:21:05 2014	(r356307)
+++ head/graphics/openimageio/Makefile	Tue Jun  3 08:25:07 2014	(r356308)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
-PORTVERSION=	1.3.9
-PORTREVISION?=	4
+PORTVERSION=	1.4.8
+PORTREVISION?=	0
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD at Shaneware.biz
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	OpenImageIO
 GH_PROJECT=	oiio
 GH_TAGNAME=	Release-${PORTVERSION}
-GH_COMMIT=	1a57f2f
+GH_COMMIT=	916f05d
 
 # fbm also installs bin/idiff
 CONFLICTS=	fbm-[0-9]*
@@ -24,16 +24,25 @@ USES=		cmake:outsource
 CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DLINKSTATIC:BOOL=OFF \
 		-DNOTHREADS:BOOL=OFF \
-		-DUSE_TBB:BOOL=OFF \
 		-DSTOP_ON_WARNING:BOOL=OFF
 
-OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO
+OPTIONS_DEFINE=		DOCS IMAGEVIEWER OCIO TEST
 OPTIONS_DEFAULT=	OCIO
 OPTIONS_SUB=		yes
 
 IMAGEVIEWER_DESC=	Build image viewer
 OCIO_DESC=		Colour management support
 
+DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
+DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
+
+OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
+OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
+OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
+
+TEST_CMAKE_ON=		-DOIIO_BUILD_TESTS:BOOL=ON
+TEST_CMAKE_OFF=		-DOIIO_BUILD_TESTS:BOOL=OFF
+
 .include <bsd.port.options.mk>
 
 .if ${SLAVE_PORT} == no
@@ -53,12 +62,6 @@ PLIST=		${PKGDIR}/pkg-plist-pybind
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=ON
-.else
-CMAKE_ARGS+=	-DINSTALL_DOCS:BOOL=OFF
-.endif
-
 .if ${PORT_OPTIONS:MIMAGEVIEWER}
 USE_GL=		glew
 USE_QT4=	corelib gui opengl qmake_build moc_build rcc_build uic_build
@@ -68,16 +71,14 @@ CMAKE_ENV+=	QTDIR=${QT_PREFIX} QT_INCLUD
 CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MOCIO}
-CMAKE_ARGS+=	-DUSE_OCIO:BOOL=ON
-LIB_DEPENDS+=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
-.else
-CMAKE_ARGS+=	-DUSE_OCIO:BOOL=OFF
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
+		${WRKSRC}/CMakeLists.txt
 
 post-install:
 .if ${SLAVE_PORT} == no
-	${LN} -sf libOpenImageIO.so.1.3 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
+	${LN} -sf libOpenImageIO.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
+	${LN} -sf libOpenImageIO_Util.so.1.4 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/openimageio/distinfo
==============================================================================
--- head/graphics/openimageio/distinfo	Tue Jun  3 08:21:05 2014	(r356307)
+++ head/graphics/openimageio/distinfo	Tue Jun  3 08:25:07 2014	(r356308)
@@ -1,2 +1,2 @@
-SHA256 (openimageio-1.3.9.tar.gz) = 4f68be9bcb50ebb1e645f8f9204247c90d443e050c26dda2cb7ebdead08cde88
-SIZE (openimageio-1.3.9.tar.gz) = 14832206
+SHA256 (openimageio-1.4.8.tar.gz) = 57e8465711a067e2f57f569d309bc9224249cde406bc4cf2384a4cb5463e04ce
+SIZE (openimageio-1.4.8.tar.gz) = 17423372

Modified: head/graphics/openimageio/pkg-plist
==============================================================================
--- head/graphics/openimageio/pkg-plist	Tue Jun  3 08:21:05 2014	(r356307)
+++ head/graphics/openimageio/pkg-plist	Tue Jun  3 08:25:07 2014	(r356308)
@@ -9,6 +9,15 @@ include/OpenImageIO/argparse.h
 include/OpenImageIO/color.h
 include/OpenImageIO/dassert.h
 include/OpenImageIO/errorhandler.h
+include/OpenImageIO/SHA1.h
+include/OpenImageIO/array_view.h
+include/OpenImageIO/image_view.h
+include/OpenImageIO/oiioversion.h
+include/OpenImageIO/strided_ptr.h
+include/OpenImageIO/string_ref.h
+include/OpenImageIO/string_view.h
+include/OpenImageIO/unittest.h
+include/OpenImageIO/unordered_map_concurrent.h
 include/OpenImageIO/export.h
 include/OpenImageIO/filesystem.h
 include/OpenImageIO/filter.h
@@ -39,8 +48,12 @@ include/OpenImageIO/pugiconfig.hpp
 include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.1
-lib/libOpenImageIO.so.1.3
-lib/libOpenImageIO.so.1.3.9
+lib/libOpenImageIO.so.1.4
+lib/libOpenImageIO.so.1.4.8
+lib/libOpenImageIO_Util.so
+lib/libOpenImageIO_Util.so.1
+lib/libOpenImageIO_Util.so.1.4
+lib/libOpenImageIO_Util.so.1.4.8
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf

Modified: head/graphics/openshadinglanguage/Makefile
==============================================================================
--- head/graphics/openshadinglanguage/Makefile	Tue Jun  3 08:21:05 2014	(r356307)
+++ head/graphics/openshadinglanguage/Makefile	Tue Jun  3 08:25:07 2014	(r356308)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openshadinglanguage
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	graphics devel
 
 MAINTAINER=	FreeBSD at Shaneware.biz
@@ -22,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	imageworks
 GH_PROJECT=	OpenShadingLanguage
 GH_TAGNAME=	Release-${PORTVERSION}
-GH_COMMIT=	fb85664
+GH_COMMIT=	2c3574d
 
 CMAKE_ARGS=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33"
 USE_LDCONFIG=	yes

Modified: head/graphics/openshadinglanguage/distinfo
==============================================================================
--- head/graphics/openshadinglanguage/distinfo	Tue Jun  3 08:21:05 2014	(r356307)
+++ head/graphics/openshadinglanguage/distinfo	Tue Jun  3 08:25:07 2014	(r356308)
@@ -1,2 +1,2 @@
-SHA256 (openshadinglanguage-1.4.0.tar.gz) = 866bddfcaed7938a5ca61a7477e60ce7ae899b33d207a5faa7fd46cc72055f69
-SIZE (openshadinglanguage-1.4.0.tar.gz) = 11513652
+SHA256 (openshadinglanguage-1.4.2.tar.gz) = c1b20727c9dcfe35c6608e433ff89a73ce8bf4a184598e9bcaae7d09fb6e66ca
+SIZE (openshadinglanguage-1.4.2.tar.gz) = 11527572

More information about the svn-ports-all mailing list