Index: head/graphics/appleseed/Makefile =================================================================== --- head/graphics/appleseed/Makefile (revision 398925) +++ head/graphics/appleseed/Makefile (revision 398926) @@ -1,55 +1,69 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= appleseed DISTVERSION= 1.2.0-beta -PORTREVISION= 1 +PORTREVISION= 2 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 +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 -.for lib in ZLIB PNG EXR XERCES +.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= OSL DISNEY_MATERIAL +OPTIONS_DEFAULT= OSL DISNEY_MATERIAL +OPTIONS_SUB= yes + +OSL_DESC= Open Shading Language support +DISNEY_MATERIAL_DESC= Disney material support + +OSL_CMAKE_ON= -DWITH_OSL:BOOL=ON +OSL_LIB_DEPENDS= liboslexec.so:${PORTSDIR}/graphics/openshadinglanguage + +DISNEY_MATERIAL_CMAKE_ON= -DWITH_DISNEY_MATERIAL:BOOL=ON +DISNEY_MATERIAL_LIB_DEPENDS= libOpenImageIO.so:${PORTSDIR}/graphics/openimageio \ + libSeExprEditor.so:${PORTSDIR}/graphics/seexpr post-patch: @${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 Index: head/graphics/appleseed/files/patch-src_appleseed_CMakeLists.txt =================================================================== --- head/graphics/appleseed/files/patch-src_appleseed_CMakeLists.txt (nonexistent) +++ head/graphics/appleseed/files/patch-src_appleseed_CMakeLists.txt (revision 398926) @@ -0,0 +1,18 @@ +--- src/appleseed/CMakeLists.txt.orig 2015-06-13 09:38:53 UTC ++++ src/appleseed/CMakeLists.txt +@@ -1082,10 +1082,14 @@ set (renderer_kernel_rendering_sources + renderer/kernel/rendering/timedrenderercontroller.cpp + renderer/kernel/rendering/timedrenderercontroller.h + ) +-if (WITH_OSL) ++if (WITH_OSL OR WITH_DISNEY_MATERIAL) + list (APPEND renderer_kernel_rendering_sources + renderer/kernel/rendering/oiioerrorhandler.cpp + renderer/kernel/rendering/oiioerrorhandler.h ++ ) ++endif () ++if (WITH_OSL) ++ list (APPEND renderer_kernel_rendering_sources + renderer/kernel/rendering/rendererservices.cpp + renderer/kernel/rendering/rendererservices.h + ) Property changes on: head/graphics/appleseed/files/patch-src_appleseed_CMakeLists.txt ___________________________________________________________________ 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 Index: head/graphics/appleseed/pkg-plist =================================================================== --- head/graphics/appleseed/pkg-plist (revision 398925) +++ head/graphics/appleseed/pkg-plist (revision 398926) @@ -1,52 +1,180 @@ share/cmake/Modules/FindAppleseed.cmake @cwd %%APPHOME%% bin/animatecamera bin/appleseed.cli bin/appleseed.studio bin/convertmany.py bin/convertmeshfile bin/dumpmetadata bin/makefluffy +%%OSL%%bin/maketx +%%OSL%%bin/oslc +%%OSL%%bin/oslinfo bin/rendermanager.py bin/rendermany.py bin/rendernode.py bin/updatemany.py bin/updateprojectfile docs/osl/osl-languagespec.pdf docs/seexpr/Se_voronoi_1.png docs/seexpr/Se_voronoi_2.png docs/seexpr/Se_voronoi_3.png docs/seexpr/Se_voronoi_4.png docs/seexpr/Se_voronoi_5.png docs/seexpr/userdoc.html lib/libappleseed.shared.so lib/libappleseed.so samples/cpp/basic/CMakeLists.txt samples/cpp/basic/basic.cpp samples/cpp/basic/data/scene.obj samples/cpp/basic/output/preserve.txt samples/cpp/basic/reference output/scene.obj samples/cpp/basic/reference output/test.appleseed samples/cpp/basic/reference output/test.png samples/cpp/heightfield/CMakeLists.txt samples/cpp/heightfield/data/cube.obj samples/cpp/heightfield/data/heightfield.png samples/cpp/heightfield/data/smoothcube.obj samples/cpp/heightfield/heightfield.cpp samples/cpp/heightfield/output/preserve.txt samples/python/basic/basic.py samples/python/basic/data/scene.obj 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 settings/appleseed.cli.xml settings/appleseed.studio.xml +%%OSL%%shaders/README.md +%%OSL%%shaders/color/as_blackbody.oso +%%OSL%%shaders/color/as_color_add.oso +%%OSL%%shaders/color/as_color_build.oso +%%OSL%%shaders/color/as_color_mix.oso +%%OSL%%shaders/color/as_color_multiply.oso +%%OSL%%shaders/color/as_color_saturation.oso +%%OSL%%shaders/color/as_color_split.oso +%%OSL%%shaders/color/as_luminance.oso +%%OSL%%shaders/color/as_wavelength.oso +%%OSL%%shaders/emission/as_emission.oso +%%OSL%%shaders/float/as_float_add.oso +%%OSL%%shaders/float/as_float_mix.oso +%%OSL%%shaders/float/as_float_multiply.oso +%%OSL%%shaders/float/as_float_pow.oso +%%OSL%%shaders/float/as_float_remap.oso +%%OSL%%shaders/fresnel/as_fresnel.oso +%%OSL%%shaders/input/as_globals.oso +%%OSL%%shaders/input/as_input.oso +%%OSL%%shaders/input/as_object_input.oso +%%OSL%%shaders/input/as_ray_info.oso +%%OSL%%shaders/material/as_disney_material.oso +%%OSL%%shaders/material/as_glass_material.oso +%%OSL%%shaders/material/as_material_builder.oso +%%OSL%%shaders/normal/as_bump_map.oso +%%OSL%%shaders/normal/as_faceforward.oso +%%OSL%%shaders/normal/as_normal_map.oso +%%OSL%%shaders/oslutil.h +%%OSL%%shaders/src/color/as_blackbody.osl +%%OSL%%shaders/src/color/as_color_add.osl +%%OSL%%shaders/src/color/as_color_build.osl +%%OSL%%shaders/src/color/as_color_mix.osl +%%OSL%%shaders/src/color/as_color_multiply.osl +%%OSL%%shaders/src/color/as_color_saturation.osl +%%OSL%%shaders/src/color/as_color_split.osl +%%OSL%%shaders/src/color/as_luminance.osl +%%OSL%%shaders/src/color/as_wavelength.osl +%%OSL%%shaders/src/compile_shaders.py +%%OSL%%shaders/src/emission/as_emission.osl +%%OSL%%shaders/src/float/as_float_add.osl +%%OSL%%shaders/src/float/as_float_mix.osl +%%OSL%%shaders/src/float/as_float_multiply.osl +%%OSL%%shaders/src/float/as_float_pow.osl +%%OSL%%shaders/src/float/as_float_remap.osl +%%OSL%%shaders/src/fresnel/as_fresnel.osl +%%OSL%%shaders/src/include/appleseed/color.h +%%OSL%%shaders/src/include/appleseed/defaults.h +%%OSL%%shaders/src/include/appleseed/fresnel.h +%%OSL%%shaders/src/include/appleseed/ior.h +%%OSL%%shaders/src/include/appleseed/metadata.h +%%OSL%%shaders/src/include/appleseed/microfacet.h +%%OSL%%shaders/src/include/appleseed/noise.h +%%OSL%%shaders/src/include/appleseed/texture.h +%%OSL%%shaders/src/include/appleseed/transform.h +%%OSL%%shaders/src/input/as_globals.osl +%%OSL%%shaders/src/input/as_input.osl +%%OSL%%shaders/src/input/as_object_input.osl +%%OSL%%shaders/src/input/as_ray_info.osl +%%OSL%%shaders/src/material/as_disney_material.osl +%%OSL%%shaders/src/material/as_glass_material.osl +%%OSL%%shaders/src/material/as_material_builder.osl +%%OSL%%shaders/src/normal/as_bump_map.osl +%%OSL%%shaders/src/normal/as_faceforward.osl +%%OSL%%shaders/src/normal/as_normal_map.osl +%%OSL%%shaders/src/surface/as_diffuse_surface.osl +%%OSL%%shaders/src/surface/as_glossy_surface.osl +%%OSL%%shaders/src/surface/as_metal_surface.osl +%%OSL%%shaders/src/surface/as_surface_add.osl +%%OSL%%shaders/src/surface/as_surface_mix.osl +%%OSL%%shaders/src/surface/as_surface_multiply.osl +%%OSL%%shaders/src/surface/as_surface_switch.osl +%%OSL%%shaders/src/surface/as_translucent_surface.osl +%%OSL%%shaders/src/texture2d/as_color_texture.osl +%%OSL%%shaders/src/texture2d/as_noise2d.osl +%%OSL%%shaders/src/texture2d/as_scalar_texture.osl +%%OSL%%shaders/src/texture3d/as_noise3d.osl +%%OSL%%shaders/src/texture3d/as_noise4d.osl +%%OSL%%shaders/src/transform/as_map2d.osl +%%OSL%%shaders/src/transform/as_map3d.osl +%%OSL%%shaders/src/transform/as_transform.osl +%%OSL%%shaders/src/transparency/as_transparency.osl +%%OSL%%shaders/src/utility/as_absorption.osl +%%OSL%%shaders/src/utility/as_condition.osl +%%OSL%%shaders/src/utility/as_facing_ratio.osl +%%OSL%%shaders/src/vector/as_anisotropy_dir.osl +%%OSL%%shaders/src/vector/as_vector_add.osl +%%OSL%%shaders/src/vector/as_vector_binormal.osl +%%OSL%%shaders/src/vector/as_vector_build.osl +%%OSL%%shaders/src/vector/as_vector_cross.osl +%%OSL%%shaders/src/vector/as_vector_dot.osl +%%OSL%%shaders/src/vector/as_vector_mix.osl +%%OSL%%shaders/src/vector/as_vector_multiply.osl +%%OSL%%shaders/src/vector/as_vector_normalize.osl +%%OSL%%shaders/src/vector/as_vector_split.osl +%%OSL%%shaders/stdosl.h +%%OSL%%shaders/surface/as_diffuse_surface.oso +%%OSL%%shaders/surface/as_glossy_surface.oso +%%OSL%%shaders/surface/as_metal_surface.oso +%%OSL%%shaders/surface/as_surface_add.oso +%%OSL%%shaders/surface/as_surface_mix.oso +%%OSL%%shaders/surface/as_surface_multiply.oso +%%OSL%%shaders/surface/as_surface_switch.oso +%%OSL%%shaders/surface/as_translucent_surface.oso +%%OSL%%shaders/texture2d/as_color_texture.oso +%%OSL%%shaders/texture2d/as_noise2d.oso +%%OSL%%shaders/texture2d/as_scalar_texture.oso +%%OSL%%shaders/texture3d/as_noise3d.oso +%%OSL%%shaders/texture3d/as_noise4d.oso +%%OSL%%shaders/transform/as_map2d.oso +%%OSL%%shaders/transform/as_map3d.oso +%%OSL%%shaders/transform/as_transform.oso +%%OSL%%shaders/transparency/as_transparency.oso +%%OSL%%shaders/utility/as_absorption.oso +%%OSL%%shaders/utility/as_condition.oso +%%OSL%%shaders/utility/as_facing_ratio.oso +%%OSL%%shaders/vector/as_anisotropy_dir.oso +%%OSL%%shaders/vector/as_vector_add.oso +%%OSL%%shaders/vector/as_vector_binormal.oso +%%OSL%%shaders/vector/as_vector_build.oso +%%OSL%%shaders/vector/as_vector_cross.oso +%%OSL%%shaders/vector/as_vector_dot.oso +%%OSL%%shaders/vector/as_vector_mix.oso +%%OSL%%shaders/vector/as_vector_multiply.oso +%%OSL%%shaders/vector/as_vector_normalize.oso +%%OSL%%shaders/vector/as_vector_split.oso stylesheets/default.qss