From 5387c258feda4bc0f07cf596f3fd05600964b946 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 7 Mar 2024 20:34:19 +0000
Subject: [PATCH] extra/blender to 4.0.2-20

---
 extra/blender/.SRCINFO |  9 +++++----
 extra/blender/PKGBUILD | 22 ++++++----------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/extra/blender/.SRCINFO b/extra/blender/.SRCINFO
index 814b139b1..3dbd6440f 100644
--- a/extra/blender/.SRCINFO
+++ b/extra/blender/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blender
 	pkgdesc = A fully integrated 3D graphics creation suite
 	pkgver = 4.0.2
-	pkgrel = 17
+	pkgrel = 20
 	epoch = 17
 	url = https://www.blender.org
 	arch = x86_64
@@ -24,6 +24,7 @@ pkgbase = blender
 	makedepends = intel-compute-runtime
 	makedepends = level-zero-headers
 	makedepends = libdecor
+	makedepends = mold
 	makedepends = llvm
 	makedepends = mesa
 	makedepends = ninja
@@ -96,12 +97,12 @@ pkgbase = blender
 	optdepends = cuda: Cycles renderer CUDA support
 	optdepends = intel-compute-runtime: Cycles renderer Intel OneAPI support
 	optdepends = libdecor: wayland support
-	options = !buildflags
+	options = !lto
 	source = git+https://projects.blender.org/blender/blender.git#tag=v4.0.2
 	source = git+https://projects.blender.org/blender/blender-addons.git#tag=v4.0.2
 	source = git+https://projects.blender.org/blender/blender-addons-contrib#tag=v4.0.2
 	source = svn+https://svn.blender.org/svnroot/bf-blender/tags/blender-4.0-release/lib/assets
-	source = https://developer.download.nvidia.com/redist/optix/v7.7/OptiX-7.7-Include.zip
+	source = https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip
 	source = https://projects.blender.org/blender/blender/commit/5486c70aae94196d715c07364292fc108ebf59a8.patch
 	source = blender-openpgl6-r1.patch::https://projects.blender.org/blender/blender/commit/5d06b7b906b3.patch
 	source = force-draco1.patch
@@ -111,7 +112,7 @@ pkgbase = blender
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 55caea5beccdc0adebdba8a825f3cfee083015311de5602cfcf215139ccbf9fed62f10ee1dcdf7e31a3557aabbc1fa872eeed67bc46f59fb4e5abd18331c0aca
+	sha512sums = 5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483
 	sha512sums = 375508d1d010b4b043b293cb0c192cb2096aef7ddb0dd1be4a738b20aa720523494cf3054161f1ad116fddc6a9ce03159d6da0a3b3fdb1b57002a477c7c5920a
 	sha512sums = 016a8da844396ba1912a556fc1ff763c781ba6ce17375c9ef778352aa91e9f8af3cd66d552339eb2d65dce84c0e871ab167944ddbf75619aebc0dd82cec4ca58
 	sha512sums = e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 35d1ebafe..b7b9b499a 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -18,7 +18,7 @@ buildarch=8
 
 pkgname=blender
 pkgver=4.0.2
-pkgrel=17
+pkgrel=20
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -102,6 +102,7 @@ makedepends=(
   'git'
   'level-zero-headers'
   'libdecor'
+  'mold'
   'llvm'
   'mesa'
   'ninja'
@@ -109,14 +110,13 @@ makedepends=(
   'wayland-protocols'
 )
 optdepends=('libdecor: wayland support')
-# We're using !buildflags here as otherwise we get stuff such as FS#77557
-# It'd be better to figure out exactly which of the flags is the culprit which I attempted but without any success.
-options=('!buildflags')
+# We're using !lto here as otherwise we get stuff such as FS#77557
+options=('!lto')
 source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver"
         "git+https://projects.blender.org/blender/blender-addons.git#tag=v$pkgver"
         "git+https://projects.blender.org/blender/blender-addons-contrib#tag=v$pkgver"
         "svn+https://svn.blender.org/svnroot/bf-blender/tags/blender-${pkgver%%.[^.]}-release/lib/assets"
-        https://developer.download.nvidia.com/redist/optix/v7.7/OptiX-7.7-Include.zip
+        https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip
         https://projects.blender.org/blender/blender/commit/5486c70aae94196d715c07364292fc108ebf59a8.patch
         blender-openpgl6-r1.patch::https://projects.blender.org/blender/blender/commit/5d06b7b906b3.patch
         force-draco1.patch
@@ -126,7 +126,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '55caea5beccdc0adebdba8a825f3cfee083015311de5602cfcf215139ccbf9fed62f10ee1dcdf7e31a3557aabbc1fa872eeed67bc46f59fb4e5abd18331c0aca'
+            '5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483'
             '375508d1d010b4b043b293cb0c192cb2096aef7ddb0dd1be4a738b20aa720523494cf3054161f1ad116fddc6a9ce03159d6da0a3b3fdb1b57002a477c7c5920a'
             '016a8da844396ba1912a556fc1ff763c781ba6ce17375c9ef778352aa91e9f8af3cd66d552339eb2d65dce84c0e871ab167944ddbf75619aebc0dd82cec4ca58'
             'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
@@ -161,16 +161,6 @@ prepare() {
   patch -p1 -i "$srcdir"/force-draco1.patch
   patch -p1 -d scripts/addons -i "$srcdir"/force-draco2.patch
 
-  # To fix manpage installation
-  # https://devtalk.blender.org/t/regression-cmake-install-error-for-man-page/32129
-  # https://projects.blender.org/blender/blender/pulls/115127
-  patch -Np1 -i "$srcdir"/5486c70aae94196d715c07364292fc108ebf59a8.patch || true
-  # We don't care about the first failed hunk.
-
-  # Revert https://projects.blender.org/blender/blender/commit/4b891b4af which causes all
-  # CMake custom commands to be run in serial instead of in parallel.
-  sed -i "s/USES_TERMINAL//g" intern/cycles/kernel/CMakeLists.txt
-
   patch -Np1 -i "$srcdir/blender-rocm-6.patch"
 }