Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Nov 2015 11:47:13 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402355 - in head/graphics: openimageio py-openimageio
Message-ID:  <201511241147.tAOBlDjC076051@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Nov 24 11:47:13 2015
New Revision: 402355
URL: https://svnweb.freebsd.org/changeset/ports/402355

Log:
  - Allow to build OpenImageIO without OpenCV, JPEG 2000, and TrueType support
  - Turn off FFMPEG option by default; fix spelling of "FFmpeg" and "Color"
  - Make sure that `graphics/py-openimageio' slave port remains optionless
  - While here, wrap couple of long lines and beautify port description text
  
  OpenCV and FFMPEG are heavy dependencies, while these features might not even
  be used in consumer ports (e.g. blender, luxrender, and appleseed).  More to
  it, OpenCV is broken on PowerPC, which prevents building any consumer ports.
  
  Approved by:	maintainer

Modified:
  head/graphics/openimageio/Makefile
  head/graphics/openimageio/pkg-descr
  head/graphics/py-openimageio/Makefile

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Tue Nov 24 10:56:34 2015	(r402354)
+++ head/graphics/openimageio/Makefile	Tue Nov 24 11:47:13 2015	(r402355)
@@ -28,13 +28,14 @@ CMAKE_ARGS=	-DBUILDSTATIC:BOOL=OFF \
 		-DUSE_OPENSSL:BOOL=OFF
 CXXFLAGS+=	-D__STDC_CONSTANT_MACROS
 
-OPTIONS_DEFINE=		DOCS FFMPEG GIF IMAGEVIEWER OCIO RAW TEST
-OPTIONS_DEFAULT=	OCIO FFMPEG GIF
+OPTIONS_DEFINE=		DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO OPENCV \
+			OPENJPEG RAW TEST
+OPTIONS_DEFAULT=	FREETYPE GIF OCIO OPENJPEG
 OPTIONS_SUB=		yes
 
-FFMPEG_DESC=		Use ffmpeg to support extra file types
-IMAGEVIEWER_DESC=	Build image viewer
-OCIO_DESC=		Colour management support
+FFMPEG_DESC=		Use FFmpeg to support extra file types
+IMAGEVIEWER_DESC=	Build image viewer (requires Qt)
+OCIO_DESC=		Color management support
 
 DOCS_CMAKE_ON=		-DINSTALL_DOCS:BOOL=ON
 DOCS_CMAKE_OFF=		-DINSTALL_DOCS:BOOL=OFF
@@ -43,6 +44,10 @@ FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
 FFMPEG_LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
 
+FREETYPE_CMAKE_ON=	-DUSE_FREETYPE:BOOL=ON
+FREETYPE_CMAKE_OFF=	-DUSE_FREETYPE:BOOL=OFF
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+
 GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
 GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
 GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
@@ -51,6 +56,14 @@ OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
 OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
 OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
 
+OPENCV_CMAKE_ON=	-DUSE_OPENCV:BOOL=ON
+OPENCV_CMAKE_OFF=	-DUSE_OPENCV:BOOL=OFF
+OPENCV_LIB_DEPENDS=	libopencv_highgui.so:${PORTSDIR}/graphics/opencv
+
+OPENJPEG_CMAKE_ON=	-DUSE_OPENJPEG:BOOL=ON
+OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+
 RAW_CMAKE_ON=		-DUSE_LIBRAW:BOOL=ON
 RAW_CMAKE_OFF=		-DUSE_LIBRAW:BOOL=OFF
 RAW_LIB_DEPENDS=	libraw_r.so:${PORTSDIR}/graphics/libraw
@@ -66,8 +79,6 @@ PLIST_SUB+=		LIBVERS=${PORTVERSION}
 LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
-		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
 		libwebp.so:${PORTSDIR}/graphics/webp
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=OFF -DUSE_PYTHON3:BOOL=OFF \
@@ -96,8 +107,10 @@ post-patch:
 
 post-install:
 .if ${SLAVE_PORT} == no
-	${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
+	${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 <bsd.port.mk>

Modified: head/graphics/openimageio/pkg-descr
==============================================================================
--- head/graphics/openimageio/pkg-descr	Tue Nov 24 10:56:34 2015	(r402354)
+++ head/graphics/openimageio/pkg-descr	Tue Nov 24 11:47:13 2015	(r402355)
@@ -4,7 +4,7 @@ related classes, utilities, and applicat
 There is a particular emphasis on formats and functionality used
 in professional, large-scale animation and visual effects work for film.
 
-OpenImageIO is used extensively in animation and VFX studios all over the world,
-and is also incorporated into several commercial products.
+OpenImageIO is used extensively in animation and VFX studios all over the
+world, and is also incorporated into several commercial products.
 
-WWW: http://www.openimageio.org
+WWW: http://www.openimageio.org/

Modified: head/graphics/py-openimageio/Makefile
==============================================================================
--- head/graphics/py-openimageio/Makefile	Tue Nov 24 10:56:34 2015	(r402354)
+++ head/graphics/py-openimageio/Makefile	Tue Nov 24 11:47:13 2015	(r402355)
@@ -7,7 +7,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 COMMENT=	OpenImageIO python bindings
 
 MASTERDIR=	${.CURDIR}/../openimageio
-OPTIONS_EXCLUDE=DOCS FFMPEG GIF IMAGEVIEWER OCIO RAW TEST
+OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}



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