hasufell 14/09/27 19:49:52 Modified: 09-blender-2.72-unbundle-minilzo.patch Log: make the patch more upstream compatible (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Revision Changes Path 1.2 media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch?r1=1.1&r2=1.2 Index: 09-blender-2.72-unbundle-minilzo.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 09-blender-2.72-unbundle-minilzo.patch 27 Sep 2014 14:55:43 -0000 1.1 +++ 09-blender-2.72-unbundle-minilzo.patch 27 Sep 2014 19:49:52 -0000 1.2 @@ -4,21 +4,24 @@ --- source/blender/blenkernel/intern/pointcache.c +++ source/blender/blenkernel/intern/pointcache.c -@@ -84,10 +84,11 @@ +@@ -84,11 +84,14 @@ #endif #ifdef WITH_LZO -#include "minilzo.h" -#else --/* used for non-lzo cases */ +#include <lzo/lzo1x.h> - #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) + +#define LZO_HEAP_ALLOC(var,size) \ + lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] - #endif ++#endif ++ + /* used for non-lzo cases */ + #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) +-#endif #ifdef WITH_LZMA + #include "LzmaLib.h" --- extern/CMakeLists.txt +++ extern/CMakeLists.txt @@ -62,10 +62,6 @@
