graphics/Blender: Remove no longer necessary patch for 32bit buildsuser/chris.willing/updates

Signed-off-by: Christoph Willing <chris.willing@linux.com>

2 files changed, 3 insertions, 57 deletions

diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 93a62dc7a4..90999a35a7 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Blender
 
-# Copyright 2015-2023 Christoph Willing, Brisbane Australia
+# Copyright 2015-2024 Christoph Willing, Sydney Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,13 +25,13 @@
 # 20220322 bkw: Modified by SlackBuilds.org, BUILD=2:
 # - make embree optional (makes it possible to build Blender on 32-bit,
 #   since embree is 64-bit-only).
-# - add patch to fix 32-bit compilation.
+# - add patch to fix 32-bit compilation. (no longer needed)
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=Blender
 VERSION=${VERSION:-3.3.10}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -106,9 +106,6 @@ sed -i -e '/#include <stdio.h>/a #include <iostream>' intern/locale/boost_locale
 sed -i -e '/#include "util\/windows.h"/a #include <system_error>' intern/cycles/util/thread.cpp
 sed -i -e '/#include <fstream>/a #include <cstdint>' extern/quadriflow/src/loader.cpp
 
-# 20220322 bkw: 32-bit needs this
-[ -z "$LIBDIRSUFFIX" ] && patch -p1 < $CWD/overloaded_min.diff
-
 mkdir -p build
 cd build
   cmake ../ \
diff --git a/graphics/Blender/overloaded_min.diff b/graphics/Blender/overloaded_min.diff
deleted file mode 100644
index 5612d01599..0000000000
--- a/graphics/Blender/overloaded_min.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur blender-3.0.1/intern/cycles/scene/hair.cpp blender-3.0.1.patched/intern/cycles/scene/hair.cpp
---- blender-3.0.1/intern/cycles/scene/hair.cpp	2021-10-27 15:21:51.000000000 -0400
-+++ blender-3.0.1.patched/intern/cycles/scene/hair.cpp	2022-03-22 14:54:15.181140060 -0400
-@@ -119,7 +119,7 @@
- {
-   /* Figure out which steps we need to fetch and their interpolation factor. */
-   const size_t max_step = num_steps - 1;
--  const size_t step = min((int)(time * max_step), max_step - 1);
-+  const size_t step = min((int)(time * max_step), (int)(max_step - 1));
-   const float t = time * max_step - step;
-   /* Fetch vertex coordinates. */
-   float4 curr_keys[2];
-@@ -147,7 +147,7 @@
- {
-   /* Figure out which steps we need to fetch and their interpolation factor. */
-   const size_t max_step = num_steps - 1;
--  const size_t step = min((int)(time * max_step), max_step - 1);
-+  const size_t step = min((int)(time * max_step), (int)(max_step - 1));
-   const float t = time * max_step - step;
-   /* Fetch vertex coordinates. */
-   float4 curr_keys[4];
-@@ -192,7 +192,7 @@
-                                 float4 r_keys[2]) const
- {
-   k0 = max(k0, 0);
--  k1 = min(k1, num_keys - 1);
-+  k1 = min((int)k1, (int)(num_keys - 1));
-   const size_t center_step = ((num_steps - 1) / 2);
-   if (step == center_step) {
-     /* Center step: regular key location. */
-@@ -238,7 +238,7 @@
-                                          float4 r_keys[4]) const
- {
-   k0 = max(k0, 0);
--  k3 = min(k3, num_keys - 1);
-+  k3 = min((int)k3, (int)(num_keys - 1));
-   const size_t center_step = ((num_steps - 1) / 2);
-   if (step == center_step) {
-     /* Center step: regular key location. */
-diff -Naur blender-3.0.1/intern/cycles/scene/mesh.cpp blender-3.0.1.patched/intern/cycles/scene/mesh.cpp
---- blender-3.0.1/intern/cycles/scene/mesh.cpp	2021-10-27 15:21:51.000000000 -0400
-+++ blender-3.0.1.patched/intern/cycles/scene/mesh.cpp	2022-03-22 15:35:52.169528851 -0400
-@@ -53,7 +53,7 @@
- {
-   /* Figure out which steps we need to fetch and their interpolation factor. */
-   const size_t max_step = num_steps - 1;
--  const size_t step = min((int)(time * max_step), max_step - 1);
-+  const size_t step = min((int)(time * max_step), (int)(max_step - 1));
-   const float t = time * max_step - step;
-   /* Fetch vertex coordinates. */
-   float3 curr_verts[3];