Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / blender
Commits: 44a846df by loqs at 2024-05-23T22:29:21+00:00 Fix crash on creating fluid domain with python 3.12. Python 3.12 now enforces that `PyImport_AppendInittab` should not be used after `Py_Initialize` has been called. See https://github.com/python/cpython/commit/7f3a4b967cfb1596a3fda6c34f900f8586b16700. Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/issues/18. - - - - - 2 changed files: - PKGBUILD - + blender-4.11-mantaflow-python-3.12.patch Changes: ===================================== PKGBUILD ===================================== @@ -120,14 +120,16 @@ source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver"; "git+https://projects.blender.org/blender/blender-assets#tag=v$pkgver"; https://developer.download.nvidia.com/redist/optix/v8.0/OptiX-8.0-Include.zip force-draco1.patch - force-draco2.patch) + force-draco2.patch + blender-4.11-mantaflow-python-3.12.patch) sha512sums=('194274ee62c2a3b96e81af92520d424fb7bda24902cffcf2cd9a2e343c0627fe74cdd08d52709c8f181df72f7e36fc64f6144412c459f5a5a0b4497babd2fe07' '4476c93942e5efc5a8ee7c4ef1caea2e77dc6e40eb825e35c0120f7e9f714ff8bdb873bb83d47ac27f8616eedac8e52f15804ed603c093044490f89e626baa80' '877ed9ced417c5879b0bc6a7d3d87aa68a3e4015df9c08945c468dfab59a513bdd03523b7593e556fc9d0e22dbad25d980238e25583ea34a77ffcae3693cd0e7' '2eaa05da22d4a304d1db310bd8c04358e70fdd927cbaadd574e179a86bf288c7b4fa1188d15f1928788ce9c5d2b15b512d47743a230e703f44c07cb7bbc39c5b' '5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483' 'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0' - 'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f') + 'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f' + '59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9') prepare() { cd "$pkgname" @@ -149,6 +151,10 @@ prepare() { # fix draco patch -p1 -i "$srcdir"/force-draco1.patch patch -p1 -d scripts/addons -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 } _get_pyver() { ===================================== blender-4.11-mantaflow-python-3.12.patch ===================================== @@ -0,0 +1,14 @@ +diff --git a/extern/mantaflow/helper/pwrapper/registry.cpp b/extern/mantaflow/helper/pwrapper/registry.cpp +index b4206a41dea..bd83eb28116 100644 +--- a/extern/mantaflow/helper/pwrapper/registry.cpp ++++ b/extern/mantaflow/helper/pwrapper/registry.cpp +@@ -576,7 +576,8 @@ void WrapperRegistry::construct(const string &scriptname, const vector<string> & + registerDummyTypes(); + + // work around for certain gcc versions, cast to char* +- PyImport_AppendInittab((char *)gDefaultModuleName.c_str(), PyInit_manta_main); ++ if (!Py_IsInitialized()) ++ PyImport_AppendInittab((char *)gDefaultModuleName.c_str(), PyInit_manta_main); + } + + inline PyObject *castPy(PyTypeObject *p) View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/44a846df45bbc7437c464ac68290871523f2489c -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/44a846df45bbc7437c464ac68290871523f2489c You're receiving this email because of your account on gitlab.archlinux.org.
