CVS commit: pkgsrc/graphics/blender-lts

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Jul 25 06:00:39 UTC 2024

Modified Files:
        pkgsrc/graphics/blender-lts: distinfo
Added Files:
        pkgsrc/graphics/blender-lts/patches:
            patch-intern_cycles_kernel_light_tree.h
            patch-source_blender_blenkernel_intern_dynamicpaint.cc
            patch-source_blender_blenlib_BLI__math__matrix.hh
            patch-source_blender_editors_interface_interface__handlers.cc
            patch-source_blender_geometry_intern_uv__parametrizer.cc
            patch-source_blender_modifiers_intern_MOD__ocean.cc
            patch-source_blender_modifiers_intern_MOD__skin.cc
            patch-source_blender_modifiers_intern_MOD__surfacedeform.cc

Log Message:
graphics/blender-lts: Fix build with GCC 12.4.0 in NetBSD/amd64-current.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/blender-lts/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/blender-lts/patches/patch-intern_cycles_kernel_light_tree.h \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenkernel_intern_dynamicpaint.cc \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenlib_BLI__math__matrix.hh \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_editors_interface_interface__handlers.cc \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_geometry_intern_uv__parametrizer.cc \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__ocean.cc \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__skin.cc \
    pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__surfacedeform.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-lts/distinfo
diff -u pkgsrc/graphics/blender-lts/distinfo:1.8 pkgsrc/graphics/blender-lts/distinfo:1.9
--- pkgsrc/graphics/blender-lts/distinfo:1.8    Mon Jun 17 13:55:45 2024
+++ pkgsrc/graphics/blender-lts/distinfo        Thu Jul 25 06:00:38 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2024/06/17 13:55:45 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2024/07/25 06:00:38 ryoon Exp $
 
 BLAKE2s (blender-3.6.12.tar.xz) = 694d9c81c15567deb40df317e4d92b533f0724c90a64ce142fc16454597b4855
 SHA512 (blender-3.6.12.tar.xz) = cddaf51998caa03cf21e74a4f14aadb83dac72d8f1067331e5d29fdfd87767011c996ad87c2a33df9884cca8222536e262e7865b13c7fc7e8a70944dba3605c7
@@ -6,16 +6,24 @@ Size (blender-3.6.12.tar.xz) = 67899636 
 SHA1 (patch-CMakeLists.txt) = 633e27f2ee5f5ad6b200d97ed1fbe8b2f17172ef
 SHA1 (patch-extern_Eigen3_Eigen_src_Core_IO.h) = 791224b988da0383c306e76de5e93cb1cedc960e
 SHA1 (patch-extern_Eigen3_Eigen_src_Core_arch_CUDA_Half.h) = ee35286558e5590495f1c973ae99ede32048ac38
+SHA1 (patch-intern_cycles_kernel_light_tree.h) = b2d2827f769ffe3b8bde413dd0e19ebb6f2367b4
 SHA1 (patch-intern_locale_boost__locale__wrapper.cpp) = e743a3f050daa175e8398da12b1de133e3814928
 SHA1 (patch-intern_mikktspace_mikk__float3.hh) = 715fa20ba39d7ad41f32e580189ac4fc2e8b0274
 SHA1 (patch-source_blender_blenkernel_intern_customdata.cc) = 0cb4f03d101f1d200d95c2469c17bb987b4c7570
+SHA1 (patch-source_blender_blenkernel_intern_dynamicpaint.cc) = f704d2abde466b56c6ba9a657e29e5f6bcb7d084
 SHA1 (patch-source_blender_blenkernel_intern_gpencil__geom.cc) = 1c54b6446744e52e5e9a6ebe48d221086b905f2c
 SHA1 (patch-source_blender_blenkernel_intern_mesh__validate.cc) = a21046b4d6fbf6fcec96d9410c725481d9f77a20
 SHA1 (patch-source_blender_blenkernel_intern_multires.cc) = 9edd6713c12b203e6b856d0b2f6d24ae5113d285
 SHA1 (patch-source_blender_blenkernel_intern_object.cc) = fd8cf2ea4f27e08f2e08b53f6d27228d9d770a2f
