Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Mar 2021 13:56:44 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r567314 - in head: . graphics graphics/appleseed graphics/appleseed/files
Message-ID:  <202103041356.124DuiSa086311@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Mar  4 13:56:44 2021
New Revision: 567314
URL: https://svnweb.freebsd.org/changeset/ports/567314

Log:
  - Resurrect, unbreak, and update to the latest version 2.1.0-beta
  - Disable appleseed.studio for now: while it had been ported to Qt5,
    it still heavily relies on Python 2.x
  - Drop the options: C++11 is required now, and API examples are of
    little interest to end-users so just stop installing them
  - Add dependencies on `archivers/liblz4' and `graphics/openimageio'
  - GC no longer needed work-arounds for old versions of Clang

Added:
  head/graphics/appleseed/
     - copied from r501105, head/graphics/appleseed/
  head/graphics/appleseed/files/patch-cmake_config_linux-gcc-clang.txt
     - copied, changed from r501105, head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt
  head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_path.h   (contents, props changed)
  head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_system.cpp   (contents, props changed)
  head/graphics/appleseed/files/patch-src_appleseed_foundation_utility_benchmark_benchmarkaggregator.cpp   (contents, props changed)
Deleted:
  head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_thread.h
  head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/appleseed/Makefile
  head/graphics/appleseed/distinfo
  head/graphics/appleseed/files/patch-CMakeLists.txt
  head/graphics/appleseed/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Mar  4 13:51:31 2021	(r567313)
+++ head/MOVED	Thu Mar  4 13:56:44 2021	(r567314)
@@ -12655,7 +12655,6 @@ games/tinymux||2019-05-09|Has expired: Broken for more
 games/voxelands||2019-05-09|Has expired: Broken for more than 6 months
 games/voxelands-server||2019-05-09|Has expired: Broken for more than 6 months
 games/warsow||2019-05-09|Has expired: Broken for more than 6 months
-graphics/appleseed||2019-05-09|Has expired: Broken for more than 6 months
 graphics/apvlv||2019-05-09|Has expired: Broken for more than 6 months
 graphics/qslim||2019-05-09|Has expired: Broken for more than 6 months
 graphics/rawstudio||2019-05-09|Has expired: Broken for more than 6 months

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Thu Mar  4 13:51:31 2021	(r567313)
+++ head/graphics/Makefile	Thu Mar  4 13:56:44 2021	(r567314)
@@ -56,6 +56,7 @@
     SUBDIR += aoi
     SUBDIR += apngasm
     SUBDIR += apngdis
+    SUBDIR += appleseed
     SUBDIR += argyllcms
     SUBDIR += art
     SUBDIR += asciio

Modified: head/graphics/appleseed/Makefile
==============================================================================
--- head/graphics/appleseed/Makefile	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/appleseed/Makefile	Thu Mar  4 13:56:44 2021	(r567314)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	appleseed
-DISTVERSION=	1.7.1-beta
-PORTREVISION=	8
+DISTVERSION=	2.1.0-beta
 CATEGORIES=	graphics
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -12,13 +11,11 @@ COMMENT=	Modern, physically-based production renderer
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2019-05-08
-
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		liblz4.so:archivers/liblz4 \
 		libpng.so:graphics/png \
 		libIlmImf.so:graphics/openexr \
+		libOpenImageIO.so:graphics/openimageio \
 		libxerces-c.so:textproc/xerces-c3 \
 		liboslexec.so:graphics/openshadinglanguage
 
@@ -28,16 +25,19 @@ GH_ACCOUNT=	${PORTNAME}hq
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	not ported to it yet
 
-USES=		cmake compiler:env
+USES=		cmake compiler:c++11-lang
 
-LDFLAGS+=	-lboost_atomic
-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 -DWARNINGS_AS_ERRORS:BOOL=OFF
+CMAKE_ARGS=	-DWITH_STUDIO:BOOL=OFF \
+		-DWITH_PYTHON2_BINDINGS:BOOL=OFF \
+		-DWITH_PYTHON3_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 EXR OIIO OSL PNG SEEXPR XERCES ZLIB
-CMAKE_ARGS+=	-DUSE_EXTERNAL_${lib}:BOOL=ON
+.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
@@ -47,25 +47,8 @@ PLIST_SUB=	APPHOME=${CMAKE_INSTALL_PREFIX}
 SUB_FILES=	pkg-message
 SUB_LIST:=	${PLIST_SUB}
 
