Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2020 02:19:36 +0000 (UTC)
From:      =?UTF-8?Q?Alexandre_C=2e_Guimar=c3=a3es?= <rigoletto@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r526948 - in head/graphics/openimageio: . files
Message-ID:  <202002240219.01O2JaCZ004174@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rigoletto
Date: Mon Feb 24 02:19:35 2020
New Revision: 526948
URL: https://svnweb.freebsd.org/changeset/ports/526948

Log:
  graphics/openimageio: Update to 2.1.11.2
  
  PR:		244188
  Submitted by:	Shane <FreeBSD@ShaneWare.Biz> (maintainer)
  Approved by:	tcberner (mentor, implicit)
  Relnotes:	https://github.com/OpenImageIO/oiio/blob/master/CHANGES.md

Deleted:
  head/graphics/openimageio/files/patch-src_libOpenImageIO_CMakeLists.txt
Modified:
  head/graphics/openimageio/Makefile
  head/graphics/openimageio/distinfo
  head/graphics/openimageio/pkg-plist

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Sun Feb 23 23:20:31 2020	(r526947)
+++ head/graphics/openimageio/Makefile	Mon Feb 24 02:19:35 2020	(r526948)
@@ -3,8 +3,7 @@
 
 PORTNAME=	openimageio
 DISTVERSIONPREFIX=	Release-
-DISTVERSION=	2.0.10
-PORTREVISION=	7
+DISTVERSION=	2.1.11.2
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -14,9 +13,11 @@ LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libheif.so:graphics/libheif \
 		libImath.so:graphics/ilmbase \
 		libIlmImf.so:graphics/openexr \
 		libpng.so:graphics/png \
+		libsquish.so:graphics/squish \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libhdf5.so:science/hdf5
@@ -30,7 +31,8 @@ GH_PROJECT=	oiio
 CONFLICTS=	fbm-[0-9]*
 
 CMAKE_ARGS=	USE_CPP:STRING=11
-CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL
+CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
+		STOP_ON_WARNING USE_OPENSSL
 
 OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \
 			OPENCV OPENJPEG RAW TBB TEST TOOLS VDB
@@ -90,7 +92,9 @@ VDB_DESC=		OpenVDB support
 VDB_CMAKE_BOOL=		USE_OPENVDB
 VDB_LIB_DEPENDS=	libopenvdb.so:misc/openvdb
 
-PLIST_SUB+=		LIBVERS=${PORTVERSION}
+# DISTVERSION has an extra digit which isn't in the lib name
+# for LIBVERS we want the first three digits
+PLIST_SUB+=	LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/}
 
 .include <bsd.port.options.mk>
 
@@ -107,16 +111,16 @@ CMAKE_ARGS+=	-DPYTHON_VERSION:STRING=${PYTHON_VER} \
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	${INSTALL_LIB} ${BUILD_WRKSRC}/src/python/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${INSTALL_LIB} ${BUILD_WRKSRC}/lib/python/site-packages/OpenImageIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
 .else # SLAVE_PORT == no
 USE_LDCONFIG=	yes
 CMAKE_ON+=	DOIIO_BUILD_TOOLS
 CMAKE_OFF+=	USE_PYTHON
 
 post-install:
-	${LN} -sf libOpenImageIO.so.2.0 \
+	${LN} -sf libOpenImageIO.so.2.1 \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.2
-	${LN} -sf libOpenImageIO_Util.so.2.0 \
+	${LN} -sf libOpenImageIO_Util.so.2.1 \
 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2
 
 do-test-TEST-on:

Modified: head/graphics/openimageio/distinfo
==============================================================================
--- head/graphics/openimageio/distinfo	Sun Feb 23 23:20:31 2020	(r526947)
+++ head/graphics/openimageio/distinfo	Mon Feb 24 02:19:35 2020	(r526948)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564901711
-SHA256 (OpenImageIO-oiio-Release-2.0.10_GH0.tar.gz) = b9c4cb3754cfcf2b03707331c23d5b799a185deccbbc7b8768e0d4e10a535375
-SIZE (OpenImageIO-oiio-Release-2.0.10_GH0.tar.gz) = 29841455
+TIMESTAMP = 1581847788
+SHA256 (OpenImageIO-oiio-Release-2.1.11.2_GH0.tar.gz) = 0982f46a6a3107045c06ca825cc1637e023d7e7f16075523a85b10de9acedf55
+SIZE (OpenImageIO-oiio-Release-2.1.11.2_GH0.tar.gz) = 29027505

Modified: head/graphics/openimageio/pkg-plist
==============================================================================
--- head/graphics/openimageio/pkg-plist	Sun Feb 23 23:20:31 2020	(r526947)
+++ head/graphics/openimageio/pkg-plist	Mon Feb 24 02:19:35 2020	(r526948)
@@ -8,6 +8,7 @@
 include/OpenImageIO/argparse.h
 include/OpenImageIO/array_view.h
 include/OpenImageIO/atomic.h
+include/OpenImageIO/attrdelegate.h
 include/OpenImageIO/benchmark.h
 include/OpenImageIO/color.h
 include/OpenImageIO/dassert.h
@@ -34,7 +35,6 @@ include/OpenImageIO/imageio.h
 include/OpenImageIO/missing_math.h
 include/OpenImageIO/oiioversion.h
 include/OpenImageIO/optparser.h
-include/OpenImageIO/osdep.h
 include/OpenImageIO/parallel.h
 include/OpenImageIO/paramlist.h
 include/OpenImageIO/platform.h
@@ -63,17 +63,20 @@ include/OpenImageIO/varyingref.h
 include/OpenImageIO/version.h
 lib/libOpenImageIO.so
 lib/libOpenImageIO.so.2
-lib/libOpenImageIO.so.2.0
+lib/libOpenImageIO.so.2.1
 lib/libOpenImageIO.so.%%LIBVERS%%
 lib/libOpenImageIO_Util.so
 lib/libOpenImageIO_Util.so.2
-lib/libOpenImageIO_Util.so.2.0
+lib/libOpenImageIO_Util.so.2.1
 lib/libOpenImageIO_Util.so.%%LIBVERS%%
 libdata/pkgconfig/OpenImageIO.pc
 share/cmake/Modules/FindOpenImageIO.cmake
+lib/cmake/OpenImageIO/OpenImageIOConfig.cmake
+lib/cmake/OpenImageIO/OpenImageIOConfigVersion.cmake
+lib/cmake/OpenImageIO/OpenImageIOTargets-release.cmake
+lib/cmake/OpenImageIO/OpenImageIOTargets.cmake
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-1.x.md
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE-THIRD-PARTY.md
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
-%%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf



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