Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 May 2014 09:49:17 GMT
From:      Shane Ambler <FreeBSD@Shaneware.biz>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/190254: [maintainer update] for graphics/openimageio
Message-ID:  <201405260949.s4Q9nHn3008037@cgiserv.freebsd.org>
Resent-Message-ID: <201405260950.s4Q9o0Y7001770@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         190254
>Category:       ports
>Synopsis:       [maintainer update] for graphics/openimageio
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 26 09:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Shane Ambler
>Release:        9.2-RELEASE
>Organization:
>Environment:
FreeBSD leader.local 9.2-RELEASE-p6 FreeBSD 9.2-RELEASE-p6 #7 r266580: Sat May 24 19:49:09 CST 2014     root@leader.local:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Update graphics/openimageio to v1.4.8
Also adapt use of new options framework where available

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nru openimageio.orig/Makefile openimageio/Makefile
--- openimageio.orig/Makefile	2014-05-26 19:10:34.576535825 +0930
+++ openimageio/Makefile	2014-05-26 19:03:17.975535855 +0930
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openimageio
-PORTVERSION=	1.3.9
-PORTREVISION?=	3
+PORTVERSION=	1.4.8
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -15,7 +14,7 @@
 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 +23,25 @@
 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 +61,6 @@
 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 +70,14 @@
 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>
diff -Nru openimageio.orig/distinfo openimageio/distinfo
--- openimageio.orig/distinfo	2014-05-26 19:10:34.576535825 +0930
+++ openimageio/distinfo	2014-05-25 21:01:19.951536380 +0930
@@ -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
diff -Nru openimageio.orig/pkg-plist openimageio/pkg-plist
--- openimageio.orig/pkg-plist	2014-05-26 19:10:34.576535825 +0930
+++ openimageio/pkg-plist	2014-05-26 18:58:07.462536720 +0930
@@ -9,6 +9,15 @@
 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/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


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405260949.s4Q9nHn3008037>