CVS commit: pkgsrc/graphics/blender

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan  5 18:01:08 UTC 2026

Modified Files:
        pkgsrc/graphics/blender: Makefile distinfo
Added Files:
        pkgsrc/graphics/blender/patches:
            patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc

Log Message:
blender: updated to 4.2.16

4.2.16 LTS

* Fix (unreported) Collada: missing `finish` call on some modified attribute. (3e6fd24bb89)
* anim_transforms_to_deltas resets non-keyframed object transforms values.
* install_linux_packages: Fix for Fedora ≥ 41 (DNF5). (e5a5e475903)
* Blender Timeline animation, SHIFT vs CTRL selection difference.
* Rigify doesn't check existence of collection properly.
* Missing Runtime Libraries if Blender is Built with `py`-Infix in Path.
* Cant delete new raytracing preset if called "Default".
* Default Preset protection interacts with custom Presets, leading to them not being deletable.
* Depsgraph doesn't build relations for camera markers.
* Blender 4.2 LTS reports the wrong minimum GPU driver requirements for HIP on Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/graphics/blender/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/blender/patches/patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/blender/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.242 pkgsrc/graphics/blender/Makefile:1.243
--- pkgsrc/graphics/blender/Makefile:1.242      Mon Dec 22 06:08:08 2025
+++ pkgsrc/graphics/blender/Makefile    Mon Jan  5 18:01:07 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.242 2025/12/22 06:08:08 adam Exp $
+# $NetBSD: Makefile,v 1.243 2026/01/05 18:01:07 adam Exp $
 
-DISTNAME=      blender-4.2.14
-PKGREVISION=   2
+DISTNAME=      blender-4.2.16
 CATEGORIES=    graphics
 MASTER_SITES=  https://download.blender.org/source/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/blender/distinfo
diff -u pkgsrc/graphics/blender/distinfo:1.80 pkgsrc/graphics/blender/distinfo:1.81
--- pkgsrc/graphics/blender/distinfo:1.80       Mon Sep 29 02:35:56 2025
+++ pkgsrc/graphics/blender/distinfo    Mon Jan  5 18:01:07 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.80 2025/09/29 02:35:56 mrg Exp $
+$NetBSD: distinfo,v 1.81 2026/01/05 18:01:07 adam Exp $
 
-BLAKE2s (blender-4.2.14.tar.xz) = 07fdf19422b1e901555a24e18b670a00d8c846c993bc7d9592d3722b7ddc9f63
-SHA512 (blender-4.2.14.tar.xz) = 4423b6a7b004c357f8ee09cb9b7496432534c50b6be21148657d8f342d69e55e019c3368b56ff0f1253ae328b0cac73618655a51b389c9ea5686c4c57aabe9bb
-Size (blender-4.2.14.tar.xz) = 75349316 bytes
+BLAKE2s (blender-4.2.16.tar.xz) = 9c93943ab521307cb5f01c2f828d18335ae0fdbaede2142f6649e6d24edefe2e
+SHA512 (blender-4.2.16.tar.xz) = 11e07e3df21aba85263faa9e0a7fb5be7a0415749b951327f842c8e05c46fce94debf5dfb1f57007e4034d6d7abfec9ef4e94e5bb9c4c57641c52675e0401059
+Size (blender-4.2.16.tar.xz) = 75352960 bytes
 SHA1 (patch-4f4c3f73b697436922464e087823f53e8681d7e8) = 9a3ab579122660b4cb3a11f68ec63abdb5b146a7
 SHA1 (patch-CMakeLists.txt) = 722c852b2c7f804a0fec93cec4e4c8f54d286204
 SHA1 (patch-build__files_cmake_Modules_FindOpenColorIO.cmake) = 142b0860abeae94deda0dfdcc985e4b4696cf93a
