From 776305912b121bd4cdf052e2d329741be40c7e6d Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 20 Apr 2021 15:42:33 +0200 Subject: [PATCH] blender: add patch that misses --- srcpkgs/blender/patches/altivec-all.patch | 32 +++++++++++++++++++++++ srcpkgs/blender/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/blender/patches/altivec-all.patch diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch new file mode 100644 index 00000000000..115e1ea6fd0 --- /dev/null +++ b/srcpkgs/blender/patches/altivec-all.patch @@ -0,0 +1,32 @@ +This applies a better workaround for C++ type conflicts +in AltiVec/C++, allowing it to build on BE ppc(64). + +--- a/extern/clew/include/clew.h ++++ b/extern/clew/include/clew.h +@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum; + + /* Define basic vector types */ + /* Workaround for ppc64el platform: conflicts with bool from C++. */ +-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) ++#if defined(__VEC__) + #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ +- typedef vector unsigned char __cl_uchar16; +- typedef vector signed char __cl_char16; +- typedef vector unsigned short __cl_ushort8; +- typedef vector signed short __cl_short8; +- typedef vector unsigned int __cl_uint4; +- typedef vector signed int __cl_int4; +- typedef vector float __cl_float4; ++ #undef vector ++ #undef bool ++ #undef pixel ++ typedef __vector unsigned char __cl_uchar16; ++ typedef __vector signed char __cl_char16; ++ typedef __vector unsigned short __cl_ushort8; ++ typedef __vector signed short __cl_short8; ++ typedef __vector unsigned int __cl_uint4; ++ typedef __vector signed int __cl_int4; ++ typedef __vector float __cl_float4; + #define __CL_UCHAR16__ 1 + #define __CL_CHAR16__ 1 + #define __CL_USHORT8__ 1 diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 5daa3ce0b4a..e480e63b8aa 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender version=2.92.0 -revision=1 +revision=2 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="/usr/share/blender/${version%.*}/scripts"