Index: head/graphics/appleseed/Makefile =================================================================== --- head/graphics/appleseed/Makefile (revision 454119) +++ head/graphics/appleseed/Makefile (revision 454120) @@ -1,68 +1,68 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= appleseed -DISTVERSION= 1.5.2-beta -PORTREVISION= 9 +DISTVERSION= 1.6.0-beta CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org COMMENT= Modern, physically-based production renderer LICENSE= MIT LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libpng.so:graphics/png \ libIlmImf.so:graphics/OpenEXR \ libxerces-c.so:textproc/xerces-c3 USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}hq ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= not ported to it yet USES= cmake:outsource 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 \ -DUSE_STATIC_OSL:BOOL=OFF -DWITH_DOXYGEN:BOOL=OFF \ -DWITH_HEADERS:BOOL=OFF -DWITH_PYTHON:BOOL=OFF \ -DWITH_TESTS:BOOL=OFF -DWARNINGS_AS_ERRORS:BOOL=OFF .for lib in EXR OIIO OSL PNG SEEXPR XERCES ZLIB CMAKE_ARGS+= -DUSE_EXTERNAL_${lib}:BOOL=ON .endfor # Not ready for hier(7)-conforming installation yet CMAKE_INSTALL_PREFIX= ${PREFIX}/${PKGBASE} PLIST_SUB= APPHOME=${CMAKE_INSTALL_PREFIX} SUB_FILES= pkg-message SUB_LIST:= ${PLIST_SUB} -OPTIONS_DEFINE= EXAMPLES OSL DISNEY +OPTIONS_DEFINE= CPP11 EXAMPLES OSL DISNEY OPTIONS_DEFAULT= DISNEY OPTIONS_SUB= yes +CPP11_DESC= Build in C++11 mode OSL_DESC= Open Shading Language support DISNEY_DESC= Disney material support +CPP11_CMAKE_ON= -DUSE_CPP11:BOOL=ON + EXAMPLES_CMAKE_OFF= -DWITH_SAMPLES:BOOL=OFF OSL_CMAKE_ON= -DWITH_OSL:BOOL=ON OSL_LIB_DEPENDS= liboslexec.so:graphics/openshadinglanguage # src/appleseed/libappleseed.so: undefined reference to `typeinfo for OSL::RendererServices' -OSL_BROKEN= fails to build against openshadinglanguage-1.8.10 +OSL_BROKEN= requires RTTI support in LLVM/OSL which is currently missing DISNEY_CMAKE_ON= -DWITH_DISNEY_MATERIAL:BOOL=ON DISNEY_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \ libSeExprEditor.so:graphics/seexpr post-patch: - @${REINPLACE_CMD} -e 's,atomic Index: head/graphics/appleseed/distinfo =================================================================== --- head/graphics/appleseed/distinfo (revision 454119) +++ head/graphics/appleseed/distinfo (revision 454120) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475224589 -SHA256 (appleseedhq-appleseed-1.5.2-beta_GH0.tar.gz) = b0e60d7f55ceca40e87af30315217df2bedb7e6c0f52612894158994ee8939f4 -SIZE (appleseedhq-appleseed-1.5.2-beta_GH0.tar.gz) = 116992420 +TIMESTAMP = 1481813859 +SHA256 (appleseedhq-appleseed-1.6.0-beta_GH0.tar.gz) = 16ec393f62c7f445a3e2719d69a093e789062a712b28583b78c6f56278e98626 +SIZE (appleseedhq-appleseed-1.6.0-beta_GH0.tar.gz) = 118483186 Index: head/graphics/appleseed/files/patch-CMakeLists.txt =================================================================== --- head/graphics/appleseed/files/patch-CMakeLists.txt (revision 454119) +++ head/graphics/appleseed/files/patch-CMakeLists.txt (revision 454120) @@ -1,82 +1,82 @@ ---- CMakeLists.txt.orig 2016-03-29 16:02:26 UTC +--- CMakeLists.txt.orig 2016-12-15 14:57:39 UTC +++ CMakeLists.txt -@@ -107,6 +107,10 @@ option (USE_EXTERNAL_ZLIB +@@ -107,6 +107,10 @@ option (USE_EXTERNAL_ZLIB "Use exter option (WITH_CLI "Build appleseed.cli" ON) option (WITH_STUDIO "Build appleseed.studio" ON) option (WITH_TOOLS "Build appleseed tools" ON) +option (WITH_DOXYGEN "Generate API Reference with Doxygen" ON) +option (WITH_SAMPLES "Intall sample files (require headers)" ON) +option (WITH_HEADERS "Intall header files (to build samples)" ON) +option (WITH_TESTS "Install unit tests and benchmarks" ON) option (WITH_PYTHON "Build Python bindings" ON) option (WITH_ALEMBIC "Build Alembic support" OFF) option (WITH_OSL "Build OSL support" OFF) -@@ -179,6 +183,9 @@ if (WITH_OSL) - ${PROJECT_SOURCE_DIR}/src/appleseed/renderer/kernel/shading/stdosl.h) +@@ -172,6 +176,9 @@ else () + "Edit ${CMAKE_CURRENT_LIST_FILE} to add support for it.") endif () +# XXX: avoid picking up lz4 headers from /usr/local/include == ${Boost_INCLUDE_DIRS} +# if `archivers/liblz4' port is installed. +include_directories (src/lz4) #-------------------------------------------------------------------------------------------------- - # Boost libraries. -@@ -285,7 +292,6 @@ endif () + # Auto-generate version headers. +@@ -297,7 +304,6 @@ endif () # Common include paths. include_directories ( src/appleseed - src/lz4 ${PYTHON_INCLUDE_DIRS} ) -@@ -601,7 +607,7 @@ endif () +@@ -643,7 +649,7 @@ endif () find_package (Doxygen) -if (DOXYGEN_FOUND) +if (DOXYGEN_FOUND AND WITH_DOXYGEN) configure_file (${PROJECT_SOURCE_DIR}/scripts/appleseed.doxyfile.in ${PROJECT_BINARY_DIR}/appleseed.doxyfile @ONLY) add_custom_target ( doc ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/appleseed.doxyfile -@@ -650,23 +656,33 @@ endif () +@@ -692,23 +698,33 @@ endif () install ( DIRECTORY sandbox/docs + DESTINATION . +) + +if (WITH_SAMPLES) +install ( + DIRECTORY sandbox/samples - sandbox/share DESTINATION . ) +endif () install ( - CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images)" - CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images/autosave)" + DIRECTORY + sandbox/share + DESTINATION .. ) +if (WITH_TESTS) install ( DIRECTORY "sandbox/tests/unit benchmarks" "sandbox/tests/unit tests" DESTINATION tests ) +endif () +if (WITH_HEADERS) install ( DIRECTORY src/appleseed/foundation DESTINATION include -@@ -684,3 +700,4 @@ install ( +@@ -726,3 +742,4 @@ install ( DESTINATION include FILES_MATCHING PATTERN "*.h" ) +endif () Index: head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h =================================================================== --- head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h (nonexistent) +++ head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h (revision 454120) @@ -0,0 +1,13 @@ +--- src/appleseed/foundation/platform/thread.h.orig 2016-12-15 14:57:39 UTC ++++ src/appleseed/foundation/platform/thread.h +@@ -296,9 +296,8 @@ class APPLESEED_DLLSYMBOL ThreadFlag + + inline Spinlock::Spinlock() + { +- // todo: is there a simpler way to initialize m_sp in a platform-independent manner? + boost::detail::spinlock initialized_sp = BOOST_DETAIL_SPINLOCK_INIT; +- m_sp = initialized_sp; ++ std::memcpy(&m_sp, &initialized_sp, sizeof(initialized_sp)); + } + + inline bool Spinlock::try_lock() Property changes on: head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property