diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile index 3c8864ec92f1..bc3fef5bd010 100644 --- a/graphics/appleseed/Makefile +++ b/graphics/appleseed/Makefile @@ -1,91 +1,91 @@ PORTNAME= appleseed DISTVERSION= 2.1.0-beta PORTREVISION= 14 CATEGORIES= graphics +PATCH_SITES= http://vault.101011010.xyz/distfiles/ LOCAL/danfe +PATCHFILES= OSL-01.13.7.patch:-p1 + MAINTAINER= danfe@FreeBSD.org COMMENT= Modern, physically-based production renderer WWW= https://appleseedhq.net/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ liblz4.so:archivers/liblz4 \ libpng.so:graphics/png \ libIlmThread.so:graphics/openexr \ libImath.so:math/Imath \ libOpenColorIOv1.so:graphics/opencoloriov1 \ 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: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 \ + @${REINPLACE_CMD} -e 's,OpenEXR,Imath, ; /[ {]IMATH_HALF_LIBRARY/d' \ + ${WRKSRC}/cmake/modules/FindImath.cmake + @${REINPLACE_CMD} -e 's,OpenEXR/Imath,Imath/Imath,' \ ${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/distinfo b/graphics/appleseed/distinfo index 0cce5a17b714..60408ec4dddb 100644 --- a/graphics/appleseed/distinfo +++ b/graphics/appleseed/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1567266541 SHA256 (appleseedhq-appleseed-2.1.0-beta_GH0.tar.gz) = 5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898 SIZE (appleseedhq-appleseed-2.1.0-beta_GH0.tar.gz) = 203650426 +SHA256 (OSL-01.13.7.patch) = 1c6f597dfb314f059953a2efba32dd19be07a5a815a0982fa62775081ef0d28d +SIZE (OSL-01.13.7.patch) = 19461 diff --git a/graphics/appleseed/files/patch-CMakeLists.txt b/graphics/appleseed/files/patch-CMakeLists.txt index b83bc2c3d408..793cad65f13f 100644 --- a/graphics/appleseed/files/patch-CMakeLists.txt +++ b/graphics/appleseed/files/patch-CMakeLists.txt @@ -1,54 +1,64 @@ --- CMakeLists.txt.orig 2019-08-31 15:49:01 UTC +++ CMakeLists.txt -@@ -681,8 +681,8 @@ if (WITH_PYTHON2_BINDINGS OR WITH_PYTHON3_BINDINGS) +@@ -356,9 +356,7 @@ endif () + if (USE_FIND_PACKAGE_FOR_EXR) + include_directories ( + ${IMATH_INCLUDE_DIRS} +- ${IMATH_INCLUDE_DIRS}/OpenEXR/ + ${OPENEXR_INCLUDE_DIRS} +- ${OPENEXR_INCLUDE_DIRS}/OpenEXR/ + ) + else () + include_directories ( +@@ -681,8 +679,8 @@ if (WITH_PYTHON2_BINDINGS OR WITH_PYTHON3_BINDINGS) endif () if (WITH_STUDIO) - if (NOT WITH_PYTHON2_BINDINGS) - message (FATAL_ERROR "Option WITH_PYTHON2_BINDINGS should be \"ON\" to build appleseed.studio.") + if (NOT WITH_PYTHON3_BINDINGS) + message (FATAL_ERROR "Option WITH_PYTHON3_BINDINGS should be \"ON\" to build appleseed.studio.") endif () add_subdirectory (src/appleseed.studio) endif () -@@ -732,15 +732,27 @@ install ( +@@ -732,15 +730,27 @@ install ( sandbox/share sandbox/stylesheets DESTINATION . + PATTERN "cmake" EXCLUDE ) install ( - FILES + DIRECTORY + sandbox/share/cmake + DESTINATION ../share +) + +install ( + PROGRAMS scripts/cleanmany.py scripts/convertmany.py scripts/rendermanager.py scripts/rendermany.py scripts/rendernode.py + DESTINATION bin +) + +install_relative_symlink ( + ${CMAKE_INSTALL_PREFIX} ${OSL_COMPILER} ${OSL_QUERY_INFO} ${OSL_MAKETX} -@@ -754,11 +766,6 @@ install ( +@@ -754,11 +764,6 @@ install ( sandbox/schemas/settings.xsd sandbox/schemas/project.xsd DESTINATION schemas -) - -install ( - CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images)" - CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images/autosave)" ) if (INSTALL_HEADERS) diff --git a/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake b/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake deleted file mode 100644 index e5f8652b64bc..000000000000 --- a/graphics/appleseed/files/patch-sandbox_share_cmake_Modules_FindImath.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.