+SHA1 (patch-source_blender_blenlib_BLI__math__matrix.hh) = 42961230fe4cd404ff099a0436a84661d5f80364
 SHA1 (patch-source_blender_blenlib_intern_storage.c) = de8c7f00ea3fafc38bc1f125ebc4bb639128ff93
 SHA1 (patch-source_blender_editors_interface_interface.cc) = 94be42726f75d8e130c78f2be822b61e2b25b2fb
+SHA1 (patch-source_blender_editors_interface_interface__handlers.cc) = 2927763d77f5123830470cc64fff1ef35635a2a8
 SHA1 (patch-source_blender_editors_mesh_meshtools.cc) = b44f662227023df31496f8d17ebd54a02528f304
+SHA1 (patch-source_blender_geometry_intern_uv__parametrizer.cc) = 4cfe4c9d04017c55aba11da85d476be8aa101688
 SHA1 (patch-source_blender_gpu_intern_gpu_matrix.cc) = 6692d68e6adacd2640efea3f5b666444003159d6
 SHA1 (patch-source_blender_imbuf_intern_anim_movie.c) = f1048c1d2c31eb64d7a3493a03140a28961822af
+SHA1 (patch-source_blender_modifiers_intern_MOD__ocean.cc) = 59d5d65ca921c9afff971e3fb2a3db414087e768
+SHA1 (patch-source_blender_modifiers_intern_MOD__skin.cc) = 29e9983ea05a6af91faa1877232313085ff6af18
+SHA1 (patch-source_blender_modifiers_intern_MOD__surfacedeform.cc) = 735a15402887ce072d2d06c215dadb9a9dcec1b5
 SHA1 (patch-source_blender_windowmanager_intern_wm__event__system.cc) = cc70ccce18f4d040f7544d14e98d9f569a3b6501

Added files:

