From owner-svn-ports-head@freebsd.org Wed Jul 8 16:45:22 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97B1C996DE3; Wed, 8 Jul 2015 16:45:22 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 871AA1D20; Wed, 8 Jul 2015 16:45:22 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t68GjMwB013338; Wed, 8 Jul 2015 16:45:22 GMT (envelope-from mva@FreeBSD.org) Received: (from mva@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t68GjLc2013316; Wed, 8 Jul 2015 16:45:21 GMT (envelope-from mva@FreeBSD.org) Message-Id: <201507081645.t68GjLc2013316@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mva set sender to mva@FreeBSD.org using -f From: Marcus von Appen Date: Wed, 8 Jul 2015 16:45:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391571 - in head/graphics/openimageio: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2015 16:45:22 -0000 Author: mva Date: Wed Jul 8 16:45:20 2015 New Revision: 391571 URL: https://svnweb.freebsd.org/changeset/ports/391571 Log: - Update to version 1.5.16 OpenImageIO 1.5 comes with many new features and bug fixes: * lots of new functions for image handling (API and command line tools), such as rotations, median filters, matrix transformations * new filters (cubic, rifman, simon, ...) * image metadata support (EXIF) * SIMD (SSE) instruction support to speed up processing images * basic movie file support via ffmpeg Changelog: https://github.com/OpenImageIO/oiio/blob/RB-1.5/CHANGES PR: 200818 Submitted by: Shane Ambler Added: head/graphics/openimageio/files/ head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h (contents, props changed) Modified: head/graphics/openimageio/Makefile head/graphics/openimageio/distinfo head/graphics/openimageio/pkg-plist Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Wed Jul 8 16:28:23 2015 (r391570) +++ head/graphics/openimageio/Makefile Wed Jul 8 16:45:20 2015 (r391571) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= openimageio -PORTVERSION= 1.4.15 +PORTVERSION= 1.5.16 DISTVERSIONPREFIX= Release- -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -23,42 +23,63 @@ USES= cmake:outsource CMAKE_ARGS= -DBUILDSTATIC:BOOL=OFF \ -DLINKSTATIC:BOOL=OFF \ -DNOTHREADS:BOOL=OFF \ - -DSTOP_ON_WARNING:BOOL=OFF + -DSTOP_ON_WARNING:BOOL=OFF \ + -DUSE_CPP11:BOOL=OFF \ + -DUSE_OPENSSL:BOOL=OFF +CXXFLAGS+= -D__STDC_CONSTANT_MACROS -OPTIONS_DEFINE= DOCS IMAGEVIEWER OCIO TEST -OPTIONS_DEFAULT= OCIO +OPTIONS_DEFINE= DOCS FFMPEG GIF IMAGEVIEWER OCIO RAW TEST +OPTIONS_DEFAULT= OCIO FFMPEG GIF OPTIONS_SUB= yes +FFMPEG_DESC= Use ffmpeg to support extra file types IMAGEVIEWER_DESC= Build image viewer OCIO_DESC= Colour management support DOCS_CMAKE_ON= -DINSTALL_DOCS:BOOL=ON DOCS_CMAKE_OFF= -DINSTALL_DOCS:BOOL=OFF +FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON +FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF +FFMPEG_LIB_DEPENDS= libavutil.so:${PORTSDIR}/multimedia/ffmpeg + +GIF_CMAKE_ON= -DUSE_GIF:BOOL=ON +GIF_CMAKE_OFF= -DUSE_GIF:BOOL=OFF +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib + OCIO_CMAKE_ON= -DUSE_OCIO:BOOL=ON OCIO_CMAKE_OFF= -DUSE_OCIO:BOOL=OFF OCIO_LIB_DEPENDS= libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio +RAW_CMAKE_ON= -DUSE_LIBRAW:BOOL=ON +RAW_CMAKE_OFF= -DUSE_LIBRAW:BOOL=OFF +RAW_LIB_DEPENDS= libraw_r.so:${PORTSDIR}/graphics/libraw + TEST_CMAKE_ON= -DOIIO_BUILD_TESTS:BOOL=ON TEST_CMAKE_OFF= -DOIIO_BUILD_TESTS:BOOL=OFF +PLIST_SUB+= LIBVERS=${PORTVERSION} + .include .if ${SLAVE_PORT} == no -LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ +LIB_DEPENDS+= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libhdf5.so:${PORTSDIR}/science/hdf5 \ libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libwebp.so:${PORTSDIR}/graphics/webp USE_LDCONFIG= yes -CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON +CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \ + -DOIIO_BUILD_TOOLS:BOOL=ON .else LIB_DEPENDS= libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \ libboost_python.so:${PORTSDIR}/devel/boost-python-libs -USES+= python PLIST= ${PKGDIR}/pkg-plist-pybind -CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DOIIO_BUILD_TOOLS:BOOL=OFF +#while oiio supports py3, ports doesn't have py3 support for boost-python yet +USES+= python:2 +CMAKE_ARGS+= -DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \ + -DOIIO_BUILD_TOOLS:BOOL=OFF .endif .if ${PORT_OPTIONS:MIMAGEVIEWER} @@ -76,8 +97,8 @@ post-patch: post-install: .if ${SLAVE_PORT} == no - ${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 + ${LN} -sf libOpenImageIO.so.1.5 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1 + ${LN} -sf libOpenImageIO_Util.so.1.5 ${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1 .endif .include Modified: head/graphics/openimageio/distinfo ============================================================================== --- head/graphics/openimageio/distinfo Wed Jul 8 16:28:23 2015 (r391570) +++ head/graphics/openimageio/distinfo Wed Jul 8 16:45:20 2015 (r391571) @@ -1,2 +1,2 @@ -SHA256 (OpenImageIO-oiio-Release-1.4.15_GH0.tar.gz) = 3554b649b9c3cf4c2d61e419b6d4ab4575000994192464bd0f725a9489f8a816 -SIZE (OpenImageIO-oiio-Release-1.4.15_GH0.tar.gz) = 17551912 +SHA256 (OpenImageIO-oiio-Release-1.5.16_GH0.tar.gz) = 6c676ae5ddc3b2a8f8d37b521c670d8b3f82d1af583801027d44cf61e1550d6b +SIZE (OpenImageIO-oiio-Release-1.5.16_GH0.tar.gz) = 23136543 Added: head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-src_include_OpenImageIO_simd.h Wed Jul 8 16:45:20 2015 (r391571) @@ -0,0 +1,15 @@ +--- src/include/OpenImageIO/simd.h.orig 2015-06-23 11:59:51 UTC ++++ src/include/OpenImageIO/simd.h +@@ -52,8 +52,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #if (defined(__SSE2__) || (_MSC_VER >= 1300 && !_M_CEE_PURE)) && !defined(OIIO_NO_SSE) + # include + # include +-# if defined(__SSE3__) || defined(__SSSE3__) ++# if defined(__SSE3__) + # include ++# endif ++# if defined(__SSSE3__) + # include + # endif + # if (defined(__SSE4_1__) || defined(__SSE4_2__)) + Modified: head/graphics/openimageio/pkg-plist ============================================================================== --- head/graphics/openimageio/pkg-plist Wed Jul 8 16:28:23 2015 (r391570) +++ head/graphics/openimageio/pkg-plist Wed Jul 8 16:45:20 2015 (r391571) @@ -21,6 +21,7 @@ include/OpenImageIO/imagebufalgo_util.h include/OpenImageIO/imagebufalgo.h include/OpenImageIO/imagecache.h include/OpenImageIO/imageio.h +include/OpenImageIO/missing_math.h include/OpenImageIO/oiioversion.h include/OpenImageIO/optparser.h include/OpenImageIO/osdep.h @@ -32,6 +33,7 @@ include/OpenImageIO/pugixml.cpp include/OpenImageIO/pugixml.hpp include/OpenImageIO/refcnt.h include/OpenImageIO/SHA1.h +include/OpenImageIO/simd.h include/OpenImageIO/strided_ptr.h include/OpenImageIO/string_ref.h include/OpenImageIO/string_view.h @@ -49,12 +51,12 @@ include/OpenImageIO/varyingref.h include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.1 -lib/libOpenImageIO.so.1.4 -lib/libOpenImageIO.so.1.4.15 +lib/libOpenImageIO.so.1.5 +lib/libOpenImageIO.so.%%LIBVERS%% lib/libOpenImageIO_Util.so lib/libOpenImageIO_Util.so.1 -lib/libOpenImageIO_Util.so.1.4 -lib/libOpenImageIO_Util.so.1.4.15 +lib/libOpenImageIO_Util.so.1.5 +lib/libOpenImageIO_Util.so.%%LIBVERS%% %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf