svn commit: r455862 - head/graphics/appleseed

[Alexey Dokuchaev]

Author: danfe
Date: Sat Dec  9 14:40:43 2017
New Revision: 455862
URL: https://svnweb.freebsd.org/changeset/ports/455862

Log:
  - Allow to build without appleseed.studio (Qt-based GUI program), this
    makes setting up headless render boxes easier
  - Remove previously optional dependency on `graphics/openimageio' when
    building with Disney material support: since r455830, OSL support is
    mandatory, and OSL depends on `graphics/openimageio' unconditionally
  - Correct dependency on `graphics/seexpr': only appleseed.studio links
    to libSeExprEditor.so, while both programs link to libSeExpr.so (our
    SeExpr package always provides both libraries anyways)

Modified:
  head/graphics/appleseed/Makefile
  head/graphics/appleseed/pkg-plist

Modified: head/graphics/appleseed/Makefile
==============================================================================
--- head/graphics/appleseed/Makefile	Sat Dec  9 14:05:08 2017	(r455861)
+++ head/graphics/appleseed/Makefile	Sat Dec  9 14:40:43 2017	(r455862)
@@ -23,7 +23,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	not ported to it yet
 
 USES=		cmake:outsource compiler:env
-USE_QT4=	moc_build qmake_build rcc_build uic_build opengl
 
 LDFLAGS+=	-lboost_atomic
 CMAKE_ARGS=	-DUSE_STATIC_BOOST:BOOL=OFF -DUSE_STATIC_OIIO:BOOL=OFF \
@@ -42,20 +41,23 @@ PLIST_SUB=	APPHOME=${CMAKE_INSTALL_PREFIX}
 SUB_FILES=	pkg-message
 SUB_LIST:=	${PLIST_SUB}
 
-OPTIONS_DEFINE=	CPP11 EXAMPLES DISNEY
-OPTIONS_DEFAULT=	DISNEY
+OPTIONS_DEFINE=	CPP11 EXAMPLES DISNEY STUDIO
+OPTIONS_DEFAULT=	DISNEY STUDIO
 OPTIONS_SUB=	yes
 
 CPP11_DESC=	Build in C++11 mode
 DISNEY_DESC=	Disney material support
+STUDIO_DESC=	Build appleseed.studio (Qt-based GUI program)
 
 CPP11_CMAKE_ON=	-DUSE_CPP11:BOOL=ON
 
 EXAMPLES_CMAKE_OFF=	-DWITH_SAMPLES:BOOL=OFF
 
+DISNEY_LIB_DEPENDS=	libSeExpr.so:graphics/seexpr
 DISNEY_CMAKE_ON=	-DWITH_DISNEY_MATERIAL:BOOL=ON
-DISNEY_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
-			libSeExprEditor.so:graphics/seexpr
+
+STUDIO_USE=	QT4=moc_build,qmake_build,rcc_build,uic_build,opengl
+STUDIO_CMAKE_OFF=	-DWITH_STUDIO:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 

Modified: head/graphics/appleseed/pkg-plist
==============================================================================
--- head/graphics/appleseed/pkg-plist	Sat Dec  9 14:05:08 2017	(r455861)
+++ head/graphics/appleseed/pkg-plist	Sat Dec  9 14:40:43 2017	(r455862)
@@ -10,7 +10,7 @@ share/cmake/Modules/FindXerces.cmake
 @cwd %%APPHOME%%
 bin/animatecamera
 bin/appleseed.cli
-bin/appleseed.studio
+%%STUDIO%%bin/appleseed.studio
 bin/convertmany.py
 bin/convertmeshfile
 bin/dumpmetadata
@@ -100,14 +100,14 @@ lib/libappleseed.so
 %%PORTEXAMPLES%%samples/python/basic/output/preserve.txt
 schemas/project.xsd
 schemas/settings.xsd
-seexpr/clouds/blue_clouds.se
-seexpr/geometric/checkers.se
-seexpr/geometric/dots.se
-seexpr/gradients/horizontal.se
-seexpr/gradients/vertical.se
-seexpr/noise/fbm.se
-seexpr/noise/noise.se
-seexpr/noise/turbulence.se
+%%STUDIO%%seexpr/clouds/blue_clouds.se
+%%STUDIO%%seexpr/geometric/checkers.se
+%%STUDIO%%seexpr/geometric/dots.se
+%%STUDIO%%seexpr/gradients/horizontal.se
+%%STUDIO%%seexpr/gradients/vertical.se
+%%STUDIO%%seexpr/noise/fbm.se
+%%STUDIO%%seexpr/noise/noise.se
+%%STUDIO%%seexpr/noise/turbulence.se
 settings/appleseed.cli.xml
 settings/appleseed.studio.xml
 settings/appleseed.tools.xml