Index: head/graphics/appleseed/files/patch-src_appleseed.python_CMakeLists.txt =================================================================== --- head/graphics/appleseed/files/patch-src_appleseed.python_CMakeLists.txt (revision 568067) +++ head/graphics/appleseed/files/patch-src_appleseed.python_CMakeLists.txt (revision 568068) @@ -1,20 +1,47 @@ --- src/appleseed.python/CMakeLists.txt.orig 2019-08-31 15:49:01 UTC +++ src/appleseed.python/CMakeLists.txt -@@ -182,7 +182,7 @@ if (WITH_PYTHON3_BINDINGS) +@@ -163,11 +163,16 @@ if (WITH_PYTHON2_BINDINGS) + endif () + + if (WITH_PYTHON3_BINDINGS) +- add_library (appleseed.python3 MODULE ++ add_library (appleseed.py3.obj OBJECT + ${appleseed.python_sources} + ${blender_python_sources} + ) + ++ add_library (appleseed.python3 MODULE ++ $ ++ ) ++ ++ set_target_properties (appleseed.py3.obj PROPERTIES FOLDER "Python Bindings") + set_target_properties (appleseed.python3 PROPERTIES FOLDER "Python Bindings") + + set_target_properties (appleseed.python3 PROPERTIES +@@ -182,7 +187,7 @@ if (WITH_PYTHON3_BINDINGS) endif () target_link_libraries (appleseed.python3 - ${OPENGL_LIBRARY} + ${OPENGL_gl_LIBRARY} ) endif () -@@ -288,7 +288,7 @@ endif () +@@ -201,7 +206,7 @@ if (WITH_PYTHON2_BINDINGS) + endif () + + if (WITH_PYTHON3_BINDINGS) +- target_include_directories (appleseed.python3 PRIVATE ${PYTHON3_INCLUDE_DIRS}) ++ target_include_directories (appleseed.py3.obj PRIVATE ${PYTHON3_INCLUDE_DIRS}) + endif () + + +@@ -288,7 +293,7 @@ endif () # Installation. #-------------------------------------------------------------------------------------------------- -set (py_module_dst "lib/python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}/appleseed") -+set (py_module_dst "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/appleseed") ++set (py_module_dst "../lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/appleseed") install (FILES __init__.py DESTINATION ${py_module_dst}) install (FILES logtarget.py DESTINATION ${py_module_dst}) Index: head/graphics/appleseed/pkg-plist =================================================================== --- head/graphics/appleseed/pkg-plist (revision 568067) +++ head/graphics/appleseed/pkg-plist (revision 568068) @@ -1,286 +1,286 @@ share/cmake/Modules/FindAppleseed.cmake share/cmake/Modules/FindImath.cmake share/cmake/Modules/FindOSL.cmake share/cmake/Modules/FindOpenEXR.cmake share/cmake/Modules/FindPartio.cmake share/cmake/Modules/FindSeExpr.cmake share/cmake/Modules/FindSeExprEditor.cmake share/cmake/Modules/FindXerces.cmake +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/_appleseedpython3.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/logtarget.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/test/runtests.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/test/testbasis.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/test/testdict2dict.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/test/testentitymap.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/appleseed/test/testentityvector.py @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 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 icons/appleseed.png 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 icons/project_new.png icons/project_new_disabled.png icons/project_new_hover.png icons/project_open.png icons/project_open_disabled.png icons/project_open_hover.png icons/project_reload.png icons/project_reload_disabled.png 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 icons/rendering_start_final.png icons/rendering_start_final_disabled.png icons/rendering_start_final_hover.png icons/rendering_start_interactive.png icons/rendering_start_interactive_disabled.png icons/rendering_start_interactive_hover.png icons/rendering_stop.png icons/rendering_stop_disabled.png icons/rendering_stop_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 -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/__init__.py -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/_appleseedpython3.so -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/logtarget.py -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/test/runtests.py -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/test/testbasis.py -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/test/testdict2dict.py -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/test/testentitymap.py -%%PYTHON%%lib/python%%PYTHON_VER%%/appleseed/test/testentityvector.py schemas/project.xsd schemas/settings.xsd settings/appleseed.cli.xml settings/appleseed.studio.xml settings/appleseed.tools.xml 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/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/material/as_material_helpers.h shaders/include/appleseed/math/as_math_complex.h shaders/include/appleseed/math/as_math_helpers.h shaders/include/appleseed/maya/as_maya_cms_syncolor_idt.h shaders/include/appleseed/maya/as_maya_fractal_helpers.h 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_cloth.oso shaders/maya/as_maya_cloud.oso shaders/maya/as_maya_color2Components.oso shaders/maya/as_maya_components2Color.oso 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 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 shaders/maya/as_maya_multDoubleLinear.oso shaders/maya/as_maya_multMatrix.oso shaders/maya/as_maya_multiplyDivide.oso shaders/maya/as_maya_noise.oso shaders/maya/as_maya_phong.oso shaders/maya/as_maya_phongE.oso shaders/maya/as_maya_place2dTexture.oso shaders/maya/as_maya_place3dTexture.oso shaders/maya/as_maya_plusMinusAverage.oso shaders/maya/as_maya_psdFileTex.oso shaders/maya/as_maya_quadShadingSwitch.oso shaders/maya/as_maya_ramp.oso shaders/maya/as_maya_remapColor.oso 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_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