| 1 |
hasufell 14/09/27 19:49:52 |
| 2 |
|
| 3 |
Modified: 09-blender-2.72-unbundle-minilzo.patch |
| 4 |
Log: |
| 5 |
make the patch more upstream compatible |
| 6 |
|
| 7 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: 09-blender-2.72-unbundle-minilzo.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 09-blender-2.72-unbundle-minilzo.patch 27 Sep 2014 14:55:43 -0000 1.1 |
| 23 |
+++ 09-blender-2.72-unbundle-minilzo.patch 27 Sep 2014 19:49:52 -0000 1.2 |
| 24 |
@@ -4,21 +4,24 @@ |
| 25 |
|
| 26 |
--- source/blender/blenkernel/intern/pointcache.c |
| 27 |
+++ source/blender/blenkernel/intern/pointcache.c |
| 28 |
-@@ -84,10 +84,11 @@ |
| 29 |
+@@ -84,11 +84,14 @@ |
| 30 |
#endif |
| 31 |
|
| 32 |
#ifdef WITH_LZO |
| 33 |
-#include "minilzo.h" |
| 34 |
-#else |
| 35 |
--/* used for non-lzo cases */ |
| 36 |
+#include <lzo/lzo1x.h> |
| 37 |
- #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) |
| 38 |
+ |
| 39 |
+#define LZO_HEAP_ALLOC(var,size) \ |
| 40 |
+ lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] |
| 41 |
- #endif |
| 42 |
++#endif |
| 43 |
++ |
| 44 |
+ /* used for non-lzo cases */ |
| 45 |
+ #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) |
| 46 |
+-#endif |
| 47 |
|
| 48 |
#ifdef WITH_LZMA |
| 49 |
+ #include "LzmaLib.h" |
| 50 |
--- extern/CMakeLists.txt |
| 51 |
+++ extern/CMakeLists.txt |
| 52 |
@@ -62,10 +62,6 @@ |
Archives