-OPTIONS_DEFINE=	CPP11 EXAMPLES
-OPTIONS_SUB=	yes
-
-CPP11_DESC=	Build in C++11 mode
-
-CPP11_CMAKE_ON=	-DUSE_CPP11:BOOL=ON
-
-EXAMPLES_CMAKE_OFF=	-DWITH_SAMPLES:BOOL=OFF
-
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${RMDIR} ${WRKSRC}/sandbox/docs/api
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 39
-	@${ECHO_MSG} "===>  Patching for Core Working Group (CWG) Defect 253 (see r455830)"
-	@${REINPLACE_CMD} -E 's,const (.*MDF ),\1,' \
-		${WRKSRC}/src/appleseed/renderer/modeling/bsdf/disneybrdf.cpp \
-		${WRKSRC}/src/appleseed/renderer/modeling/bsdf/microfacetbrdf.cpp \
-		${WRKSRC}/src/appleseed/foundation/meta/tests/test_microfacet.cpp
-.endif
+	@${RM} ${WRKSRC}/sandbox/share/cmake/Modules/FindOpenImageIO.cmake
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/appleseed/distinfo
==============================================================================
--- head/graphics/appleseed/distinfo	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/appleseed/distinfo	Thu Mar  4 13:56:44 2021	(r567314)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501170801
-SHA256 (appleseedhq-appleseed-1.7.1-beta_GH0.tar.gz) = 9cb6d21ca84a62f6e077038c53a5e91c4aba78aa0bf01ccb7d9792d3cc839fb1
-SIZE (appleseedhq-appleseed-1.7.1-beta_GH0.tar.gz) = 152061805
+TIMESTAMP = 1567266541
+SHA256 (appleseedhq-appleseed-2.1.0-beta_GH0.tar.gz) = 5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898
+SIZE (appleseedhq-appleseed-2.1.0-beta_GH0.tar.gz) = 203650426

Modified: head/graphics/appleseed/files/patch-CMakeLists.txt
==============================================================================
--- head/graphics/appleseed/files/patch-CMakeLists.txt	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/appleseed/files/patch-CMakeLists.txt	Thu Mar  4 13:56:44 2021	(r567314)
@@ -1,85 +1,31 @@
---- CMakeLists.txt.orig	2017-07-27 15:53:21 UTC
+--- CMakeLists.txt.orig	2019-08-31 15:49:01 UTC
 +++ CMakeLists.txt
-@@ -106,6 +106,10 @@ option (USE_EXTERNAL_ZLIB                   "Use exter
- option (WITH_CLI                            "Build appleseed.cli"                                   ON)
- option (WITH_STUDIO                         "Build appleseed.studio"                                ON)
- option (WITH_TOOLS                          "Build appleseed tools"                                 ON)
-+option (WITH_DOXYGEN                        "Generate API Reference with Doxygen"                   ON)
-+option (WITH_SAMPLES                        "Intall sample files (require headers)"                 ON)
-+option (WITH_HEADERS                        "Intall header files (to build samples)"                ON)
-+option (WITH_TESTS                          "Install unit tests and benchmarks"                     ON)
- option (WITH_PYTHON                         "Build Python bindings"                                 ON)
- option (WITH_DISNEY_MATERIAL                "Build Disney material"                                 OFF)
- 
-@@ -168,6 +172,9 @@ else ()
-                          "Edit ${CMAKE_CURRENT_LIST_FILE} to add support for it.")
- endif ()
- 
-+# XXX: avoid picking up lz4 headers from /usr/local/include == ${Boost_INCLUDE_DIRS}
-+# if `archivers/liblz4' port is installed.
-+include_directories (src/lz4)
- 
- #--------------------------------------------------------------------------------------------------
- # Auto-generate version headers.
-@@ -262,7 +269,6 @@ endif ()
- # Common include paths.
- include_directories (
-     src/appleseed
--    src/lz4
-     ${PYTHON_INCLUDE_DIRS}
- )
- 
-@@ -579,7 +585,7 @@ endif ()
- 
- find_package (Doxygen)
- 
--if (DOXYGEN_FOUND)
-+if (DOXYGEN_FOUND AND WITH_DOXYGEN)
-     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
-@@ -627,25 +633,35 @@ install (
-     DIRECTORY
-         sandbox/docs
-         sandbox/icons
--        sandbox/samples
-         sandbox/settings
--        sandbox/share
+@@ -732,9 +732,16 @@ install (
+         sandbox/share
          sandbox/stylesheets
      DESTINATION .
++    PATTERN "cmake" EXCLUDE
  )
  
-+if (WITH_SAMPLES)
  install (
--    CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images)"
--    CODE "FILE (MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/images/autosave)"
 +    DIRECTORY
-+        sandbox/samples
-+    DESTINATION .
- )
-+endif ()
- 
- install (
-     DIRECTORY
-+        sandbox/share
-+    DESTINATION ..
++        sandbox/share/cmake
++    DESTINATION ../share
 +)
 +