Index: pkgsrc/graphics/blender-lts/patches/patch-intern_cycles_kernel_light_tree.h
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-intern_cycles_kernel_light_tree.h:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-intern_cycles_kernel_light_tree.h Thu Jul 25 06:00:38 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-intern_cycles_kernel_light_tree.h,v 1.1 2024/07/25 06:00:38 ryoon Exp $
+
+--- intern/cycles/kernel/light/tree.h.orig     2024-07-02 09:35:59.386137324 +0000
++++ intern/cycles/kernel/light/tree.h
+@@ -190,7 +190,7 @@ ccl_device void light_tree_importance(co
+     cos_min_outgoing_angle = 1.0f;
+   }
+   else if ((bcone.theta_o + bcone.theta_e > M_PI_F) ||
+-           (cos_theta_minus_theta_u > cos(bcone.theta_o + bcone.theta_e)))
++           (double(cos_theta_minus_theta_u) > cos(bcone.theta_o + bcone.theta_e)))
+   {
+     /* theta' = theta - theta_o - theta_u < theta_e */
+     kernel_assert(
+@@ -220,7 +220,7 @@ ccl_device void light_tree_importance(co
+   float cos_max_outgoing_angle;
+   const float cos_theta_plus_theta_u = cos_theta * cos_theta_u - sin_theta * sin_theta_u;
+   if (bcone.theta_e - bcone.theta_o < 0 || cos_theta < 0 || cos_theta_u < 0 ||
+-      cos_theta_plus_theta_u < cos(bcone.theta_e - bcone.theta_o))
++      double(cos_theta_plus_theta_u) < cos(bcone.theta_e - bcone.theta_o))
+   {
+     min_importance = 0.0f;
+   }
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenkernel_intern_dynamicpaint.cc
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenkernel_intern_dynamicpaint.cc:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenkernel_intern_dynamicpaint.cc  Thu Jul 25 06:00:38 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_blender_blenkernel_intern_dynamicpaint.cc,v 1.1 2024/07/25 06:00:38 ryoon Exp $
+
+--- source/blender/blenkernel/intern/dynamicpaint.cc.orig      2024-07-02 09:50:56.955643689 +0000
++++ source/blender/blenkernel/intern/dynamicpaint.cc
+@@ -4609,7 +4609,7 @@ static bool dynamicPaint_paintParticles(
+ 
+     /* for debug purposes check if any NAN particle proceeds
+      * For some reason they get past activity check, this should rule most of them out */
+-    if (isnan(pa->state.co[0]) || isnan(pa->state.co[1]) || isnan(pa->state.co[2])) {
++    if (std::isnan(pa->state.co[0]) || std::isnan(pa->state.co[1]) || std::isnan(pa->state.co[2])) {
+       invalidParticles++;
+       continue;
+     }
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenlib_BLI__math__matrix.hh
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenlib_BLI__math__matrix.hh:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_blenlib_BLI__math__matrix.hh       Thu Jul 25 06:00:38 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_blender_blenlib_BLI__math__matrix.hh,v 1.1 2024/07/25 06:00:38 ryoon Exp $
+
+--- source/blender/blenlib/BLI_math_matrix.hh.orig     2024-07-02 09:39:52.837279764 +0000
++++ source/blender/blenlib/BLI_math_matrix.hh
+@@ -862,7 +862,7 @@ template<typename T> QuaternionBase<T> n
+ template<typename T> QuaternionBase<T> normalized_to_quat_with_checks(const MatBase<T, 3, 3> &mat)
+ {
+   const T det = math::determinant(mat);
+-  if (UNLIKELY(!isfinite(det))) {
++  if (UNLIKELY(!std::isfinite(det))) {
+     return QuaternionBase<T>::identity();
+   }
+   else if (UNLIKELY(det < T(0))) {
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_editors_interface_interface__handlers.cc
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_editors_interface_interface__handlers.cc:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_editors_interface_interface__handlers.cc   Thu Jul 25 06:00:39 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-source_blender_editors_interface_interface__handlers.cc,v 1.1 2024/07/25 06:00:39 ryoon Exp $
+
+--- source/blender/editors/interface/interface_handlers.cc.orig        2024-07-02 09:48:42.973784856 +0000
++++ source/blender/editors/interface/interface_handlers.cc
+@@ -4107,10 +4107,10 @@ static void ui_numedit_begin(uiBut *but,
+         /* Center around the value, keeping in the real soft min/max range. */
+         softmin = data->origvalue - (softrange_max / 2);
+         softmax = data->origvalue + (softrange_max / 2);
+-        if (!isfinite(softmin)) {
++        if (!std::isfinite(softmin)) {
+           softmin = (data->origvalue > 0.0f ? FLT_MAX : -FLT_MAX);
+         }
+-        if (!isfinite(softmax)) {
++        if (!std::isfinite(softmax)) {
+           softmax = (data->origvalue > 0.0f ? FLT_MAX : -FLT_MAX);
+         }
+ 
+@@ -5501,7 +5501,7 @@ static int ui_do_but_NUM(
+           double precision = (roundf(log10f(data->value) + UI_PROP_SCALE_LOG_SNAP_OFFSET) - 1.0f) +
+                              log10f(number_but->step_size);
+           /* Non-finite when `data->value` is zero. */
+-          if (UNLIKELY(!isfinite(precision))) {
++          if (UNLIKELY(!std::isfinite(precision))) {
+             precision = -FLT_MAX; /* Ignore this value. */
+           }
+           value_step = powf(10.0f, max_ff(precision, -number_but->precision));
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_geometry_intern_uv__parametrizer.cc
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_geometry_intern_uv__parametrizer.cc:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_geometry_intern_uv__parametrizer.cc        Thu Jul 25 06:00:39 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_blender_geometry_intern_uv__parametrizer.cc,v 1.1 2024/07/25 06:00:39 ryoon Exp $
+
+--- source/blender/geometry/intern/uv_parametrizer.cc.orig     2024-07-02 09:38:38.338288091 +0000
++++ source/blender/geometry/intern/uv_parametrizer.cc
+@@ -681,7 +681,7 @@ static PVert *p_vert_add(ParamHandle *ha
+    * Note that values within the calculation may _become_ non-finite,
+    * so the rest of the code still needs to take this possibility into account. */
+   for (int i = 0; i < 3; i++) {
+-    if (UNLIKELY(!isfinite(v->co[i]))) {
++    if (UNLIKELY(!std::isfinite(v->co[i]))) {
+       v->co[i] = 0.0f;
+     }
+   }
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__ocean.cc
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__ocean.cc:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__ocean.cc     Thu Jul 25 06:00:39 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_blender_modifiers_intern_MOD__ocean.cc,v 1.1 2024/07/25 06:00:39 ryoon Exp $
+
+--- source/blender/modifiers/intern/MOD_ocean.cc.orig  2024-07-02 09:52:40.852208501 +0000
++++ source/blender/modifiers/intern/MOD_ocean.cc
+@@ -319,7 +319,7 @@ static Mesh *doOcean(ModifierData *md, c
+   const float size_co_inv = 1.0f / (omd->size * omd->spatial_size);
+ 
+   /* can happen in when size is small, avoid bad array lookups later and quit now */
+-  if (!isfinite(size_co_inv)) {
++  if (!std::isfinite(size_co_inv)) {
+     return mesh;
+   }
+ 
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__skin.cc
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__skin.cc:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__skin.cc      Thu Jul 25 06:00:39 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_blender_modifiers_intern_MOD__skin.cc,v 1.1 2024/07/25 06:00:39 ryoon Exp $
+
+--- source/blender/modifiers/intern/MOD_skin.cc.orig   2024-07-02 09:54:20.973834863 +0000
++++ source/blender/modifiers/intern/MOD_skin.cc
+@@ -977,7 +977,7 @@ static Mesh *subdivide_base(const Mesh *
+ 
+     u = edge[0];
+     radrat = (half_v2(outnode[edge[1]].radius) / half_v2(outnode[edge[0]].radius));
+-    if (isfinite(radrat)) {
++    if (std::isfinite(radrat)) {
+       radrat = (radrat + 1) / 2;
+     }
+     else {
Index: pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__surfacedeform.cc
diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__surfacedeform.cc:1.1
--- /dev/null   Thu Jul 25 06:00:39 2024
+++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_modifiers_intern_MOD__surfacedeform.cc     Thu Jul 25 06:00:39 2024
@@ -0,0 +1,13 @@
+$NetBSD: patch-source_blender_modifiers_intern_MOD__surfacedeform.cc,v 1.1 2024/07/25 06:00:39 ryoon Exp $
+
+--- source/blender/modifiers/intern/MOD_surfacedeform.cc.orig  2024-07-02 09:55:16.595931240 +0000
++++ source/blender/modifiers/intern/MOD_surfacedeform.cc
+@@ -788,7 +788,7 @@ BLI_INLINE SDefBindWeightData *computeBi
+       corner_angle_weights[0] = bpoly->point_edgemid_angles[0] / bpoly->corner_edgemid_angles[0];
+       corner_angle_weights[1] = bpoly->point_edgemid_angles[1] / bpoly->corner_edgemid_angles[1];
+ 
+-      if (isnan(corner_angle_weights[0]) || isnan(corner_angle_weights[1])) {
++      if (std::isnan(corner_angle_weights[0]) || std::isnan(corner_angle_weights[1])) {
+         freeBindData(bwdata);
+         data->success = MOD_SDEF_BIND_RESULT_GENERIC_ERR;
+         return nullptr;