From 87852c5e9d3d7011a25866882b554b579dc72d3e Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Tue, 20 Aug 2024 13:17:49 -0400
Subject: [PATCH] extra/blender to 4.2.1-1

---
 extra/blender/.SRCINFO | 12 +++++-------
 extra/blender/PKGBUILD | 11 +++--------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/extra/blender/.SRCINFO b/extra/blender/.SRCINFO
index 649a65ef9..873fc17a0 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.2.0
-	pkgrel = 5
+	pkgver = 4.2.1
+	pkgrel = 1
 	epoch = 17
 	url = https://www.blender.org
 	arch = x86_64
@@ -98,22 +98,20 @@ pkgbase = blender
 	optdepends = intel-compute-runtime: Cycles renderer Intel OneAPI support
 	optdepends = libdecor: wayland support
 	options = !lto
-	source = git+https://projects.blender.org/blender/blender.git#tag=v4.2.0
-	source = git+https://projects.blender.org/blender/blender-assets#tag=v4.2.0
+	source = git+https://projects.blender.org/blender/blender.git#tag=v4.2.1
+	source = git+https://projects.blender.org/blender/blender-assets#tag=v4.2.1
 	source = https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip
 	source = force-draco1.patch
 	source = force-draco2.patch
 	source = blender-4.11-mantaflow-python-3.12.patch
-	source = https://projects.blender.org/blender/blender/commit/d40c2705a17847f65aad21cf85f3b30751ac34a1.patch
 	source = ffmpeg-7-1.patch
 	source = ffmpeg-7-2.patch
-	sha512sums = 21346666b2cc462f2d11ddfdd69fde176cd4025fa9dc39ea4c414601801030081e04e724380607784ba12fa60708cc01c521012a454740144e6935011477dd00
+	sha512sums = 20e99edc0a1340064e2afae5c09b60e06bbe11afd9be8765a191e2a08fafb23a51585cb58cbe41919561a6e24fa2df0a63a26a8822b66406b8ff4608879ca851
 	sha512sums = c66cf633fafcf93f0e570d173c0a290a5cf573888da1170949981ff878aaaf28d6274b3175ae29b16d962fabd7902e93711a0deed743a3f5f0fe9d61f08d2faf
 	sha512sums = 5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483
 	sha512sums = e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0
 	sha512sums = c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f
 	sha512sums = 59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9
-	sha512sums = 5267841fed395c76337ffd40d89dbd29c207a4d76de96c91eafb6d3fa221d9ca607dffbb9e8a557e3971c4b829bedf41b20945e61f76556e9e8ec33e735677bc
 	sha512sums = ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e
 	sha512sums = e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9
 
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 19984b568..2dd7b8f1f 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -17,8 +17,8 @@ buildarch=8
 # fine with them.
 
 pkgname=blender
-pkgver=4.2.0
-pkgrel=5
+pkgver=4.2.1
+pkgrel=1
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -117,16 +117,14 @@ source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver"
         force-draco1.patch
         force-draco2.patch
         blender-4.11-mantaflow-python-3.12.patch
-        https://projects.blender.org/blender/blender/commit/d40c2705a17847f65aad21cf85f3b30751ac34a1.patch
         ffmpeg-7-1.patch
         ffmpeg-7-2.patch)
-sha512sums=('21346666b2cc462f2d11ddfdd69fde176cd4025fa9dc39ea4c414601801030081e04e724380607784ba12fa60708cc01c521012a454740144e6935011477dd00'
+sha512sums=('20e99edc0a1340064e2afae5c09b60e06bbe11afd9be8765a191e2a08fafb23a51585cb58cbe41919561a6e24fa2df0a63a26a8822b66406b8ff4608879ca851'
             'c66cf633fafcf93f0e570d173c0a290a5cf573888da1170949981ff878aaaf28d6274b3175ae29b16d962fabd7902e93711a0deed743a3f5f0fe9d61f08d2faf'
             '5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483'
             'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
             'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f'
             '59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9'
-            '5267841fed395c76337ffd40d89dbd29c207a4d76de96c91eafb6d3fa221d9ca607dffbb9e8a557e3971c4b829bedf41b20945e61f76556e9e8ec33e735677bc'
             'ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e'
             'e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9')
 
@@ -151,9 +149,6 @@ prepare() {
   # https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/issues/18
   patch -p1 -i "$srcdir"/blender-4.11-mantaflow-python-3.12.patch
 
-  # fix manpage generation
-  patch -p1 -i "$srcdir"/d40c2705a17847f65aad21cf85f3b30751ac34a1.patch
-
   # fix build with ffmpeg 7
   patch -p1 -i ../ffmpeg-7-1.patch
   patch -p1 -i ../ffmpeg-7-2.patch