Index: head/graphics/appleseed/Makefile =================================================================== --- head/graphics/appleseed/Makefile (revision 395764) +++ head/graphics/appleseed/Makefile (revision 395765) @@ -1,62 +1,54 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= appleseed DISTVERSION= 1.2.0-beta CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org COMMENT= Modern, physically-based production renderer LICENSE= MIT LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libpng.so:${PORTSDIR}/graphics/png \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}hq ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE instructions USES= cmake:outsource USE_GL= gl USE_QT4= moc_build qmake_build rcc_build uic_build opengl CMAKE_ARGS= -DUSE_STATIC_BOOST:BOOL=OFF -DWITH_DOXYGEN:BOOL=OFF \ -DWITH_TESTS:BOOL=OFF -DWITH_HEADERS:BOOL=OFF \ -DWITH_PYTHON:BOOL=OFF .for lib in ZLIB PNG EXR XERCES 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} -.include - post-patch: -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100074 -# Fix "undefined reference to `LZ4_compressBound'" upon linking with Clang -# on -CURRENT (I'm not sure how it can be mapped to specific Clang version) - @${REINPLACE_CMD} -e '/LZ4_compressBound/s,static inline ,,' \ - ${WRKSRC}/src/lz4/lz4.h -.endif @${REINPLACE_CMD} -e 's,Linux,${OPSYS},' \ ${WRKSRC}/src/appleseed.cli/CMakeLists.txt \ ${WRKSRC}/src/appleseed.studio/CMakeLists.txt \ ${WRKSRC}/src/tools/animatecamera/CMakeLists.txt \ ${WRKSRC}/src/tools/convertmeshfile/CMakeLists.txt \ ${WRKSRC}/src/tools/dumpmetadata/CMakeLists.txt \ ${WRKSRC}/src/tools/makefluffy/CMakeLists.txt \ ${WRKSRC}/src/tools/updateprojectfile/CMakeLists.txt @${RMDIR} ${WRKSRC}/sandbox/docs/api -.include +.include Index: head/graphics/appleseed/files/patch-CMakeLists.txt =================================================================== --- head/graphics/appleseed/files/patch-CMakeLists.txt (revision 395764) +++ head/graphics/appleseed/files/patch-CMakeLists.txt (revision 395765) @@ -1,64 +1,82 @@ --- CMakeLists.txt.orig 2015-06-13 09:38:53 UTC +++ CMakeLists.txt @@ -84,6 +84,9 @@ option (USE_EXTERNAL_ZLIB "Use ext 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_TESTS "Install unit tests and benchmarks" ON) +option (WITH_HEADERS "Install header files" ON) option (WITH_PYTHON "Build Python bindings" ON) option (WITH_ALEMBIC "Build Alembic support" OFF) option (WITH_OSL "Build OSL support" OFF) @@ -115,7 +118,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows" include (src/cmake/config/win-vs.txt) elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin") include (src/cmake/config/mac-clang.txt) -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") +elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD") include (src/cmake/config/linux-gcc.txt) else () message (FATAL_ERROR "Unsupported platform or compiler (CMAKE_SYSTEM_NAME is \"${CMAKE_SYSTEM_NAME}\"). " -@@ -546,7 +549,7 @@ endif () +@@ -147,6 +150,9 @@ if (WITH_OSL) + ${PROJECT_SOURCE_DIR}/src/appleseed/renderer/kernel/shading/stdosl.h) + 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. +@@ -244,7 +250,6 @@ endif () + # Common include paths. + include_directories ( + src/appleseed +- src/lz4 + ${PYTHON_INCLUDE_DIRS} + ) + +@@ -546,7 +551,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 -@@ -596,22 +599,25 @@ install ( +@@ -596,22 +601,25 @@ install ( DIRECTORY sandbox/docs sandbox/samples - sandbox/share DESTINATION . ) 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 -@@ -629,3 +635,4 @@ install ( +@@ -629,3 +637,4 @@ install ( DESTINATION include FILES_MATCHING PATTERN "*.h" ) +endif ()