mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Update to version 1.4.0-beta, the latest to date

Browse Source 
- Remove a patch that was integrated upstream
- Add two more patches to inhibit GCC attempts to invoke private copy ctor
This commit is contained in:
Alexey Dokuchaev 2016-06-02 14:38:25 +00:00
parent 7fcd63424c
commit cc1f4fb726
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=416280
8 changed files with 168 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/appleseed/Makefile
View File

@ -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 uic_build opengl
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: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 <bsd.port.mk>

4
graphics/appleseed/distinfo
View File

@ -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

12
graphics/appleseed/files/patch-CMakeLists.txt
View File

@ -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"
)

72
graphics/appleseed/files/patch-src_appleseed_foundation_platform_x86timer.cpp
View File

@ -1,72 +0,0 @@
--- src/appleseed/foundation/platform/x86timer.cpp.orig 2015-11-03 13:40:41 UTC
+++ src/appleseed/foundation/platform/x86timer.cpp
@@ -105,16 +105,26 @@ uint64 X86Timer::read_start()
// gcc.
#elif defined __GNUC__
- uint32 h, l;
+ uint32 h, l, _dummy;
+ // %ebx may be used to point to GOT for PIC on 32-bit x86, so it must be
+ // preserved (cf. src/appleseed/foundation/platform/system.cpp).
+ // We force in-order execution of the RDTSC instruction by calling CPUID
+ // first. Reference: "Using the RDTSC Instruction for Performance
+ // Monitoring", Section 3.1, p. 3 [Intel 1997].
asm volatile (
- "cpuid\n\t" // force in-order execution of the RDTSC instruction
- "rdtsc\n\t"
- "mov %%edx, %0\n\t"
- "mov %%eax, %1\n\t"
- : "=r" (h), "=r" (l) // outputs
- : // inputs
- : "%rax", "%rbx", "%rcx", "%rdx" // clobbered registers
+#if __x86_64__
+ "movq %%rbx, %q2\n\t"
+ "cpuid\n\t"
+ "xchgq %%rbx, %q2\n\t"
+#else
+ "movl %%ebx, %2\n\t"
+ "cpuid\n\t"
+ "xchgl %%ebx, %2\n\t"
+#endif
+ "rdtsc"
+ : "=d" (h), "=a" (l), "=r" (_dummy)
+ : : "ecx"
);
return (static_cast<uint64>(h) << 32) | l;
@@ -158,16 +168,27 @@ uint64 X86Timer::read_end()
// gcc.
#elif defined __GNUC__
- uint32 h, l;
+ uint32 h, l, _dummy;
+ // Here we call CPUID to prevent instructions coming afterward from
+ // executing before the RDTSCP instruction. Reference: "How to
+ // Benchmark Code Execution Times on Intel IA-32 and IA-64 Instruction
+ // Set Architectures", Section 3.2.1, p. 16 [Intel 2010].
asm volatile (
"rdtscp\n\t"
- "mov %%edx, %0\n\t"
- "mov %%eax, %1\n\t"
- "cpuid\n\t" // prevent instructions coming afterward from executing before the RDTSCP instruction
- : "=r" (h), "=r" (l) // outputs
- : // inputs
- : "%rax", "%rbx", "%rcx", "%rdx" // clobbered registers
+ "movl %%edx, %0\n\t"
+ "movl %%eax, %1\n\t"
+#if __x86_64__
+ "movq %%rbx, %q2\n\t"
+ "cpuid\n\t"
+ "xchgq %%rbx, %q2\n\t"
+#else
+ "movl %%ebx, %2\n\t"
+ "cpuid\n\t"
+ "xchgl %%ebx, %2\n\t"
+#endif
+ : "=m" (h), "=m" (l), "=r" (_dummy)
+ : : "eax", "ecx", "edx"
);
return (static_cast<uint64>(h) << 32) | l;

70
graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_glossybrdf.cpp Normal file
View File

@ -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<double> ggxmdf;
MicrofacetBRDFHelper<double>::sample(
sampling_context,
- GGXMDF<double>(),
+ ggxmdf,
alpha_x,
alpha_y,
f,
@@ -188,9 +189,10 @@ namespace
}
else
{
+ BeckmannMDF<double> beckmannmdf;
MicrofacetBRDFHelper<double>::sample(
sampling_context,
- BeckmannMDF<double>(),
+ beckmannmdf,
alpha_x,
alpha_y,
f,
@@ -236,8 +238,9 @@ namespace
if (m_mdf == GGX)
{
+ GGXMDF<double> ggxmdf;
return MicrofacetBRDFHelper<double>::evaluate(
- GGXMDF<double>(),
+ ggxmdf,
alpha_x,
alpha_y,
shading_basis,
@@ -250,8 +253,9 @@ namespace
}
else
{
+ BeckmannMDF<double> beckmannmdf;
return MicrofacetBRDFHelper<double>::evaluate(
- BeckmannMDF<double>(),
+ beckmannmdf,
alpha_x,
alpha_y,
shading_basis,
@@ -293,8 +297,9 @@ namespace
if (m_mdf == GGX)
{
+ GGXMDF<double> ggxmdf;
return MicrofacetBRDFHelper<double>::pdf(
- GGXMDF<double>(),
+ ggxmdf,
alpha_x,
alpha_y,
shading_basis,
@@ -303,8 +308,9 @@ namespace
}
else
{
+ BeckmannMDF<double> beckmannmdf;
return MicrofacetBRDFHelper<double>::pdf(
- BeckmannMDF<double>(),
+ beckmannmdf,
alpha_x,
alpha_y,
shading_basis,

70
graphics/appleseed/files/patch-src_appleseed_renderer_modeling_bsdf_metalbrdf.cpp Normal file
View File

@ -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<double> ggxmdf;
MicrofacetBRDFHelper<double>::sample(
sampling_context,
- GGXMDF<double>(),
+ ggxmdf,
alpha_x,
alpha_y,
f,
@@ -212,9 +213,10 @@ namespace
}
else
{
+ BeckmannMDF<double> beckmannmdf;
MicrofacetBRDFHelper<double>::sample(
sampling_context,
- BeckmannMDF<double>(),
+ beckmannmdf,
alpha_x,
alpha_y,
f,
@@ -260,8 +262,9 @@ namespace
if (m_mdf == GGX)
{
+ GGXMDF<double> ggxmdf;
return MicrofacetBRDFHelper<double>::evaluate(
- GGXMDF<double>(),
+ ggxmdf,
alpha_x,
alpha_y,
shading_basis,
@@ -274,8 +277,9 @@ namespace
}
else
{
+ BeckmannMDF<double> beckmannmdf;
return MicrofacetBRDFHelper<double>::evaluate(
- BeckmannMDF<double>(),
+ beckmannmdf,
alpha_x,
alpha_y,
shading_basis,
@@ -317,8 +321,9 @@ namespace
if (m_mdf == GGX)
{
+ GGXMDF<double> ggxmdf;
return MicrofacetBRDFHelper<double>::pdf(
- GGXMDF<double>(),
+ ggxmdf,
alpha_x,
alpha_y,
shading_basis,
@@ -327,8 +332,9 @@ namespace
}
else
{
+ BeckmannMDF<double> beckmannmdf;
return MicrofacetBRDFHelper<double>::pdf(
- BeckmannMDF<double>(),
+ beckmannmdf,
alpha_x,
alpha_y,
shading_basis,

12
graphics/appleseed/files/patch-src_cmake_config_linux-gcc.txt
View File

@ -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 ()

36
graphics/appleseed/pkg-plist
View File

@ -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