diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2022-04-03 16:08:40 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2022-04-03 16:08:40 +0200 |
| commit | d5ac972a23a3307ed3d1884ffa091e9ca209f4a6 (patch) | |
| tree | 1163922ed7ed27f52468578348244edfa5762943 | |
| parent | 6d836fa886b8e0fc0db4aa0f0d847a24328e4b58 (diff) | |
| download | packages-d5ac972a23a3307ed3d1884ffa091e9ca209f4a6.tar.xz | |
community/blender: started some patching, still blocked (see FS32#246)
| -rw-r--r-- | community/blender/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/blender/blender-idprop_create-static-assert-float.patch | 12 |
2 files changed, 25 insertions, 0 deletions
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index 47de888e..dad59e6e 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -41,3 +41,16 @@ depends=( depends=( ${depends[@]/openvdb/} ) + +# float_t is a long double on 32-bit, but it's a primitive in all cases anyway +# (seems to be in a part of the blendkernel on i686 only..) +source_pentium4+=('blender-idprop_create-static-assert-float.patch') +sha512sums_pentium4+=('36b98ec7e53402909a9e531c30b444b1afc22cc597c5bb3393c73862929dcc6275b00a53de6171a81af3c8804d233359d2e797886d0b776e7a9b29b23ce24e3b') +if [ "${CARCH}" = 'pentium4' ]; then + eval "$( + declare -f prepare \ + | sed ' + $ i patch -Np1 -i "$srcdir"/blender-idprop_create-static-assert-float.patch + ' + )" +fi diff --git a/community/blender/blender-idprop_create-static-assert-float.patch b/community/blender/blender-idprop_create-static-assert-float.patch new file mode 100644 index 00000000..5be594e5 --- /dev/null +++ b/community/blender/blender-idprop_create-static-assert-float.patch @@ -0,0 +1,12 @@ +diff -rauN blender/source/blender/blenkernel/intern/idprop_create.cc blender-idprop_create-static-assert-float-patch/source/blender/blenkernel/intern/idprop_create.cc +--- blender/source/blender/blenkernel/intern/idprop_create.cc 2022-04-03 14:32:20.257350527 +0200 ++++ blender-idprop_create-static-assert-float-patch/source/blender/blenkernel/intern/idprop_create.cc 2022-04-03 14:35:17.851234918 +0200 +@@ -92,7 +92,7 @@ + Span<PrimitiveType> values) + { + static_assert(std::is_same_v<PrimitiveType, int32_t> || std::is_same_v<PrimitiveType, float_t> || +- std::is_same_v<PrimitiveType, double>, ++ std::is_same_v<PrimitiveType, float> || std::is_same_v<PrimitiveType, double>, + "Allowed values for PrimitiveType are int32_t, float and double."); + static_assert(!std::is_same_v<PrimitiveType, int32_t> || id_property_subtype == IDP_INT, + "PrimitiveType and id_property_type do not match (int32_t)."); |