diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile index 91ae3bd8438b..a59284f338cd 100644 --- a/graphics/appleseed/Makefile +++ b/graphics/appleseed/Makefile @@ -1,76 +1,92 @@ # Created by: Alexey Dokuchaev PORTNAME= appleseed DISTVERSION= 2.1.0-beta -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org COMMENT= Modern, physically-based production renderer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ liblz4.so:archivers/liblz4 \ libpng.so:graphics/png \ - libIlmImf.so:graphics/openexr \ - libIlmThread.so:graphics/ilmbase \ + libIlmThread.so:graphics/openexr \ + libImath.so:math/Imath \ libOpenColorIO.so:graphics/opencolorio \ libOpenImageIO.so:graphics/openimageio \ libxerces-c.so:textproc/xerces-c3 \ liboslexec.so:graphics/openshadinglanguage USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}hq ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= not ported to it yet USES= cmake compiler:c++11-lang shebangfix SHEBANG_FILES= scripts/*.py +CFLAGS+= -I${LOCALBASE}/include/Imath +CFLAGS+= -I${LOCALBASE}/include/OpenEXR + CMAKE_ARGS= -DWITH_PYTHON2_BINDINGS:BOOL=OFF \ -DWITH_DOXYGEN:BOOL=OFF \ -DINSTALL_HEADERS:BOOL=OFF \ -DINSTALL_TESTS:BOOL=OFF \ -DINSTALL_API_EXAMPLES:BOOL=OFF \ -DWARNINGS_AS_ERRORS:BOOL=OFF .for lib in BOOST EMBREE EXR OCIO OIIO OSL CMAKE_ARGS+= -DUSE_STATIC_${lib}:BOOL=OFF .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= EMBREE PYTHON STUDIO OPTIONS_DEFAULT= PYTHON STUDIO OPTIONS_SUB= yes EMBREE_DESC= Embree intersection backend support EMBREE_LIB_DEPENDS= libembree3.so:graphics/embree EMBREE_CMAKE_ON= -DWITH_EMBREE:BOOL=ON PYTHON_USES= gl python:3.5+,build,run PYTHON_USE= GL=gl PYTHON_CMAKE_ON= -DWITH_PYTHON3_BINDINGS:BOOL=ON STUDIO_DESC= Build appleseed.studio (Qt-based) STUDIO_LIB_DEPENDS= ${PY_BOOST} STUDIO_USES= qt:5 STUDIO_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,opengl,widgets STUDIO_CMAKE_OFF= -DWITH_STUDIO:BOOL=OFF STUDIO_IMPLIES= PYTHON post-patch: @${RMDIR} ${WRKSRC}/sandbox/docs/api @${RM} ${WRKSRC}/sandbox/share/cmake/Modules/FindOpenImageIO.cmake + ${REINPLACE_CMD} 's,OpenEXR/Imath,Imath/Imath,' \ + ${WRKSRC}/sandbox/share/cmake/Modules/FindImath.cmake \ + ${WRKSRC}/src/appleseed/foundation/meta/tests/test_quaternion.cpp \ + ${WRKSRC}/src/appleseed/foundation/meta/tests/test_matrix.cpp \ + ${WRKSRC}/src/appleseed/foundation/meta/tests/test_quaternion.cpp \ + ${WRKSRC}/src/appleseed/foundation/meta/tests/test_vector.cpp \ + ${WRKSRC}/src/appleseed/foundation/meta/tests/test_aabb.cpp \ + ${WRKSRC}/src/appleseed/foundation/meta/tests/test_color.cpp \ + ${WRKSRC}/src/appleseed/foundation/math/vector.h \ + ${WRKSRC}/src/appleseed/foundation/math/aabb.h \ + ${WRKSRC}/src/appleseed/foundation/math/matrix.h \ + ${WRKSRC}/src/appleseed/foundation/math/quaternion.h \ + ${WRKSRC}/src/appleseed/foundation/image/color.h .include PATCH_ARGS+= -l diff --git a/graphics/appleseed/files/patch-cmake_modules_FindOpenEXR.cmake b/graphics/appleseed/files/patch-cmake_modules_FindOpenEXR.cmake new file mode 100644 index 000000000000..b0fe7714a75f --- /dev/null +++ b/graphics/appleseed/files/patch-cmake_modules_FindOpenEXR.cmake @@ -0,0 +1,20 @@ +--- cmake/modules/FindOpenEXR.cmake.orig 2019-08-31 15:49:01 UTC ++++ cmake/modules/FindOpenEXR.cmake +@@ -53,7 +53,7 @@ find_path (OPENEXR_INCLUDE_DIR NAMES ImfHeader.h + /usr/include + ) + +-find_library (OPENEXR_IMF_LIBRARY NAMES IlmImf-2_3 IlmImf-2_2 IlmImf ++find_library (OPENEXR_IMF_LIBRARY NAMES OpenEXR + PATH_SUFFIXES lib64 lib + HINTS ${OPENEXR_ROOT} + ${OPENEXR_LOCATION} +@@ -80,7 +80,7 @@ find_package_handle_standard_args (OPENEXR DEFAULT_MSG + # Set the output variables. + if (OPENEXR_FOUND) + set (OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}) +- set (OPENEXR_LIBRARIES ${OPENEXR_IMF_LIBRARY} ${OPENEXR_THREADS_LIBRARY}) ++ set (OPENEXR_LIBRARIES ${OPENEXR_IMF_LIBRARY} ${OPENEXR_THREADS_LIBRARY} -lImath) + else () + set (OPENEXR_INCLUDE_DIRS) + set (OPENEXR_LIBRARIES) diff --git a/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake b/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake new file mode 100644 index 000000000000..e5f8652b64bc --- /dev/null +++ b/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake @@ -0,0 +1,14 @@ +--- sandbox/share/cmake/Modules/FindImath.cmake.orig 2019-08-31 15:49:01 UTC ++++ sandbox/share/cmake/Modules/FindImath.cmake +@@ -39,10 +39,8 @@ + + include (FindPackageHandleStandardArgs) + +-find_path (IMATH_INCLUDE_DIR NAMES OpenEXR/ImathVec.h) ++find_path (IMATH_INCLUDE_DIR NAMES Imath/ImathVec.h) + +-find_library (IMATH_HALF_LIBRARY NAMES Half) +-find_library (IMATH_IEX_LIBRARY NAMES Iex) + find_library (IMATH_MATH_LIBRARY NAMES Imath) + + # Handle the QUIETLY and REQUIRED arguments and set IMATH_FOUND. diff --git a/graphics/appleseed/files/patch-src_appleseed_foundation_core_thirdparties.cpp b/graphics/appleseed/files/patch-src_appleseed_foundation_core_thirdparties.cpp new file mode 100644 index 000000000000..96106f8b480a --- /dev/null +++ b/graphics/appleseed/files/patch-src_appleseed_foundation_core_thirdparties.cpp @@ -0,0 +1,20 @@ +--- src/appleseed/foundation/core/thirdparties.cpp.orig 2019-08-31 15:49:01 UTC ++++ src/appleseed/foundation/core/thirdparties.cpp +@@ -42,7 +42,7 @@ + + // IlmBase headers. + #include "foundation/platform/_beginexrheaders.h" +-#include ++#include + #include "foundation/platform/_endexrheaders.h" + + // LZ4 headers. +@@ -116,7 +116,7 @@ LibraryVersionArray ThirdParties::get_versions() + } + #endif + +- versions.push_back(APIStringPair("IlmBase", ILMBASE_VERSION_STRING)); ++ versions.push_back(APIStringPair("Imath", IMATH_VERSION_STRING)); + versions.push_back(APIStringPair("libjpeg-turbo", LibJpegTurboVersion)); + versions.push_back(APIStringPair("LibTIFF", LibTIFFVersion)); + versions.push_back(APIStringPair("LZ4", format("{0}.{1}.{2}", LZ4_VERSION_MAJOR, LZ4_VERSION_MINOR, LZ4_VERSION_RELEASE))); diff --git a/graphics/appleseed/files/patch-src_appleseed_foundation_meta_tests_test__half.cpp b/graphics/appleseed/files/patch-src_appleseed_foundation_meta_tests_test__half.cpp new file mode 100644 index 000000000000..e416a6801578 --- /dev/null +++ b/graphics/appleseed/files/patch-src_appleseed_foundation_meta_tests_test__half.cpp @@ -0,0 +1,11 @@ +--- src/appleseed/foundation/meta/tests/test_half.cpp.orig 2019-08-31 15:49:01 UTC ++++ src/appleseed/foundation/meta/tests/test_half.cpp +@@ -34,7 +34,7 @@ + + // OpenEXR headers. + #include "foundation/platform/_beginexrheaders.h" +-#include "OpenEXR/half.h" ++#include "Imath/half.h" + #include "foundation/platform/_endexrheaders.h" + + // Standard headers. diff --git a/graphics/appleseed/files/patch-src_thirdparty_bcd_bcd_ImageIO.cpp b/graphics/appleseed/files/patch-src_thirdparty_bcd_bcd_ImageIO.cpp new file mode 100644 index 000000000000..69ad5a78596b --- /dev/null +++ b/graphics/appleseed/files/patch-src_thirdparty_bcd_bcd_ImageIO.cpp @@ -0,0 +1,10 @@ +--- src/thirdparty/bcd/bcd/ImageIO.cpp.orig 2019-08-31 15:49:01 UTC ++++ src/thirdparty/bcd/bcd/ImageIO.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++ #include + + #if __GNUC__ >= 7 + #pragma GCC diagnostic pop