make the patch more upstream compatible

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 28 insertions, 21 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 6e59ccf0ae8f..38ce8ff21b72 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.274 2014/09/27 15:03:38 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.275 2014/09/27 19:49:52 hasufell Exp $
+
+  27 Sep 2014; Julian Ospald <hasufell@gentoo.org>
+  files/09-blender-2.72-unbundle-minilzo.patch:
+  make the patch more upstream compatible
 
 *blender-2.72-r1 (27 Sep 2014)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 82213203c730..88655c1d13b0 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -13,31 +13,31 @@ AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0d
 AUX 07-blender-2.68-sse2.patch 1622 SHA256 fb5aeba243e4da34a1d5ce3893f6db4b84ee90a1bedd6e89dbbfc8c4d7f47418 SHA512 06bc29c771e1d86813add2225523074b7d5ff622b0db4b2e2653917903abd2039b367d6c9e5a3a17021fc85a59585d518a2d05fb9872b7306589ddfbb9897780 WHIRLPOOL 5a0f0e652596687962720b1e6835fce1d0510c771efa7976deffeb3e35df3d5fbcf1400ad02ca4162cb4deccd46d101272e8514c0f6446f1f87afdf2a07eac24
 AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7
 AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb0114a2298de32f4221cb483e9eb407a SHA512 efec5beed218ba0ab3c76ec65c47408631753567c31076cb8431923d5ff0df59c91ab1d2d42007944d307c6aba35746c2435eb9318b65fd69b4c2ed280570f87 WHIRLPOOL 4b5721af9fe9bebe4df1f324eb53f25459f454ce28f46b9af703c47660969b9a6dc1e73d544dbdad2738aad3a9ae53cf8d805bf20af8763f8a59b051302435c2
-AUX 09-blender-2.72-unbundle-minilzo.patch 1297 SHA256 a3e566f814b52524eb5168c0a0971e19622459aad13c4ccaf9afbf201fcf34ec SHA512 378f3dff576ea6bf2754abd347d003b30490ff58e8122aa0fbe739a806037a90bc7778f728233f959d3102dc9c82956a7dc4a9ec320ea52adf5de31ca49ffbfc WHIRLPOOL d5390b328ce6cd970f43d7d80977c5f8cd79f08569468105c902649483f392636f43b662719abe7ea020a94f1329fe59ad0b1bef0b15734b3b5ae30a5269c49a
+AUX 09-blender-2.72-unbundle-minilzo.patch 1329 SHA256 e2a758c48be589e2fa9f28b040e1c0b24fc1f21f50270857a9382a2b6c279ebe SHA512 cdf8ce8a26f150fa9903201cfc2f7187f812b20feea117bcfe19914a72570229a489870a232bfbcffff548fde9e256e6e76064242d25e222a21736adcdf8fd99 WHIRLPOOL d31f6d2f05209de6a485c6473c147131c063d3997a1dbb800824aabd1d81085154383d5ec099819792fb012f0c82ad43c875fa2d5848aad7a6b8837856a49b74
 DIST blender-2.69.tar.gz 41274518 SHA256 c94a7f5dec0d42683b96b2591c240ebcc2743d10b84fc53ca13374b5e654ce09 SHA512 f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142 WHIRLPOOL 30b5e8dd4e2a8ed3a0e9484656d9ac5b6c420076438aa0cdabf3d5d6b5d608bb90d5253c365b712899a9b7ea8965b815059e3e8c5a712c07c399f7848c14e8cb
 DIST blender-2.71-r2.tar.gz 56881288 SHA256 1d7d5a67a8ce5d258534fc0d426c30dbff56995b5648deba98b21b446f6e5889 SHA512 0b481a9567a44a39851ef816769f3d8b2840eda7bf3aa63706d03135f03db27adccbb419a42528744b67b8643aaf2f8f5907e2368be34615be4e53b0d8c43939 WHIRLPOOL ba7f70e093caf3b43b53207bd7dbed1ab8d0c531cd63aa4dbcb302d952c9aaa628b21b143bc853f0fb61041087b6932303bf1228eea0fe49b4ffdcc073127846
 DIST blender-2.72.tar.gz 57506461 SHA256 17a90210180d6ffa189b3a0546a6b0103aeae3df49ecb5356cc05b5bb455d8b9 SHA512 94f9ad214ccf53e7bea8de327aec745b6c6d77dbb44d3c3ed9703543eb136152bfc54d17f60ce376dc1212f2f7045b07b6d976ccb5ddb9c3f84d684eaa7cb8a0 WHIRLPOOL 8f39c1d78c017968067a2648ef4be6decc914d92fd87f5ee131a4a1a37503e3ed920fa2e73e3d03daeb61ef006cb91b8b99b4e591d29af37af25b3cb70afa21c
 EBUILD blender-2.69-r1.ebuild 7376 SHA256 c6eacb81387cd56abf9dd4357338fb592e8b6778bdd114a7b789755f0bc7eaa9 SHA512 729cbcb4963c960315e64b28cc1d011867d6e9792bb423c4fad20330abbabb718792470a2e3235757a05c641d32b6f9f3736ce9535b5db71f54798adb9e2d6a6 WHIRLPOOL a4b5a9540d0f7f72bbc8e8102c80cd6577eba522d933ed3997ee607226eeed8477503e6376811433705395ddeecbd5132c828ee3960f106f85c47967696db809
 EBUILD blender-2.71-r2.ebuild 7815 SHA256 b5e8c4c1ba8c18042877f0f6ddfd86ffd63453b893786b99904022349abb1691 SHA512 0effbd4390b41c4fa36db7c42fc41dc7457024c512ac43369a56bd28ec7299918a798cadb17d1ed34234f79c7d8108bc7ee01e6686575dfaddf7ef8ca898a18c WHIRLPOOL 1d70b7727e32b8d4a9e2e173e6f1ea6988936cf653f3d2b6fc716a009159605b4ef79a0fc727a121e407085bfea14dbec7edd79887340fa4513ff9e150197da9
 EBUILD blender-2.72-r1.ebuild 7769 SHA256 71e14ff8fd27c0e4c2ab30761acea0b2b7cc37fc62b2ff2f64b7adb3fef72116 SHA512 94cd31432186646e41335276ec30cdf097eb5523342a6fab7dc32946916c34c94b2f0d5855ca0bc001ff1e2c4af2942d03033b2080281b8149b35b2a39c197ab WHIRLPOOL fdc68872f033ef6436406c0c208b0a8ce20e1b9161d4df05714fde8e809015c1bee79b4e7d9a55ca50c3f77344bf3fda549cabb407c8542aa2809d46640250a2
