Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Nov 2015 12:22:02 +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: r402357 - head/graphics/openimageio
Message-ID:  <201511241222.tAOCM2C7087663@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Nov 24 12:22:02 2015
New Revision: 402357
URL: https://svnweb.freebsd.org/changeset/ports/402357

Log:
  Bump port revision that should've been part of r402355 (given a chance to
  touch Makefile again, convert IMAGEVIEWER option to helper knobs).

Modified:
  head/graphics/openimageio/Makefile

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Tue Nov 24 11:48:16 2015	(r402356)
+++ head/graphics/openimageio/Makefile	Tue Nov 24 12:22:02 2015	(r402357)
@@ -4,7 +4,7 @@
 PORTNAME=	openimageio
 PORTVERSION=	1.5.20
 DISTVERSIONPREFIX=	Release-
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -52,6 +52,10 @@ GIF_CMAKE_ON=		-DUSE_GIF:BOOL=ON
 GIF_CMAKE_OFF=		-DUSE_GIF:BOOL=OFF
 GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 
+IMAGEVIEWER_CMAKE_ON=	-DUSE_QT:BOOL=ON -DUSE_OPENGL:BOOL=ON
+IMAGEVIEWER_CMAKE_OFF=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
+IMAGEVIEWER_USE=	GL=glew QT4=corelib,gui,opengl,qmake_build,moc_build,rcc_build,uic_build
+
 OCIO_CMAKE_ON=		-DUSE_OCIO:BOOL=ON
 OCIO_CMAKE_OFF=		-DUSE_OCIO:BOOL=OFF
 OCIO_LIB_DEPENDS=	libOpenColorIO.so:${PORTSDIR}/graphics/opencolorio
@@ -93,14 +97,6 @@ CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DUSE_
 		-DOIIO_BUILD_TOOLS:BOOL=OFF
 .endif
 
-.if ${PORT_OPTIONS:MIMAGEVIEWER}
-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
-.else
-CMAKE_ARGS+=	-DUSE_OPENGL:BOOL=OFF -DUSE_QT:BOOL=OFF
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc/OpenImageIO|${DOCSDIR}|g' \
 		${WRKSRC}/CMakeLists.txt



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