Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/graphics/openimageio/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/graphics/openimageio/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.46 retrieving revision 1.53 diff -u -p -r1.46 -r1.53 --- pkgsrc/graphics/openimageio/Makefile 2018/03/12 11:15:37 1.46 +++ pkgsrc/graphics/openimageio/Makefile 2018/12/13 19:51:35 1.53 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2018/03/12 11:15:37 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2018/12/13 19:51:35 adam Exp $ -OIIOVER= 1.5.16 +OIIOVER= 1.8.15 DISTNAME= oiio-Release-${OIIOVER} PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/} -PKGREVISION= 10 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz @@ -13,16 +13,22 @@ COMMENT= OpenImageIO is a library for re LICENSE= modified-bsd USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_TOOLS+= gmake +OBJDIR= ../build +CONFIGURE_DIRS= ${OBJDIR} +CMAKE_ARG_PATH= ${WRKSRC} + CXXFLAGS.Linux+= -pthread CMAKE_ARGS+= -DILMBASE_HOME:STRING=${BUILDLINK_PREFIX.ilmbase} -CMAKE_ARGS+= -DOPENJPEG_HOME:STRING=${BUILDLINK_PREFIX.openjpeg15} +CMAKE_ARGS+= -DOPENJPEG_HOME:STRING=${BUILDLINK_PREFIX.openjpeg} CMAKE_ARGS+= -DOPENEXR_HOME:STRING=${BUILDLINK_PREFIX.openexr} CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=OFF CMAKE_ARGS+= -DUSE_LIBRAW:BOOL=OFF +CMAKE_ARGS+= -DUSE_OCIO:BOOL=OFF +CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF # For redefinition of _rotl macro. BUILDLINK_TRANSFORM+= rm:-Werror @@ -34,17 +40,18 @@ BUILDLINK_TRANSFORM+= rm:-Werror .include "../../graphics/ilmbase/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/opencv/buildlink3.mk" -.include "../../graphics/openjpeg15/buildlink3.mk" +.include "../../graphics/openjpeg/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" -.include "../../x11/qt4-libs/buildlink3.mk" -BUILDLINK_DEPMETHOD.qt4-tools= build -.include "../../x11/qt4-tools/buildlink3.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) CXXFLAGS+= -Wno-deprecated-register .endif +pre-configure: + ${MKDIR} ${WRKDIR}/build + .include "../../mk/bsd.pkg.mk"