Date: Tue, 29 Oct 2013 23:02:04 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332021 - in head/graphics: openimageio openimageio/files py-openimageio Message-ID: <201310292302.r9TN24uZ076765@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Oct 29 23:02:03 2013 New Revision: 332021 URL: http://svnweb.freebsd.org/changeset/ports/332021 Log: - Update to 1.2.2. - Fix build with libc++. - Support staging. - Move bits from py-openimageio to openimageio. PR: ports/182007 Submitted by: Shane Ambler <FreeBSD@ShaneWare.Biz> (maintainer) Added: head/graphics/openimageio/files/patch-include_pugixml.hpp (contents, props changed) head/graphics/openimageio/files/patch-include_sysutil.h (contents, props changed) Modified: head/graphics/openimageio/Makefile head/graphics/openimageio/distinfo head/graphics/openimageio/pkg-plist head/graphics/openimageio/pkg-plist-pybind head/graphics/py-openimageio/Makefile Directory Properties: head/graphics/openimageio/pkg-descr (props changed) Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Tue Oct 29 22:33:41 2013 (r332020) +++ head/graphics/openimageio/Makefile Tue Oct 29 23:02:03 2013 (r332021) @@ -1,63 +1,59 @@ # Created by: Shane Ambler <FreeBSD@Shaneware.biz> # $FreeBSD$ -PORTNAME?= openimageio -PORTVERSION= 1.2.1 -PORTREVISION?= 1 +PORTNAME= openimageio +PORTVERSION= 1.2.2 +PORTREVISION?= 0 CATEGORIES?= graphics multimedia -MAINTAINER= FreeBSD@Shaneware.biz -COMMENT= OpenImageIO graphics library +MAINTAINER?= FreeBSD@Shaneware.biz +COMMENT?= OpenImageIO graphics library -LICENSE?= BSD - -LIB_DEPENDS?= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ - libboost_thread.so:${PORTSDIR}/devel/boost-libs \ - libhdf5.so:${PORTSDIR}/science/hdf5-18 \ - libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ - libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \ - libwebp.so:${PORTSDIR}/graphics/webp +LICENSE= BSD USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio GH_TAGNAME= Release-${PORTVERSION} -GH_COMMIT= f7908a3 +GH_COMMIT= f9d8f1b WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src # fbm also installs bin/idiff CONFLICTS= fbm-[0-9]* USES= cmake:outsource -CMAKE_ARGS?= -DBUILDSTATIC:BOOL=OFF \ +CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \ -DLINKSTATIC:BOOL=OFF \ -DNOTHREADS:BOOL=OFF \ -DUSE_TBB:BOOL=OFF \ -DSTOP_ON_WARNING:BOOL=OFF -USE_LDCONFIG= yes - -.if defined(OIIO_PYBIND) -PLIST= ${PKGDIR}/pkg-plist-pybind -CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -CMAKE_ARGS+= -DOIIO_BUILD_TOOLS:BOOL=OFF -.else -PLIST= ${PKGDIR}/pkg-plist -CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -CMAKE_ARGS+= -DOIIO_BUILD_TOOLS:BOOL=ON -.endif - -.if !defined(OIIO_PYBIND) OPTIONS_DEFINE= DOCS IMAGEVIEWER OCIO -OPTIONS_DEFAULT= DOCS IMAGEVIEWER OCIO +OPTIONS_DEFAULT= IMAGEVIEWER OCIO +OPTIONS_SUB= yes IMAGEVIEWER_DESC= Build image viewer OCIO_DESC= Colour management support -.endif -NO_STAGE= yes .include <bsd.port.options.mk> +.if ${SLAVE_PORT} == no +LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libboost_thread.so:${PORTSDIR}/devel/boost-libs \ + libhdf5.so:${PORTSDIR}/science/hdf5-18 \ + libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ + libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \ + libwebp.so:${PORTSDIR}/graphics/webp +USE_LDCONFIG= yes +CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON +.else +LIB_DEPENDS= libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \ + libboost_python.so:${PORTSDIR}/devel/boost-python-libs +USE_PYTHON= 2.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 @@ -69,22 +65,20 @@ USE_GL= glew USE_QT4= corelib gui opengl qmake_build moc_build rcc_build uic_build CMAKE_ARGS+= -DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON CMAKE_ENV+= QTDIR=${QT_PREFIX} QT_INCLUDES=${QT_INCDIR} -PLIST_SUB+= IMAGEVIEWER="" .else CMAKE_ARGS+= -DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF -PLIST_SUB+= IMAGEVIEWER="@comment " .endif .if ${PORT_OPTIONS:MOCIO} CMAKE_ARGS+= -DUSE_OCIO:BOOL=ON -LIB_DEPENDS+= OpenColorIO:${PORTSDIR}/graphics/opencolorio +LIB_DEPENDS+= libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio .else CMAKE_ARGS+= -DUSE_OCIO:BOOL=OFF .endif post-install: -.if !defined(OIIO_PYBIND) - cd ${PREFIX}/lib && ${LN} -sf libOpenImageIO.so.1.2 libOpenImageIO.so.1 +.if ${SLAVE_PORT} == no + ${LN} -sf libOpenImageIO.so.1.2 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1 .endif .include <bsd.port.mk> Modified: head/graphics/openimageio/distinfo ============================================================================== --- head/graphics/openimageio/distinfo Tue Oct 29 22:33:41 2013 (r332020) +++ head/graphics/openimageio/distinfo Tue Oct 29 23:02:03 2013 (r332021) @@ -1,2 +1,2 @@ -SHA256 (openimageio-1.2.1.tar.gz) = 030f4247c2c2a576f5611989bf656baf502f3bfaeb6e9ae37f3b5d3a5e5c97b7 -SIZE (openimageio-1.2.1.tar.gz) = 12380093 +SHA256 (openimageio-1.2.2.tar.gz) = 85891b3cac5bcc724ec42b1f46ff990f84ecc3887dd04743ad38961efacf2414 +SIZE (openimageio-1.2.2.tar.gz) = 12383666 Added: head/graphics/openimageio/files/patch-include_pugixml.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-include_pugixml.hpp Tue Oct 29 23:02:03 2013 (r332021) @@ -0,0 +1,25 @@ +--- include/pugixml.hpp.orig 2013-09-30 19:25:21.000000000 +0200 ++++ include/pugixml.hpp 2013-10-27 20:41:36.000000000 +0100 +@@ -27,22 +27,6 @@ + { + struct bidirectional_iterator_tag; + +-#ifdef __SUNPRO_CC +- // Sun C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions +- template <class _T> class allocator; +- template <class _charT> struct char_traits; +- template <class _charT, class _Traits> class basic_istream; +- template <class _charT, class _Traits> class basic_ostream; +- template <class _charT, class _Traits, class _Allocator> class basic_string; +-#else +- // Borland C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions +- template <class _Ty> class allocator; +- template <class _Ty> struct char_traits; +- template <class _Elem, class _Traits> class basic_istream; +- template <class _Elem, class _Traits> class basic_ostream; +- template <class _Elem, class _Traits, class _Ax> class basic_string; +-#endif +- + // Digital Mars compiler has a bug which requires a forward declaration for explicit instantiation (otherwise type selection is messed up later, producing link errors) + // Also note that we have to declare char_traits as a class here, since it's defined that way + #ifdef __DMC__ Added: head/graphics/openimageio/files/patch-include_sysutil.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-include_sysutil.h Tue Oct 29 23:02:03 2013 (r332021) @@ -0,0 +1,10 @@ +--- include/sysutil.h.orig 2013-09-24 15:26:10.604215091 +0930 ++++ include/sysutil.h 2013-09-24 15:26:16.727214989 +0930 +@@ -41,6 +41,7 @@ + #define OPENIMAGEIO_SYSUTIL_H + + #include <string> ++#include <time.h> + + #ifdef __MINGW32__ + #include <malloc.h> // for alloca Modified: head/graphics/openimageio/pkg-plist ============================================================================== --- head/graphics/openimageio/pkg-plist Tue Oct 29 22:33:41 2013 (r332020) +++ head/graphics/openimageio/pkg-plist Tue Oct 29 23:02:03 2013 (r332021) @@ -39,7 +39,7 @@ include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.1 lib/libOpenImageIO.so.1.2 -lib/libOpenImageIO.so.1.2.1 +lib/libOpenImageIO.so.1.2.2 %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf Modified: head/graphics/openimageio/pkg-plist-pybind ============================================================================== --- head/graphics/openimageio/pkg-plist-pybind Tue Oct 29 22:33:41 2013 (r332020) +++ head/graphics/openimageio/pkg-plist-pybind Tue Oct 29 23:02:03 2013 (r332021) @@ -1 +1,3 @@ %%PYTHON_SITELIBDIR%%/OpenImageIO.so +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% Modified: head/graphics/py-openimageio/Makefile ============================================================================== --- head/graphics/py-openimageio/Makefile Tue Oct 29 22:33:41 2013 (r332020) +++ head/graphics/py-openimageio/Makefile Tue Oct 29 23:02:03 2013 (r332021) @@ -1,26 +1,16 @@ # Created by: Shane Ambler # $FreeBSD$ -PORTNAME= openimageio -PORTREVISION= 1 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= OpenImageIO python bindings -LICENSE= BSD - -LIB_DEPENDS= OpenImageIO:${PORTSDIR}/graphics/openimageio \ - boost_python:${PORTSDIR}/devel/boost-python-libs - MASTERDIR= ${.CURDIR}/../openimageio +OPTIONS_EXCLUDE=DOCS IMAGEVIEWER OCIO -USE_PYTHON= 2.6+ - -OIIO_PYBIND= yes - -NO_STAGE= yes do-install: - ${INSTALL_LIB} ${BUILD_WRKSRC}/python/OpenImageIO.so ${PYTHON_SITELIBDIR}/ + @${MKDIR} -p ${STAGEDIR}${PYTHON_SITELIBDIR} + ${INSTALL_LIB} ${BUILD_WRKSRC}/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR} .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310292302.r9TN24uZ076765>