-+if (WITH_TESTS)
 +install (
-+    DIRECTORY
-         "sandbox/tests/unit benchmarks"
-         "sandbox/tests/unit tests"
-     DESTINATION tests
+     FILES
+         scripts/cleanmany.py
+         scripts/convertmany.py
+@@ -754,11 +761,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)"
  )
-+endif ()
  
-+if (WITH_HEADERS)
- install (
-     DIRECTORY src/appleseed/foundation
-     DESTINATION include
-@@ -663,3 +679,4 @@ install (
-     DESTINATION include
-     FILES_MATCHING PATTERN "*.h"
- )
-+endif ()
+ if (INSTALL_HEADERS)

Copied and modified: head/graphics/appleseed/files/patch-cmake_config_linux-gcc-clang.txt (from r501105, head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt)
==============================================================================
--- head/graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt	Thu May  9 15:02:19 2019	(r501105, copy source)
+++ head/graphics/appleseed/files/patch-cmake_config_linux-gcc-clang.txt	Thu Mar  4 13:56:44 2021	(r567314)
@@ -1,15 +1,15 @@
---- src/cmake/config/linux-gcc.txt.orig	2016-03-29 16:02:26 UTC
-+++ src/cmake/config/linux-gcc.txt
-@@ -119,12 +119,6 @@ if (HIDE_SYMBOLS)
+--- cmake/config/linux-gcc-clang.txt.orig	2019-08-31 15:49:01 UTC
++++ cmake/config/linux-gcc-clang.txt
+@@ -150,12 +150,6 @@ if (HIDE_SYMBOLS)
      )
  endif ()
  
 -# Release configuration.
 -set (c_compiler_flags_release
 -    -O3                                                 # optimization level
+-    -fgcse-las                                          # Eliminates stores followed by a load to the same positions.
+-    -fgcse-sm                                           # Moves load/save instructions out of loops, if possible.
 -)
--
--
- #--------------------------------------------------------------------------------------------------
- # Libraries.
+ 
+ 
  #--------------------------------------------------------------------------------------------------

Added: head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_path.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_path.h	Thu Mar  4 13:56:44 2021	(r567314)
@@ -0,0 +1,10 @@
+--- src/appleseed/foundation/platform/path.h.orig	2019-08-31 15:49:01 UTC
++++ src/appleseed/foundation/platform/path.h
+@@ -40,6 +40,7 @@
+ #include "main/dllsymbol.h"
+ 
+ // Boost headers.
++#include "boost/filesystem/exception.hpp"
+ #include "boost/filesystem/operations.hpp"
+ #include "boost/filesystem/path.hpp"
+ 

