Skip to content

Commit 56c98a6

Browse files
committed
squash! blender: update to 4.2.3
blender: update to 4.3.0.
1 parent dd61485 commit 56c98a6

File tree

3 files changed

+19
-178
lines changed

3 files changed

+19
-178
lines changed

srcpkgs/blender/patches/01-python-3.13.patch

Lines changed: 0 additions & 165 deletions
This file was deleted.

srcpkgs/blender/patches/02-python3.13.patch renamed to srcpkgs/blender/patches/python-3.13.patch

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,10 @@ index 3311064e7c5..74c829d717e 100644
360360
if (UNLIKELY(test == -1 && PyErr_Occurred())) {
361361
return -1;
362362
}
363-
diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h
363+
diff --git a/source/blender/python/generic/py_capi_utils.hh b/source/blender/python/generic/py_capi_utils.hh
364364
index 4a641f78471..81740e0d0ad 100644
365-
--- a/source/blender/python/generic/py_capi_utils.h
366-
+++ b/source/blender/python/generic/py_capi_utils.h
365+
--- a/source/blender/python/generic/py_capi_utils.hh
366+
+++ b/source/blender/python/generic/py_capi_utils.hh
367367
@@ -339,7 +339,11 @@ uint64_t PyC_Long_AsU64(PyObject *value);
368368
/* inline so type signatures match as expected */
369369
Py_LOCAL_INLINE(int32_t) PyC_Long_AsI32(PyObject *value)
@@ -376,15 +376,15 @@ index 4a641f78471..81740e0d0ad 100644
376376
}
377377
Py_LOCAL_INLINE(int64_t) PyC_Long_AsI64(PyObject *value)
378378
{
379-
diff --git a/source/blender/python/generic/python_compat.h b/source/blender/python/generic/python_compat.h
379+
diff --git a/source/blender/python/generic/python_compat.hh b/source/blender/python/generic/python_compat.hh
380380
index f18d0fb59b3..e2799aeeb46 100644
381-
--- a/source/blender/python/generic/python_compat.h
382-
+++ b/source/blender/python/generic/python_compat.h
383-
@@ -13,8 +13,11 @@
384-
extern "C" {
385-
#endif
381+
--- a/source/blender/python/generic/python_compat.hh
382+
+++ b/source/blender/python/generic/python_compat.hh
383+
@@ -9,9 +9,17 @@
384+
385+
#pragma once
386386

387-
+/* Removes `initialized` member from Python 3.13+. */
387+
+/* Removes `intialized` member from Python 3.13+. */
388388
+#if PY_VERSION_HEX >= 0x030d0000
389389
+# define PY_ARG_PARSER_HEAD_COMPAT()
390390
+#elif PY_VERSION_HEX >= 0x030c0000
@@ -393,6 +393,12 @@ index f18d0fb59b3..e2799aeeb46 100644
393393
# define PY_ARG_PARSER_HEAD_COMPAT() 0,
394394
#else
395395
# define PY_ARG_PARSER_HEAD_COMPAT()
396+
#endif
397+
+
398+
+/* Python 3.13 made some changes, use the "new" names. */
399+
+#if PY_VERSION_HEX < 0x030d0000
400+
+# define PyObject_GetOptionalAttr _PyObject_LookupAttr
401+
+#endif
396402
diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc
397403
index 899ad21f770..9bef53654df 100644
398404
--- a/source/blender/python/gpu/gpu_py_framebuffer.cc

srcpkgs/blender/template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'blender'
22
pkgname=blender
3-
version=4.2.3
3+
version=4.3.0
44
revision=1
55
archs="x86_64* ppc64*"
66
build_style="cmake"
@@ -24,14 +24,14 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
2424
pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel
2525
wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel
2626
libspnav-devel libwebp-devel potrace-devel Haru-devel
27-
pulseaudio-devel eigen lzo-devel"
27+
pulseaudio-devel eigen lzo-devel vulkan-loader-devel shaderc"
2828
depends="desktop-file-utils hicolor-icon-theme"
2929
short_desc="3D graphics creation suite"
3030
maintainer="Enno Boland <gottox@voidlinux.org>"
3131
license="GPL-3.0-or-later"
3232
homepage="https://www.blender.org"
3333
distfiles="https://download.blender.org/source/blender-${version}.tar.xz"
34-
checksum=be009fcf5ff68d87004fb985a81d2db16ea44c88a5b89e10febb02b6802eee76
34+
checksum=a2c73d338768509be210aeb66730efe6076ec1be36668a1acd0be35a9de12aea
3535
python_version=3
3636
LDFLAGS="-Wl,-z,stack-size=2097152"
3737
# Blender tests are executed against a system installation of blender. This

0 commit comments

Comments
 (0)