From 74aaee02db752f3cd21fd55b9308bf57ec1c2ff4 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Thu, 6 Oct 2016 23:07:12 +0000 Subject: [PATCH] Update to version 1.5.2-beta. Because GitHub releases (tarballs) are not fetched with correct modification time, set TIMESTAMP to 1475224589 which corresponds to commit 7f3ea39 tagged as this release. --- graphics/appleseed/Makefile | 4 +- graphics/appleseed/distinfo | 5 +- ...seed_renderer_modeling_bsdf_glossybrdf.cpp | 70 ------------------- ...eseed_renderer_modeling_bsdf_metalbrdf.cpp | 70 ------------------- graphics/appleseed/pkg-plist | 1 + 5 files changed, 5 insertions(+), 145 deletions(-) delete mode 100644 graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp delete mode 100644 graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile index b721d15d1c23..bcf4b9df56be 100644 --- a/graphics/appleseed/Makefile +++ b/graphics/appleseed/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= appleseed -DISTVERSION= 1.4.0-beta +DISTVERSION= 1.5.2-beta CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org @@ -57,8 +57,6 @@ DISNEY_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \ 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 diff --git a/graphics/appleseed/distinfo b/graphics/appleseed/distinfo index 6a0f85a882af..6a597ecf1c65 100644 --- a/graphics/appleseed/distinfo +++ b/graphics/appleseed/distinfo @@ -1,2 +1,3 @@ -SHA256 (appleseedhq-appleseed-1.4.0-beta_GH0.tar.gz) = aed280fd0ad330292e2c7c4c5df6cc2badd17bf728252e61a6c0c3b4b85b7252 -SIZE (appleseedhq-appleseed-1.4.0-beta_GH0.tar.gz) = 110262949 +TIMESTAMP = 1475224589 +SHA256 (appleseedhq-appleseed-1.5.2-beta_GH0.tar.gz) = b0e60d7f55ceca40e87af30315217df2bedb7e6c0f52612894158994ee8939f4 +SIZE (appleseedhq-appleseed-1.5.2-beta_GH0.tar.gz) = 116992420 diff --git a/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp b/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp deleted file mode 100644 index e5a2eae651eb..000000000000 --- a/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp +++ /dev/null @@ -1,70 +0,0 @@ ---- 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, diff --git a/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp b/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp deleted file mode 100644 index 3402fb149e97..000000000000 --- a/graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp +++ /dev/null @@ -1,70 +0,0 @@ ---- 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, diff --git a/graphics/appleseed/pkg-plist b/graphics/appleseed/pkg-plist index ce1420a99436..404eafd5e582 100644 --- a/graphics/appleseed/pkg-plist +++ b/graphics/appleseed/pkg-plist @@ -96,6 +96,7 @@ settings/appleseed.studio.xml %%OSL%%shaders/src/include/appleseed/color.h %%OSL%%shaders/src/include/appleseed/microfacet.h %%OSL%%shaders/src/include/appleseed/transform.h +%%OSL%%shaders/src/include/appleseed/udim.h %%OSL%%shaders/src/input/as_globals.osl %%OSL%%shaders/src/input/as_input.osl %%OSL%%shaders/src/input/as_object_input.osl