@@ -18,6 +18,7 @@ SHA1 (patch-source_blender_blenkernel_in
 SHA1 (patch-source_blender_blenkernel_intern_particle__distribute.cc) = ac83135847cf2abf729d12eac30142fe5f13a5b2
 SHA1 (patch-source_blender_blenlib_intern_math__geom.cc) = 4d3b0c283865a3b64622a3a027a0c2c95c5bfbab
 SHA1 (patch-source_blender_blenlib_intern_storage.cc) = 53f548b2c869c4ff71c74e558ea21a1c1c22bb67
+SHA1 (patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc) = 5f595b5b35d518643713a1ac0e21ead198f7ba27
 SHA1 (patch-source_blender_draw_engines_eevee__next_eevee__shadow.cc) = 95c83cda8a769b3ca515c311e17da6ed9a8c40d0
 SHA1 (patch-source_blender_editors_interface_interface.cc) = 93cdbee5084a23a42c023b4307fd27cee6d8784f
 SHA1 (patch-source_blender_editors_interface_interface__draw.cc) = ef7578bb527ba1169fa54faf694dffb099a6a200

Added files:

Index: pkgsrc/graphics/blender/patches/patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc:1.1
--- /dev/null   Mon Jan  5 18:01:08 2026
+++ pkgsrc/graphics/blender/patches/patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc     Mon Jan  5 18:01:07 2026
@@ -0,0 +1,86 @@
+$NetBSD: patch-source_blender_compositor_realtime__compositor_cached__resources_intern_ocio__color__space__conversion__shader.cc,v 1.1 2026/01/05 18:01:07 adam Exp $
+
+Fix build with opencolorio 2.5.
+
+--- source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc.orig   2026-01-05 17:24:10.326855833 +0000
++++ source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
+@@ -168,7 +168,12 @@ class GPUShaderCreator : public OCIO::Gp
+ 
+   bool addUniform(const char *name,
+                   const SizeGetter &get_size,
+-                  const VectorFloatGetter &get_vector_float) override
++                  const VectorFloatGetter &get_vector_float
++#  if OCIO_VERSION_HEX >= 0x02050000
++                  ,
++                  const unsigned /*maxSize*/
++#  endif
++                  ) override
+   {
+     /* Check if a resource exists with the same name and assert if it is the case, returning false
+      * indicates failure to add the uniform for the shader creator. */
+@@ -190,7 +195,12 @@ class GPUShaderCreator : public OCIO::Gp
+ 
+   bool addUniform(const char *name,
+                   const SizeGetter &get_size,
+-                  const VectorIntGetter &get_vector_int) override
++                  const VectorIntGetter &get_vector_int
++#  if OCIO_VERSION_HEX >= 0x02050000
++                  ,
++                  const unsigned /*maxSize*/
++#  endif
++                  ) override
+   {
+     /* Check if a resource exists with the same name and assert if it is the case, returning false
+      * indicates failure to add the uniform for the shader creator. */
+@@ -210,7 +220,12 @@ class GPUShaderCreator : public OCIO::Gp
+     return true;
+   }
+ 
+-  void addTexture(const char *texture_name,
++#  if OCIO_VERSION_HEX >= 0x02050000
++  unsigned
++#  else
++  void
++#  endif
++  addTexture(const char *texture_name,
+                   const char *sampler_name,
+                   uint width,
+                   uint height,
+@@ -252,9 +267,17 @@ class GPUShaderCreator : public OCIO::Gp
+     GPU_texture_filter_mode(texture, interpolation != OCIO::INTERP_NEAREST);
+ 
+     textures_.add(sampler_name, texture);
++#  if OCIO_VERSION_HEX >= 0x02050000
++    return textures_.size() - 1;
++#  endif
+   }
+ 
+-  void add3DTexture(const char *texture_name,
++#  if OCIO_VERSION_HEX >= 0x02050000
++  unsigned
++#  else
++  void
++#  endif
++  add3DTexture(const char *texture_name,
+                     const char *sampler_name,
+                     uint size,
+                     OCIO::Interpolation interpolation,
+@@ -282,12 +305,18 @@ class GPUShaderCreator : public OCIO::Gp
+     GPU_texture_filter_mode(texture, interpolation != OCIO::INTERP_NEAREST);
+ 
+     textures_.add(sampler_name, texture);
++#  if OCIO_VERSION_HEX >= 0x02050000
++    return textures_.size() - 1;
++#  endif
+   }
+ 
+   /* This gets called before the finalize() method to construct the shader code. We just
+    * concatenate the code except for the declarations section. That's because the ShaderCreateInfo
+    * will add the declaration itself. */
+   void createShaderText(const char * /*declarations*/,
++#  if OCIO_VERSION_HEX >= 0x02050000
++                        const char * /*texture_declarations*/,
++#  endif
+                         const char *helper_methods,
+                         const char *function_header,
+                         const char *function_body,