extra/blender to 4.3.0-1

extra/blender/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = blender
 	pkgdesc = A fully integrated 3D graphics creation suite
-	pkgver = 4.2.3
-	pkgrel = 6
+	pkgver = 4.3.0
+	pkgrel = 1
 	epoch = 17
 	url = https://www.blender.org
 	arch = x86_64
@@ -97,19 +97,19 @@ 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.3
-	source = git+https://projects.blender.org/blender/blender-assets#tag=v4.2.3
+	source = git+https://projects.blender.org/blender/blender.git#tag=v4.3.0
+	source = git+https://projects.blender.org/blender/blender-assets#tag=v4.3.0
 	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 = ffmpeg-7-1.patch
 	source = ffmpeg-7-2.patch
-	sha512sums = 777365523ef08862b723dcbd9ceb9716a69b7af387694209caafdb68f97fd5eb2ccb48702dc3188ea2719f3c45416337ceb829e52e267f5d8d84bb6314b0fd9e
-	sha512sums = 1e47ca5a824a5d830e95f424ad1c2d066571bd038badfacbb4001632742c1777f62a81e79612a787d5ab0038d2712730b9372bcec44bcac6131734c4430e40b3
+	sha512sums = c13f4f37a65db6ee98c3d1fda493d7c3d1184eb7ac600c008f9cedbbc3fb61cb0ff83dc5c4a8404219a8c209ea06fac720c353211136b0191696c9c11cb78268
+	sha512sums = 01f3054383d12665975600c2ad4dfba1765a6a52a837c944a510c871c51268ab4368110f5ecd21d51670b65dcbbc1cf6f40a7b47bf7636bf414c71d2a7d5dfc1
 	sha512sums = 5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483
-	sha512sums = e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0
-	sha512sums = c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f
+	sha512sums = 96098190ac8d7665047fa1d08a116740cee6669e84780876ea06afd7e505bbcb17820533c2f666a368fb2e2b45dc1ab9cc2d08684649a283fde5b3eb66a8a93b
+	sha512sums = 17b1e198c3ca069a8e9914b05185714853156a3651ccddcdb75740f1d617009d698065d637e9c8ba6481780eee202da738ca25ec241c32c150fe26aeefe26576
 	sha512sums = 59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9
 	sha512sums = ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e
 	sha512sums = e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9

extra/blender/PKGBUILD

@@ -17,8 +17,8 @@ buildarch=8
 # fine with them.
 
 pkgname=blender
-pkgver=4.2.3
-pkgrel=6
+pkgver=4.3.0
+pkgrel=1
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -118,11 +118,11 @@ source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver"
         blender-4.11-mantaflow-python-3.12.patch
         ffmpeg-7-1.patch
         ffmpeg-7-2.patch)
-sha512sums=('777365523ef08862b723dcbd9ceb9716a69b7af387694209caafdb68f97fd5eb2ccb48702dc3188ea2719f3c45416337ceb829e52e267f5d8d84bb6314b0fd9e'
-            '1e47ca5a824a5d830e95f424ad1c2d066571bd038badfacbb4001632742c1777f62a81e79612a787d5ab0038d2712730b9372bcec44bcac6131734c4430e40b3'
+sha512sums=('c13f4f37a65db6ee98c3d1fda493d7c3d1184eb7ac600c008f9cedbbc3fb61cb0ff83dc5c4a8404219a8c209ea06fac720c353211136b0191696c9c11cb78268'
+            '01f3054383d12665975600c2ad4dfba1765a6a52a837c944a510c871c51268ab4368110f5ecd21d51670b65dcbbc1cf6f40a7b47bf7636bf414c71d2a7d5dfc1'
             '5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483'
-            'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
-            'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f'
+            '96098190ac8d7665047fa1d08a116740cee6669e84780876ea06afd7e505bbcb17820533c2f666a368fb2e2b45dc1ab9cc2d08684649a283fde5b3eb66a8a93b'
+            '17b1e198c3ca069a8e9914b05185714853156a3651ccddcdb75740f1d617009d698065d637e9c8ba6481780eee202da738ca25ec241c32c150fe26aeefe26576'
             '59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9'
             'ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e'
             'e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9')
@@ -142,15 +142,15 @@ prepare() {
 
   # fix draco
   patch -p1 -i "$srcdir"/force-draco1.patch
-  patch -p1 -d scripts/addons_core -i "$srcdir"/force-draco2.patch
+  patch -p1 -i "$srcdir"/force-draco2.patch
 
   # fix fluid sim domain with python 3.12
   # https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/issues/18
   patch -p1 -i "$srcdir"/blender-4.11-mantaflow-python-3.12.patch
 
   # fix build with ffmpeg 7
-  patch -p1 -i ../ffmpeg-7-1.patch
-  patch -p1 -i ../ffmpeg-7-2.patch
+  patch -p1 -i "$srcdir"/ffmpeg-7-1.patch
+  patch -p1 -i "$srcdir"/ffmpeg-7-2.patch
 }
 
 _get_pyver() {

extra/blender/force-draco1.patch

@@ -1,15 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75f5795db68..d50686adfb0 100644
+index 97596dbee8d..d1ad6ac5de0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -754,10 +754,6 @@ endif()
- set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
+@@ -1237,13 +1237,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
  set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
+ set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID     OFF)
  
--if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
--  message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
--  set(WITH_DRACO OFF)
+-if(NOT WITH_PYTHON_MODULE)
+-  if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
+-    message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
+-    set(WITH_DRACO OFF)
+-  endif()
 -endif()
- 
+-
  # enable boost for cycles, audaspace or i18n
  # otherwise if the user disabled
+ 

extra/blender/force-draco2.patch

@@ -1,21 +1,13 @@
-diff --git a/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py b/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
-index e7518ac4..c0d78564 100644
---- a/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
-+++ b/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
-@@ -13,6 +13,7 @@
- # limitations under the License.
- 
- import os
-+import site
- import sys
- from pathlib import Path
- import bpy
-@@ -30,7 +31,7 @@ def dll_path() -> Path:
+diff --git a/scripts/addons_core/io_scene_gltf2/io/com/draco.py b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
+index 75e23162c67..a3cad997f73 100644
+--- a/scripts/addons_core/io_scene_gltf2/io/com/draco.py
++++ b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
+@@ -35,7 +35,7 @@ def dll_path() -> Path:
      python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
      python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
  
 -    path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')
 +    path = f"{site.getsitepackages()[0]}/libextern_draco.so"
-     if path is None:
-         path = {
-             'win32': blender_root / python_lib / 'site-packages',
+     if path is not None:
+         return Path(path)
+