graphics/blender: update to 3.5.1 release (+)

Changelog: https://wiki.blender.org/wiki/Reference/Release_Notes/3.5 https://wiki.blender.org/wiki/Reference/Release_Notes/3.5/Corrective_Releases Approved by: maintainer (implicit) Sponsored by: Serenity Cybersecurity, LLC
freebsd · May 26, 2023 · 2233c84 · 2233c84
1 parent 34000b5
commit 2233c84
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 107 deletions.
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	blender
-DISTVERSION=	3.4.1
-PORTREVISION=	9
+DISTVERSION=	3.5.1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
@@ -27,18 +26,18 @@ RUN_DEPENDS=	${PYNUMPY}
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
-USES=		cmake compiler:c++17-lang cpe gl jpeg llvm:min=9 \
+USES=		cmake compiler:c++17-lang cpe gl jpeg llvm:min=9,max=15 \
 		python:3.10 shebangfix tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
-		WITH_CYCLES_LOGGING WITH_USD
+		WITH_USD
 
-SHEBANG_FILES=	release/scripts/modules/bl_i18n_utils/merge_po.py \
-		release/scripts/modules/bl_i18n_utils/utils_rtl.py \
-		release/scripts/modules/blend_render_info.py
+SHEBANG_FILES=	scripts/modules/bl_i18n_utils/merge_po.py \
+		scripts/modules/bl_i18n_utils/utils_rtl.py \
+		scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
@@ -71,7 +70,9 @@ COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
-CYCLES_CMAKE_BOOL=		WITH_CYCLES
+CYCLES_CMAKE_BOOL=		WITH_CYCLES WITH_CYCLES_LOGGING
+CYCLES_LIB_DEPENDS=		libgflags.so:devel/gflags
+CYCLES_LDFLAGS=			-L${LOCALBASE}/lib -lgflags
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree

diff --git a/graphics/blender/Makefile.versions b/graphics/blender/Makefile.versions
@@ -1,4 +1,4 @@
 # Versions of Blender and its python dependency for use by depending ports, like add-ons
 
-BLENDER_BL_VERSION=	3.4.1
+BLENDER_BL_VERSION=	3.5.1
 BLENDER_PY_VERSION=	3.10
diff --git a/graphics/blender/files/patch-CMakeLists.txt b/graphics/blender/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2022-11-18 15:14:53 UTC
+--- CMakeLists.txt.orig	2023-02-21 16:36:49 UTC
 +++ CMakeLists.txt
-@@ -824,11 +824,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES       
+@@ -859,11 +859,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID    
  set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
  set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)
 

diff --git a/graphics/blender/files/patch-extern_sdlew_CMakeLists.txt b/graphics/blender/files/patch-extern_sdlew_CMakeLists.txt
diff --git a/graphics/blender/files/patch-intern_cycles_CMakeLists.txt b/graphics/blender/files/patch-intern_cycles_CMakeLists.txt
@@ -1,7 +1,7 @@
---- intern/cycles/CMakeLists.txt.orig	2019-07-31 13:03:30 UTC
+--- intern/cycles/CMakeLists.txt.orig	2023-02-15 14:56:19 UTC
 +++ intern/cycles/CMakeLists.txt
-@@ -260,9 +260,9 @@ if(WITH_CYCLES_DEBUG)
-   add_definitions(-DWITH_CYCLES_DEBUG)
+@@ -377,9 +377,9 @@ endif()
+   add_definitions(-DWITH_CYCLES_DEBUG_NAN)
  endif()
 
 -if(NOT OPENIMAGEIO_PUGIXML_FOUND)
@@ -10,5 +10,5 @@
 -endif()
 +#endif()
 
- include_directories(
-   SYSTEM
+ if(CYCLES_STANDALONE_REPOSITORY)
+   include_directories(../third_party/atomic)
diff --git a/graphics/blender/files/patch-intern_locale_boost__locale__wrapper.cpp b/graphics/blender/files/patch-intern_locale_boost__locale__wrapper.cpp
@@ -5,9 +5,9 @@ Adding include as suggested by the compiler:
 "intern/locale/boost_locale_wrapper.cpp:12:1: note: ‘std::cout’ is defined 
 in header ‘<iostream>’; did you forget to ‘#include <iostream>’?"
 
---- intern/locale/boost_locale_wrapper.cpp
+--- intern/locale/boost_locale_wrapper.cpp.orig	2023-02-15 14:56:19 UTC
 +++ intern/locale/boost_locale_wrapper.cpp
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
  #include <stdio.h>
 
  #include "boost_locale_wrapper.h"

diff --git a/...tf2__io__draco__compression__extension.py → ...tf2__io__draco__compression__extension.py b/...tf2__io__draco__compression__extension.py → ...tf2__io__draco__compression__extension.py
@@ -1,6 +1,6 @@
---- release/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py.orig	2021-03-24 15:01:52 UTC
-+++ release/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
-@@ -44,7 +44,7 @@ def dll_path() -> Path:
+--- scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py.orig	2023-02-15 14:57:11 UTC
++++ scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+@@ -33,7 +33,7 @@ def dll_path() -> Path:
          'win32': '{}.dll'.format(lib_name),
          'linux': 'lib{}.so'.format(lib_name),
          'darwin': 'lib{}.dylib'.format(lib_name)

diff --git a/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c b/graphics/blender/files/patch-source_blender_blenkernel_intern_writeffmpeg.c
diff --git a/graphics/blender/files/patch-source_blender_imbuf_intern_anim__movie.c b/graphics/blender/files/patch-source_blender_imbuf_intern_anim__movie.c
diff --git a/graphics/blender/files/patch-source_blender_imbuf_intern_indexer.c b/graphics/blender/files/patch-source_blender_imbuf_intern_indexer.c
diff --git a/graphics/blender/files/patch-source_creator_symbols__unix.map b/graphics/blender/files/patch-source_creator_symbols__unix.map