-MISC ChangeLog 49208 SHA256 ba94b42e78886c5e128dfff37a298bf99251d60f703ab055dc41e09433fd536e SHA512 c2b100178abe1d8f7b1f8f94f2f2da0d307e84e01a08fc0becefe570608358c249277b4e7a5bd448ca1a9ea277748d17702558864af3f02b53e7d24913464390 WHIRLPOOL e64c1dfb3a3bcad1ebef220e51e233499d5f3980b7089f7d745b1d8bf75df47ce44167117e8012c98595d47daccd09384c0dfeafee39714a72c542e707c1f7b0
+MISC ChangeLog 49350 SHA256 5d0805a3fbc902b0d22c1498b08933ac1713d7fc02bf5d75c0f33097ad9609d4 SHA512 e63a24c79186a1d4f35f67a812c88f89fa062246d973730d45f54e03518822de6aad59f1f4ee126202121f8e179327cb6203fba890a07ce26992c105d71bb1a1 WHIRLPOOL 6f261ac77ed8abe8151ac83f79b51a3ad3bbd099815d2359ee02326fd07a202e0b9643daf69fe41300c2dd2ca006474aff66a86b8c2afa71ded971d94651fcce
 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUJtHLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUJxTkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg6rsP/iRdFnrX3O7OAME9dReXSWLn
-JgtO9nJzBRfsI2OJK4tmgbSLk38i9wxd7qa/CVbFMRT1g/6UJZLJqL9soF0Ja9ar
-iRIdAay/FVzbNxzI/twWlIMtemrhcC5wmsZaz6u03TSb/JAZUKBCnsmVmjeUYqng
-XxOCvkHo5YEvaLftZGJwZaXeSwXQElnZ+KO5aJFOhCIKk4VFRzG0QKF9cOhG//M8
-anTH1aLab7NvifgjtyCXBlFzb4OYU1msQqQPQUSPjinc7rVP8gIs3nK3RiTfA86u
-PQz9N8OM3By0f69971T6Hn00CA7kE3DW/OkePm0vZvV3ddgrEHGDIydeLmeoNMm4
-0gE/KseIjih07E38IaFDKwooA0HuSzvYjKdGYiPAvbGc7jfO5dNXb0HKNx9iQB8V
-AKaMvKYFI/XsaY4R1x1lr3EnfHwnlO6A2KuHYlFVn/j7aZrMDUsc0SHXqDzPTYkZ
-DaPZj3TJqnGX30FqREVZr4raqx+Q52c81FuPO1PMgFhZnxdacgx7K9H4c9x+etXy
-kRS8lknb50r+XqyU5I+MlJ7P9z7rJcL6V+IlXNwXH72sW3k2fsWBP9DafhoobbzU
-ExK1ufqJaHzb8svvqBjn0KQGPaE8e5+7gvl3DsJcjb37HdI8Sh6EjQ57FlREzC9a
-C53mqjq8THE5MHVCjg+V
-=7ckt
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgvj4P/1zspiy1FhhhpqNLsuebI2s7
+2uS5USt4xarpet5Juy6pxrv5VYCnzrgq8O4fi8OXY+V4hdsvDsF7ukVNzfUNVl+p
+SXXptGzkprhSqFcTckU31avI3P39LUXTO0SzIQg7Tdug2zgrFDnc6wrP9STg8+AL
+7odKWo/6DM5wzpYV07yZR9e8bqAjqpgTvu0M6tHTjyHLYYlt3bNAs6kNZqmXIVLc
+TQn+VtvdRTsYtQueFdN0D9EBph61VGvUrIJbbYRABZ1NxT23frNNuQQWLPRwyGcd
+tLroQk7qxvrMxv6zooSAhXP/lkxYBj/ioXj7GqbDyankYZV81WYhjW58Ra9rTOJA
+wIjVn/7x5C37II75Eya5/qMi2OYW7Nnw57VePapd7RPqnlFOtHfCbZetPlmC1ZlR
+Syvll6Vd86prQAHTFw3wx/+40OgmnYD8RKUBA0sZdvtaE5+7hqqn3lQcaoRChloD
+FxjbXp/TQQkqQOK3ErUl+3CwoUknlw3tfvEVJpt+B0y7310UctJCl6fA8rrz8wC/
+M2t8mv1fCAOJ/jptPeddHlS52ikmnbXB7tX0PnNF9PFXMvFwVEp1J/SH2yggL8RB
+Qs7kmQ62AavJ3TPNAuEMrppOlPksMD2cGhBJ4tDBMQSKyGCmHWFPquntYiYYtY+I
+yAld2dmsMOywk7TW73Cv
+=Vmw8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch b/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch
index 56563c9ded5a..e3ebc31532c7 100644
--- a/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch
+++ b/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch
@@ -4,21 +4,24 @@ Subject: unbundle vulnerable minilzo version
 
 --- 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 @@