From owner-svn-ports-all@freebsd.org Thu Jun 2 14:38:27 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E994B60B4F; Thu, 2 Jun 2016 14:38:27 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C7681753; Thu, 2 Jun 2016 14:38:26 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u52EcQaJ020124; Thu, 2 Jun 2016 14:38:26 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u52EcPSG020117; Thu, 2 Jun 2016 14:38:25 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201606021438.u52EcPSG020117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 2 Jun 2016 14:38:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416280 - in head/graphics/appleseed: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2016 14:38:27 -0000 Author: danfe Date: Thu Jun 2 14:38:25 2016 New Revision: 416280 URL: https://svnweb.freebsd.org/changeset/ports/416280 Log: - Update to version 1.4.0-beta, the latest to date - Remove a patch that was integrated upstream - Add two more patches to inhibit GCC attempts to invoke private copy ctor Added: head/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp (contents, props changed) head/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp (contents, props changed) Deleted: head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_x86timer.cpp Modified: head/graphics/appleseed/Makefile head/graphics/appleseed/distinfo head/graphics/appleseed/files/patch-CMakeLists.txt head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt head/graphics/appleseed/pkg-plist Modified: head/graphics/appleseed/Makefile ============================================================================== --- head/graphics/appleseed/Makefile Thu Jun 2 14:13:57 2016 (r416279) +++ head/graphics/appleseed/Makefile Thu Jun 2 14:38:25 2016 (r416280) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= appleseed -DISTVERSION= 1.3.0-beta -PORTREVISION= 1 +DISTVERSION= 1.4.0-beta CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org @@ -28,7 +27,7 @@ USE_QT4= moc_build qmake_build rcc_build 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 + -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 @@ -58,6 +57,8 @@ DISNEY_LIB_DEPENDS= libOpenImageIO.so:gr libSeExprEditor.so:graphics/seexpr post-patch: + @${REINPLACE_CMD} -e 's,CMAKE_SYSTEM_NAME.*,USE_RPATH_ORIGIN),' \ + ${WRKSRC}/src/appleseed.studio/CMakeLists.txt @${RMDIR} ${WRKSRC}/sandbox/docs/api .include Modified: head/graphics/appleseed/distinfo ============================================================================== --- head/graphics/appleseed/distinfo Thu Jun 2 14:13:57 2016 (r416279) +++ head/graphics/appleseed/distinfo Thu Jun 2 14:38:25 2016 (r416280) @@ -1,2 +1,2 @@ -SHA256 (appleseedhq-appleseed-1.3.0-beta_GH0.tar.gz) = 454fd3cbc72e5ea35988871415a70d04c37b987b86288a36413b007ea8fcf37d -SIZE (appleseedhq-appleseed-1.3.0-beta_GH0.tar.gz) = 115256964 +SHA256 (appleseedhq-appleseed-1.4.0-beta_GH0.tar.gz) = aed280fd0ad330292e2c7c4c5df6cc2badd17bf728252e61a6c0c3b4b85b7252 +SIZE (appleseedhq-appleseed-1.4.0-beta_GH0.tar.gz) = 110262949 Modified: head/graphics/appleseed/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/appleseed/files/patch-CMakeLists.txt Thu Jun 2 14:13:57 2016 (r416279) +++ head/graphics/appleseed/files/patch-CMakeLists.txt Thu Jun 2 14:38:25 2016 (r416280) @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2015-11-03 13:40:41 UTC +--- CMakeLists.txt.orig 2016-03-29 16:02:26 UTC +++ CMakeLists.txt @@ -107,6 +107,10 @@ option (USE_EXTERNAL_ZLIB option (WITH_CLI "Build appleseed.cli" ON) @@ -11,7 +11,7 @@ option (WITH_PYTHON "Build Python bindings" ON) option (WITH_ALEMBIC "Build Alembic support" OFF) option (WITH_OSL "Build OSL support" OFF) -@@ -178,6 +182,9 @@ if (WITH_OSL) +@@ -179,6 +183,9 @@ if (WITH_OSL) ${PROJECT_SOURCE_DIR}/src/appleseed/renderer/kernel/shading/stdosl.h) endif () @@ -21,7 +21,7 @@ #-------------------------------------------------------------------------------------------------- # Boost libraries. -@@ -284,7 +291,6 @@ endif () +@@ -285,7 +292,6 @@ endif () # Common include paths. include_directories ( src/appleseed @@ -29,7 +29,7 @@ ${PYTHON_INCLUDE_DIRS} ) -@@ -595,7 +601,7 @@ endif () +@@ -601,7 +607,7 @@ endif () find_package (Doxygen) @@ -38,7 +38,7 @@ 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 -@@ -644,23 +650,33 @@ endif () +@@ -650,23 +656,33 @@ endif () install ( DIRECTORY sandbox/docs @@ -75,7 +75,7 @@ install ( DIRECTORY src/appleseed/foundation DESTINATION include -@@ -678,3 +694,4 @@ install ( +@@ -684,3 +700,4 @@ install ( DESTINATION include FILES_MATCHING PATTERN "*.h" ) Added: head/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp Thu Jun 2 14:38:25 2016 (r416280) @@ -0,0 +1,70 @@ +--- src/appleseed/renderer/modeling/bsdf/glossybrdf.cpp.orig 2016-06-01 14:42:16 UTC ++++ src/appleseed/renderer/modeling/bsdf/glossybrdf.cpp +@@ -177,9 +177,10 @@ namespace + + if (m_mdf == GGX) + { ++ GGXMDF ggxmdf; + MicrofacetBRDFHelper::sample( + sampling_context, +- GGXMDF(), ++ ggxmdf, + alpha_x, + alpha_y, + f, +@@ -188,9 +189,10 @@ namespace + } + else + { ++ BeckmannMDF beckmannmdf; + MicrofacetBRDFHelper::sample( + sampling_context, +- BeckmannMDF(), ++ beckmannmdf, + alpha_x, + alpha_y, + f, +@@ -236,8 +238,9 @@ namespace + + if (m_mdf == GGX) + { ++ GGXMDF ggxmdf; + return MicrofacetBRDFHelper::evaluate( +- GGXMDF(), ++ ggxmdf, + alpha_x, + alpha_y, + shading_basis, +@@ -250,8 +253,9 @@ namespace + } + else + { ++ BeckmannMDF beckmannmdf; + return MicrofacetBRDFHelper::evaluate( +- BeckmannMDF(), ++ beckmannmdf, + alpha_x, + alpha_y, + shading_basis, +@@ -293,8 +297,9 @@ namespace + + if (m_mdf == GGX) + { ++ GGXMDF ggxmdf; + return MicrofacetBRDFHelper::pdf( +- GGXMDF(), ++ ggxmdf, + alpha_x, + alpha_y, + shading_basis, +@@ -303,8 +308,9 @@ namespace + } + else + { ++ BeckmannMDF beckmannmdf; + return MicrofacetBRDFHelper::pdf( +- BeckmannMDF(), ++ beckmannmdf, + alpha_x, + alpha_y, + shading_basis, Added: head/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp Thu Jun 2 14:38:25 2016 (r416280) @@ -0,0 +1,70 @@ +--- src/appleseed/renderer/modeling/bsdf/metalbrdf.cpp.orig 2016-06-02 10:22:05 UTC ++++ src/appleseed/renderer/modeling/bsdf/metalbrdf.cpp +@@ -201,9 +201,10 @@ namespace + + if (m_mdf == GGX) + { ++ GGXMDF ggxmdf; + MicrofacetBRDFHelper::sample( + sampling_context, +- GGXMDF(), ++ ggxmdf, + alpha_x, + alpha_y, + f, +@@ -212,9 +213,10 @@ namespace + } + else + { ++ BeckmannMDF beckmannmdf; + MicrofacetBRDFHelper::sample( + sampling_context, +- BeckmannMDF(), ++ beckmannmdf, + alpha_x, + alpha_y, + f, +@@ -260,8 +262,9 @@ namespace + + if (m_mdf == GGX) + { ++ GGXMDF ggxmdf; + return MicrofacetBRDFHelper::evaluate( +- GGXMDF(), ++ ggxmdf, + alpha_x, + alpha_y, + shading_basis, +@@ -274,8 +277,9 @@ namespace + } + else + { ++ BeckmannMDF beckmannmdf; + return MicrofacetBRDFHelper::evaluate( +- BeckmannMDF(), ++ beckmannmdf, + alpha_x, + alpha_y, + shading_basis, +@@ -317,8 +321,9 @@ namespace + + if (m_mdf == GGX) + { ++ GGXMDF ggxmdf; + return MicrofacetBRDFHelper::pdf( +- GGXMDF(), ++ ggxmdf, + alpha_x, + alpha_y, + shading_basis, +@@ -327,8 +332,9 @@ namespace + } + else + { ++ BeckmannMDF beckmannmdf; + return MicrofacetBRDFHelper::pdf( +- BeckmannMDF(), ++ beckmannmdf, + alpha_x, + alpha_y, + shading_basis, Modified: head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt ============================================================================== --- head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt Thu Jun 2 14:13:57 2016 (r416279) +++ head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt Thu Jun 2 14:38:25 2016 (r416280) @@ -1,14 +1,6 @@ ---- src/cmake/config/linux-gcc.txt.orig 2015-06-13 09:38:53 UTC +--- src/cmake/config/linux-gcc.txt.orig 2016-03-29 16:02:26 UTC +++ src/cmake/config/linux-gcc.txt -@@ -60,7 +60,6 @@ set (git_command "git") - - # Flags common to all configurations. - set (c_compiler_flags_common -- -Werror # Treat Warnings As Errors - -Wno-switch # don't complain about unhandled enumeration values in switch - -fno-math-errno # ignore errno when calling math functions - -fPIC # emit position-independent code -@@ -102,12 +101,6 @@ if (HIDE_SYMBOLS) +@@ -119,12 +119,6 @@ if (HIDE_SYMBOLS) ) endif () Modified: head/graphics/appleseed/pkg-plist ============================================================================== --- head/graphics/appleseed/pkg-plist Thu Jun 2 14:13:57 2016 (r416279) +++ head/graphics/appleseed/pkg-plist Thu Jun 2 14:38:25 2016 (r416280) @@ -62,22 +62,19 @@ settings/appleseed.studio.xml %%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_cast.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 @@ -90,40 +87,36 @@ settings/appleseed.studio.xml %%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_cast.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_emission_surface.osl +%%OSL%%shaders/src/surface/as_glass_surface.osl %%OSL%%shaders/src/surface/as_glossy_surface.osl %%OSL%%shaders/src/surface/as_metal_surface.osl +%%OSL%%shaders/src/surface/as_sheen_surface.osl +%%OSL%%shaders/src/surface/as_subsurface_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/surface/as_transparency_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 @@ -132,13 +125,10 @@ settings/appleseed.studio.xml %%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/utility/as_switch.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 @@ -148,13 +138,18 @@ settings/appleseed.studio.xml %%OSL%%shaders/src/vector/as_vector_split.osl %%OSL%%shaders/stdosl.h %%OSL%%shaders/surface/as_diffuse_surface.oso +%%OSL%%shaders/surface/as_emission_surface.oso +%%OSL%%shaders/surface/as_glass_surface.oso %%OSL%%shaders/surface/as_glossy_surface.oso %%OSL%%shaders/surface/as_metal_surface.oso +%%OSL%%shaders/surface/as_sheen_surface.oso +%%OSL%%shaders/surface/as_subsurface_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/surface/as_transparency_surface.oso %%OSL%%shaders/texture2d/as_color_texture.oso %%OSL%%shaders/texture2d/as_noise2d.oso %%OSL%%shaders/texture2d/as_scalar_texture.oso @@ -163,13 +158,10 @@ settings/appleseed.studio.xml %%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/utility/as_switch.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