2fd8d4df94
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
16 lines
791 B
Diff
16 lines
791 B
Diff
This is necessary because otherwise conflicts are introduced in C++ code that
|
|
includes this. The header itself does not rely on the macros. The issue is not
|
|
visible on little endian because they undef the macros somewhere else.
|
|
|
|
--- a/3rdparty/include/opencl/1.2/CL/cl_platform.h
|
|
+++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h
|
|
@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum;
|
|
/* Define basic vector types */
|
|
#if defined( __VEC__ )
|
|
#include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
|
|
+ #undef vector
|
|
+ #undef pixel
|
|
+ #undef bool
|
|
typedef __vector unsigned char __cl_uchar16;
|
|
typedef __vector signed char __cl_char16;
|
|
typedef __vector unsigned short __cl_ushort8;
|