Added: head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_system.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/appleseed/files/patch-src_appleseed_foundation_platform_system.cpp	Thu Mar  4 13:56:44 2021	(r567314)
@@ -0,0 +1,82 @@
+--- src/appleseed/foundation/platform/system.cpp.orig	2019-08-31 15:49:01 UTC
++++ src/appleseed/foundation/platform/system.cpp
+@@ -548,6 +548,13 @@ namespace
+             "=d" (regs[edx]));
+     }
+ 
++    uint64 xgetbv(const int32 index)
++    {
++        uint32 eax, edx;
++        __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
++        return (static_cast<uint64>(edx) << 32) | eax;
++    }
++
+ #define BIT(n)              (1UL << (n))
+ #define BITMASK(h, l)       ((BIT(h) | (BIT(h) - 1)) & ~(BIT(l) - 1))
+ #define BITFIELD(x, h, l)   (((x) & BITMASK(h, l)) >> l)
+@@ -1077,7 +1084,8 @@ namespace
+         // Reference: http://stackoverflow.com/a/22521619/922184
+ 
+         uint32 cpuinfo[4];
+-        cpuid(cpuinfo, 1);
++        cpuinfo[0] = 1;
++        cpuid(cpuinfo);
+ 
+         const bool os_uses_xsave_xrstor = (cpuinfo[2] & (1UL << 27)) != 0;
+         const bool cpu_avx_support = (cpuinfo[2] & (1UL << 28)) != 0;
+@@ -1105,7 +1113,8 @@ namespace
+         char vendor[13];
+ 
+         uint32 cpuinfo[4];
+-        cpuid(cpuinfo, 0);
++        cpuinfo[0] = 0;
++        cpuid(cpuinfo);
+ 
+         memcpy(vendor + 0, &cpuinfo[1], 4);
+         memcpy(vendor + 4, &cpuinfo[3], 4);
+@@ -1134,13 +1143,15 @@ void System::detect_x86_cpu_features(X86CPUFeatures& f
+ 
+     // EAX=0: Get vendor ID.
+     uint32 cpuinfo[4];
+-    cpuid(cpuinfo, 0x00000000);
++    cpuinfo[0] = 0;
++    cpuid(cpuinfo);
+     const uint32 highest_function_id = cpuinfo[0];
+ 
+     if (highest_function_id >= 0x00000001)
+     {
+         // EAX=1: Processor Info and Feature Bits.
+-        cpuid(cpuinfo, 0x00000001);
++        cpuinfo[0] = 1;
++        cpuid(cpuinfo);
+         features.m_hw_mmx           = (cpuinfo[3] & (1UL << 23)) != 0;
+         features.m_hw_sse           = (cpuinfo[3] & (1UL << 25)) != 0;
+         features.m_hw_sse2          = (cpuinfo[3] & (1UL << 26)) != 0;
+@@ -1158,7 +1169,8 @@ void System::detect_x86_cpu_features(X86CPUFeatures& f
+     if (highest_function_id >= 0x00000007)
+     {
+         // EAX=7: Extended Features.
+-        cpuid(cpuinfo, 0x00000007);
++        cpuinfo[0] = 7;
++        cpuid(cpuinfo);
+         features.m_hw_avx2          = (cpuinfo[1] & (1UL <<  5)) != 0;
+         features.m_hw_bmi1          = (cpuinfo[1] & (1UL <<  3)) != 0;
+         features.m_hw_bmi2          = (cpuinfo[1] & (1UL <<  8)) != 0;
+@@ -1178,13 +1190,15 @@ void System::detect_x86_cpu_features(X86CPUFeatures& f
+     }
+ 
+     // EAX=0x80000000: Get Highest Extended Function Supported.
+-    cpuid(cpuinfo, 0x80000000);
++    cpuinfo[0] = 0x80000000;
++    cpuid(cpuinfo);
+     const uint32 highest_ext_function_id = cpuinfo[0];
+ 
+     if (highest_ext_function_id >= 0x80000001)
+     {
+         // EAX=0x80000001: Extended Processor Info and Feature Bits.
+-        cpuid(cpuinfo, 0x80000001);
++        cpuinfo[0] = 0x80000001;
++        cpuid(cpuinfo);
+         features.m_hw_x64           = (cpuinfo[3] & (1UL << 29)) != 0;
+         features.m_hw_abm           = (cpuinfo[2] & (1UL <<  5)) != 0;
+         features.m_hw_sse4a         = (cpuinfo[2] & (1UL <<  6)) != 0;

Added: head/graphics/appleseed/files/patch-src_appleseed_foundation_utility_benchmark_benchmarkaggregator.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/appleseed/files/patch-src_appleseed_foundation_utility_benchmark_benchmarkaggregator.cpp	Thu Mar  4 13:56:44 2021	(r567314)
@@ -0,0 +1,10 @@
+--- src/appleseed/foundation/utility/benchmark/benchmarkaggregator.cpp.orig	2019-08-31 15:49:01 UTC
++++ src/appleseed/foundation/utility/benchmark/benchmarkaggregator.cpp
+@@ -40,6 +40,7 @@
+ 
+ // Boost headers.
+ #include "boost/date_time/posix_time/posix_time.hpp"
++#include "boost/filesystem/directory.hpp"
+ #include "boost/filesystem/operations.hpp"
+ #include "boost/filesystem/path.hpp"
+ #include "boost/regex.hpp"

Modified: head/graphics/appleseed/pkg-plist
==============================================================================
--- head/graphics/appleseed/pkg-plist	Thu May  9 15:02:19 2019	(r501105)
+++ head/graphics/appleseed/pkg-plist	Thu Mar  4 13:56:44 2021	(r567314)
@@ -2,7 +2,6 @@ share/cmake/Modules/FindAppleseed.cmake
 share/cmake/Modules/FindImath.cmake
 share/cmake/Modules/FindOSL.cmake
 share/cmake/Modules/FindOpenEXR.cmake
-share/cmake/Modules/FindOpenImageIO.cmake
 share/cmake/Modules/FindPartio.cmake
 share/cmake/Modules/FindSeExpr.cmake
 share/cmake/Modules/FindSeExprEditor.cmake
@@ -10,18 +9,21 @@ share/cmake/Modules/FindXerces.cmake
 @cwd %%APPHOME%%
 bin/animatecamera
 bin/appleseed.cli
+bin/cleanmany.py
 bin/convertmany.py
 bin/convertmeshfile
+bin/denoiser
 bin/dumpmetadata
+bin/idiff
 bin/makefluffy
 bin/maketx
+bin/oiiotool
 bin/oslc
 bin/oslinfo
 bin/projecttool
 bin/rendermanager.py
 bin/rendermany.py
 bin/rendernode.py
-bin/updatemany.py
 docs/osl/osl-languagespec.pdf
 docs/seexpr/Se_voronoi_1.png
 docs/seexpr/Se_voronoi_2.png
@@ -34,6 +36,19 @@ icons/disney_expression.png
 icons/disney_expression_hover.png
 icons/disney_texture.png
 icons/disney_texture_hover.png
+icons/lightpathstab_next_light_path.png
+icons/lightpathstab_next_light_path_disabled.png
+icons/lightpathstab_next_light_path_hover.png
+icons/lightpathstab_prev_light_path.png
+icons/lightpathstab_prev_light_path_disabled.png
+icons/lightpathstab_prev_light_path_hover.png
+icons/lightpathstab_save_light_paths.png
+icons/lightpathstab_save_light_paths_disabled.png
+icons/lightpathstab_save_light_paths_hover.png
+icons/lightpathstab_synchronize_camera.png
+icons/lightpathstab_synchronize_camera_hover.png
+icons/lightpathstab_toggle_backface_culling.png
+icons/lightpathstab_toggle_backface_culling_hover.png
 icons/project_monitor.png
 icons/project_monitor_disabled.png
 icons/project_monitor_hover.png
@@ -49,6 +64,17 @@ icons/project_reload_hover.png
 icons/project_save.png
 icons/project_save_disabled.png
 icons/project_save_hover.png
+icons/python_clear_output.png
+icons/python_clear_output_hover.png
+icons/python_execute_all.png
+icons/python_execute_all_hover.png
+icons/python_execute_selection.png
+icons/python_execute_selection_disabled.png
+icons/python_execute_selection_hover.png
+icons/render_asMatte.png
+icons/rendering_pause_resume.png
+icons/rendering_pause_resume_disabled.png
+icons/rendering_pause_resume_hover.png
 icons/rendering_settings.png
 icons/rendering_settings_disabled.png
 icons/rendering_settings_hover.png
@@ -61,120 +87,83 @@ icons/rendering_start_interactive_hover.png
 icons/rendering_stop.png
 icons/rendering_stop_disabled.png
 icons/rendering_stop_hover.png
-icons/renderwidget_clear_frame.png
-icons/renderwidget_clear_frame_disabled.png
-icons/renderwidget_clear_frame_hover.png
-icons/renderwidget_clear_render_region.png
-icons/renderwidget_clear_render_region_disabled.png
-icons/renderwidget_clear_render_region_hover.png
-icons/renderwidget_quicksave_all_aovs.png
-icons/renderwidget_quicksave_all_aovs_hover.png
-icons/renderwidget_reset_zoom.png
-icons/renderwidget_reset_zoom_hover.png
-icons/renderwidget_save_all_aovs.png
-icons/renderwidget_save_all_aovs_hover.png
-icons/renderwidget_set_render_region.png
-icons/renderwidget_set_render_region_disabled.png
-icons/renderwidget_set_render_region_hover.png
-icons/renderwidget_toggle_pixel_inspector.png
-icons/renderwidget_toggle_pixel_inspector_hover.png
+icons/rendertab_clear_frame.png
+icons/rendertab_clear_frame_disabled.png
+icons/rendertab_clear_frame_hover.png
+icons/rendertab_clear_render_region.png
+icons/rendertab_clear_render_region_disabled.png
+icons/rendertab_clear_render_region_hover.png
+icons/rendertab_quicksave_all_aovs.png
+icons/rendertab_quicksave_all_aovs_hover.png
+icons/rendertab_reset_zoom.png
+icons/rendertab_reset_zoom_hover.png
+icons/rendertab_save_all_aovs.png
+icons/rendertab_save_all_aovs_hover.png
+icons/rendertab_set_render_region.png
+icons/rendertab_set_render_region_disabled.png
+icons/rendertab_set_render_region_hover.png
+icons/rendertab_toggle_pixel_inspector.png
+icons/rendertab_toggle_pixel_inspector_hover.png
 lib/libappleseed.shared.so
 lib/libappleseed.so
-%%PORTEXAMPLES%%samples/cpp/basic/CMakeLists.txt
-%%PORTEXAMPLES%%samples/cpp/basic/basic.cpp
-%%PORTEXAMPLES%%samples/cpp/basic/data/scene.obj
-%%PORTEXAMPLES%%samples/cpp/basic/output/preserve.txt
-%%PORTEXAMPLES%%samples/cpp/basic/reference output/scene.obj
-%%PORTEXAMPLES%%samples/cpp/basic/reference output/test.appleseed
-%%PORTEXAMPLES%%samples/cpp/basic/reference output/test.png
-%%PORTEXAMPLES%%samples/cpp/heightfield/CMakeLists.txt
-%%PORTEXAMPLES%%samples/cpp/heightfield/data/cube.obj
-%%PORTEXAMPLES%%samples/cpp/heightfield/data/heightfield.png
-%%PORTEXAMPLES%%samples/cpp/heightfield/data/smoothcube.obj
-%%PORTEXAMPLES%%samples/cpp/heightfield/heightfield.cpp
-%%PORTEXAMPLES%%samples/cpp/heightfield/output/preserve.txt
-%%PORTEXAMPLES%%samples/python/basic/README.md
-%%PORTEXAMPLES%%samples/python/basic/basic.py
-%%PORTEXAMPLES%%samples/python/basic/data/scene.obj
-%%PORTEXAMPLES%%samples/python/basic/output/preserve.txt
 schemas/project.xsd
 schemas/settings.xsd
 settings/appleseed.cli.xml
 settings/appleseed.studio.xml
 settings/appleseed.tools.xml
-shaders/appleseed/asDisneyMaterial.oso
-shaders/appleseed/asGlass.oso
-shaders/appleseed/asVoronoi2D.oso
-shaders/appleseed/asVoronoi3D.oso
+shaders/appleseed/as_anisotropy_vector_field.oso
+shaders/appleseed/as_asc_cdl.oso
+shaders/appleseed/as_attributes.oso
+shaders/appleseed/as_blackbody.oso
+shaders/appleseed/as_blend_color.oso
+shaders/appleseed/as_blend_shader.oso
+shaders/appleseed/as_bump.oso
+shaders/appleseed/as_closure2surface.oso
+shaders/appleseed/as_color_transform.oso
+shaders/appleseed/as_composite_color.oso
+shaders/appleseed/as_create_mask.oso
+shaders/appleseed/as_disney_material.oso
+shaders/appleseed/as_double_shade.oso
+shaders/appleseed/as_falloff_angle.oso
+shaders/appleseed/as_fresnel.oso
+shaders/appleseed/as_glass.oso
+shaders/appleseed/as_globals.oso
+shaders/appleseed/as_id_manifold.oso
+shaders/appleseed/as_invert_color.oso
+shaders/appleseed/as_luminance.oso
+shaders/appleseed/as_manifold2d.oso
+shaders/appleseed/as_matte.oso
+shaders/appleseed/as_metal.oso
+shaders/appleseed/as_noise2d.oso
+shaders/appleseed/as_noise3d.oso
+shaders/appleseed/as_plastic.oso
+shaders/appleseed/as_ray_switch.oso
+shaders/appleseed/as_sbs_pbrmaterial.oso
+shaders/appleseed/as_space_transform.oso
+shaders/appleseed/as_standard_surface.oso
+shaders/appleseed/as_subsurface.oso
+shaders/appleseed/as_switch_surface.oso
+shaders/appleseed/as_switch_texture.oso
+shaders/appleseed/as_swizzle.oso
+shaders/appleseed/as_texture.oso
+shaders/appleseed/as_texture2surface.oso
+shaders/appleseed/as_texture3d.oso
+shaders/appleseed/as_texture_info.oso
+shaders/appleseed/as_toon.oso
+shaders/appleseed/as_triplanar.oso
+shaders/appleseed/as_vary_color.oso
+shaders/appleseed/as_voronoi2d.oso
+shaders/appleseed/as_voronoi3d.oso
 shaders/as_osl_extensions.h
-shaders/gaffer/color/as_blackbody.oso
-shaders/gaffer/color/as_color_add.oso
-shaders/gaffer/color/as_color_build.oso
-shaders/gaffer/color/as_color_mix.oso
-shaders/gaffer/color/as_color_multiply.oso
-shaders/gaffer/color/as_color_saturation.oso
-shaders/gaffer/color/as_color_split.oso
-shaders/gaffer/color/as_luminance.oso
-shaders/gaffer/color/as_wavelength.oso
-shaders/gaffer/float/as_float_add.oso
-shaders/gaffer/float/as_float_cast.oso
-shaders/gaffer/float/as_float_mix.oso
-shaders/gaffer/float/as_float_multiply.oso
-shaders/gaffer/float/as_float_pow.oso
-shaders/gaffer/float/as_float_remap.oso
-shaders/gaffer/input/as_globals.oso
-shaders/gaffer/input/as_input.oso
-shaders/gaffer/input/as_object_input.oso
-shaders/gaffer/input/as_ray_info.oso
-shaders/gaffer/material/as_disney_material.oso
-shaders/gaffer/material/as_material_builder.oso
-shaders/gaffer/normal/as_bump_map.oso
-shaders/gaffer/normal/as_normal_map.oso
-shaders/gaffer/surface/as_diffuse_surface.oso
-shaders/gaffer/surface/as_emission_surface.oso
-shaders/gaffer/surface/as_glass_surface.oso
-shaders/gaffer/surface/as_glossy_surface.oso
-shaders/gaffer/surface/as_metal_surface.oso
-shaders/gaffer/surface/as_sheen_surface.oso
-shaders/gaffer/surface/as_subsurface_surface.oso
-shaders/gaffer/surface/as_surface_add.oso
-shaders/gaffer/surface/as_surface_mix.oso
-shaders/gaffer/surface/as_surface_multiply.oso
-shaders/gaffer/surface/as_surface_switch.oso
-shaders/gaffer/surface/as_translucent_surface.oso
-shaders/gaffer/surface/as_transparency_surface.oso
-shaders/gaffer/texture2d/as_color_texture.oso
-shaders/gaffer/texture2d/as_noise2d.oso
-shaders/gaffer/texture2d/as_scalar_texture.oso
-shaders/gaffer/texture3d/as_noise3d.oso
-shaders/gaffer/texture3d/as_noise4d.oso
-shaders/gaffer/transform/as_map2d.oso
-shaders/gaffer/transform/as_map3d.oso
-shaders/gaffer/transform/as_transform.oso
-shaders/gaffer/utility/as_condition.oso
-shaders/gaffer/utility/as_float2_build.oso
-shaders/gaffer/utility/as_float2_split.oso
-shaders/gaffer/utility/as_switch.oso
-shaders/gaffer/vector/as_anisotropy_dir.oso
-shaders/gaffer/vector/as_vector_add.oso
-shaders/gaffer/vector/as_vector_build.oso
-shaders/gaffer/vector/as_vector_cross.oso
-shaders/gaffer/vector/as_vector_dot.oso
-shaders/gaffer/vector/as_vector_mix.oso
-shaders/gaffer/vector/as_vector_multiply.oso
-shaders/gaffer/vector/as_vector_normalize.oso
-shaders/gaffer/vector/as_vector_split.oso
+shaders/blenderseed/as_blender_areaLight.oso
 shaders/include/appleseed/color/as_chromatic_adaptation.h
+shaders/include/appleseed/color/as_color_blend_modes.h
 shaders/include/appleseed/color/as_color_helpers.h
 shaders/include/appleseed/color/as_color_transforms.h
 shaders/include/appleseed/color/as_colorimetry.h
 shaders/include/appleseed/color/as_transfer_functions.h
 shaders/include/appleseed/fractal/as_fractal_helpers.h
 shaders/include/appleseed/fractal/as_noise_helpers.h
-shaders/include/appleseed/fractal/as_noise_tables.h
-shaders/include/appleseed/gaffer/color.h
-shaders/include/appleseed/gaffer/transform.h
-shaders/include/appleseed/gaffer/udim.h
 shaders/include/appleseed/material/as_material_helpers.h
 shaders/include/appleseed/math/as_math_complex.h
 shaders/include/appleseed/math/as_math_helpers.h
@@ -184,21 +173,39 @@ shaders/include/appleseed/maya/as_maya_helpers.h
 shaders/include/appleseed/maya/as_maya_layer_helpers.h
 shaders/include/appleseed/maya/as_maya_pattern_helpers.h
 shaders/include/appleseed/maya/as_maya_ramp_helpers.h
+shaders/include/appleseed/maya/as_maya_recurrence_helpers.h
+shaders/include/appleseed/maya/as_maya_recurrence_tables.h
 shaders/include/appleseed/maya/as_maya_transform_helpers.h
 shaders/include/appleseed/pattern/as_pattern_helpers.h
+shaders/include/appleseed/transform/as_transform_helpers.h
+shaders/max/as_max_blend_material.oso
+shaders/max/as_max_bump_map.oso
+shaders/max/as_max_closure2surface.oso
+shaders/max/as_max_color_balance.oso
+shaders/max/as_max_color_texture.oso
+shaders/max/as_max_disney_material.oso
+shaders/max/as_max_float_texture.oso
+shaders/max/as_max_glass_material.oso
+shaders/max/as_max_light_material.oso
+shaders/max/as_max_metal_material.oso
+shaders/max/as_max_normal_map.oso
+shaders/max/as_max_plastic_material.oso
+shaders/max/as_max_srgb_to_linear_rgb.oso
+shaders/max/as_max_sss_material.oso
+shaders/max/as_max_uv_transform.oso
 shaders/maya/as_maya_addDoubleLinear.oso
 shaders/maya/as_maya_addMatrix.oso
 shaders/maya/as_maya_anisotropic.oso
 shaders/maya/as_maya_areaLight.oso
 shaders/maya/as_maya_blendColors.oso
 shaders/maya/as_maya_blinn.oso
+shaders/maya/as_maya_brownian.oso
 shaders/maya/as_maya_bulge.oso
 shaders/maya/as_maya_bump2d.oso
 shaders/maya/as_maya_bump3d.oso
 shaders/maya/as_maya_checker.oso
 shaders/maya/as_maya_clamp.oso
 shaders/maya/as_maya_clearCoat.oso
-shaders/maya/as_maya_closure2Surface.oso
 shaders/maya/as_maya_cloth.oso
 shaders/maya/as_maya_cloud.oso
 shaders/maya/as_maya_color2Components.oso
@@ -207,6 +214,7 @@ shaders/maya/as_maya_components2UV.oso
 shaders/maya/as_maya_components2Vector.oso
 shaders/maya/as_maya_condition.oso
 shaders/maya/as_maya_contrast.oso
+shaders/maya/as_maya_crater.oso
 shaders/maya/as_maya_distanceBetween.oso
 shaders/maya/as_maya_doubleShadingSwitch.oso
 shaders/maya/as_maya_envChrome.oso
@@ -214,12 +222,14 @@ shaders/maya/as_maya_file.oso
 shaders/maya/as_maya_fourByFourMatrix.oso
 shaders/maya/as_maya_fractal.oso
 shaders/maya/as_maya_gammaCorrect.oso
+shaders/maya/as_maya_granite.oso
 shaders/maya/as_maya_grid.oso
 shaders/maya/as_maya_hsvToRgb.oso
 shaders/maya/as_maya_lambert.oso
 shaders/maya/as_maya_layeredTexture.oso
 shaders/maya/as_maya_luminance.oso
 shaders/maya/as_maya_mandelbrot.oso
+shaders/maya/as_maya_marble.oso
 shaders/maya/as_maya_matrixInverse.oso
 shaders/maya/as_maya_mountain.oso
 shaders/maya/as_maya_movie.oso
@@ -240,18 +250,29 @@ shaders/maya/as_maya_remapHsv.oso
 shaders/maya/as_maya_remapValue.oso
 shaders/maya/as_maya_reverse.oso
 shaders/maya/as_maya_rgbToHsv.oso
+shaders/maya/as_maya_rock.oso
 shaders/maya/as_maya_samplerInfo.oso
 shaders/maya/as_maya_setRange.oso
+shaders/maya/as_maya_simplexNoise.oso
 shaders/maya/as_maya_singleShadingSwitch.oso
+shaders/maya/as_maya_snow.oso
+shaders/maya/as_maya_solidFractal.oso
 shaders/maya/as_maya_stencil.oso
-shaders/maya/as_maya_texture2Surface.oso
+shaders/maya/as_maya_stucco.oso
 shaders/maya/as_maya_transposeMatrix.oso
 shaders/maya/as_maya_tripleShadingSwitch.oso
 shaders/maya/as_maya_uv2Components.oso
 shaders/maya/as_maya_vector2Components.oso
 shaders/maya/as_maya_vectorProduct.oso
+shaders/maya/as_maya_volumeNoise.oso
 shaders/maya/as_maya_water.oso
+shaders/maya/as_maya_wood.oso
 shaders/maya/as_maya_wtAddMatrix.oso
 shaders/oslutil.h
 shaders/stdosl.h
+share/aspaths2json.py
+share/mitsuba2appleseed.py
+share/rfmdisneypresets2appleseed.py
+share/substancepainter_presets/appleseed UDIM.spexp
+share/substancepainter_presets/appleseed.spexp
 stylesheets/default.qss



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103041356.124DuiSa086311>