fix building with -openmp wrt #507738

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

4 files changed, 63 insertions, 19 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 2ee9cbcbc3e3..1722d1a22a1b 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.263 2014/04/16 14:31:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.264 2014/04/18 22:00:34 hasufell Exp $
+
+  18 Apr 2014; Julian Ospald <hasufell@gentoo.org> blender-2.70a-r1.ebuild,
+  +files/blender-2.70a-openmp.patch:
+  fix building with -openmp wrt #507738
 
 *blender-2.70a-r1 (16 Apr 2014)
 *blender-2.70-r1 (16 Apr 2014)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b5daa074ce9d..26c8e608090f 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -21,6 +21,7 @@ AUX blender-2.66-cmake.patch 381 SHA256 284c09ec1f0a0fc52123c704c7b89fb8795d83c6
 AUX blender-2.66-doxyfile.patch 473 SHA256 4d6f50eb13f71b1ca083d8d8bfc3467660be586fe7d973acc9ce9b8b9d9b3337 SHA512 72e8ce59e485a2bbc4c09b367001fdef9d2a01c7b296bf001c1b708b4984625c40a8dd4ddee2b2ba962aa8f666cc8ed50229803d460ae79a807353080d16d520 WHIRLPOOL 45e0178cc55cd1f2e2e685173abb195367f3e61f07c55e007b44b7e3c14ef53ed0b098335044bca58e16787b738a65b23b223515296c6439e3bdfa9698a35dbf
 AUX blender-2.66-sse2.patch 1255 SHA256 0b7d7374226daec957755364414b4327efdde0430324b011d3e7d1483845e375 SHA512 e658ed4f0d913c599235acfd871f7d1aceda20f17d01e3753683527bf8a659a882d0c83a05f437f55abc9e252099485a1632f2b5842ce57940f747701b709e86 WHIRLPOOL b6cafc4bbdb35f6aeef9229a18db618272ad4a6a40154d9f9e3bc5ab23b51bcf11b5612a4bc0672f1cacb0d37e3a035fad54b0930ef6725f44af3953ba61f97e
 AUX blender-2.66-unbundle.patch 5475 SHA256 86025dc9d93fcd3acac8665cfc09d079bbf450ce12aac6844c7b37bc9dfeeb94 SHA512 86075ebcc388ded5407543e7a54303bb097bea124fd15ada7ae13a1b0949507b84e53133551d4d3aaeaab4d7e921d62857539b216af6bf7962beeca258e97d79 WHIRLPOOL 7b8489258e5d5108018f24927eec77d990af6c0bc565648d3f392251522249a7f54a5015d9880311a3169da495972dcfbfc88ee408c972ebbfd6b6b03ab73c85
+AUX blender-2.70a-openmp.patch 1188 SHA256 e82d464c9fc632894fd463bd9441587eb1c8bfc2c0f49005eaeb050c1e9f714a SHA512 bd62f4f4676c867bc4b63ace3b2184a8b82e88f642687be441f80ee669f803a7f1cd4a6c61bb1a3a5eaafb6afeadaeddac393994b858a7f4d6b3b725265a1dcd WHIRLPOOL fc4053d2ecc84da25676bc246c1b0af3ce26c23ca56b337236ac87f4dd27bbbb1a2317e984a80412d5b34802e07179e4c8ccd4566c59ad6086a46d09b4e2effb
 DIST blender-2.64a-patches-1.tar.xz 14388 SHA256 047f3231f4b21dd813e7b052be0b28b9391345422fb335d4cca578820977bc8b SHA512 f0dc73769a74ca9098380640ae28508b204f4c198a97219bb2ac8445eff6120dbda64a9d2d80e5dcab48df34d7de844489702510b5a8d32677b5cb8e70c7b4d9 WHIRLPOOL e8bfaf0ca1a51991e3109a51068bea2619da7d3a93bba623d78f67f98681c43ad7dc3a1452fd13929081b3a118ae6a35ff07994251c857e3b6d35aabcd4b732e
 DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9531795675ab468ae742350cc7b SHA512 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 WHIRLPOOL 7f4878a606379dad9d121b0ad08f17e8691baf944147dc72dd33defd33a2303116a7090f7b8f8a186760fdd65ba9c0a0e523ed7d231fd23c070c31b52693178f
 DIST blender-2.66.tar.gz 36914318 SHA256 627a4bb12b6d971be76ae2ada080d5ed65904d7f83bcefe43a9a5a82cf433558 SHA512 f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4 WHIRLPOOL cfc0e1cb441b41d4363dea28c0d2ac3879d49b417d43f5dce44c784cf78d924b3d640a698c8df3c842aa90a8f5c84faf80d4769f64505c151d0c965b4f28f48b
@@ -39,26 +40,26 @@ EBUILD blender-2.69-r1.ebuild 7381 SHA256 725864b979ab1dc26e8f03e13194e3fc6dc1c3
 EBUILD blender-2.69.ebuild 7578 SHA256 464f47a278cc1a07ad078c7ff177a03a9dbfb6959e10603fb2dc8135a24c2a54 SHA512 f9d997af90eb430d6ab9558c63c797fc9750934908a6d0d51540c00584191dc8f5de4271ff51914b598cc7d40a80cd2ca33e3ac875ef6ec6996d9bd74773a175 WHIRLPOOL d36c49133d6a7867938f1b1d1a7aaa8b5e8598ec4ce910841485908d2dc1fe91fd71c53c4c187a761dcb0667e660e0cb9a897a0ff1ce9407a89d2c60db27d82b
 EBUILD blender-2.70-r1.ebuild 7575 SHA256 099b5aadace8abb51a9c6e0a5685760c2912e00cb55dbaeae486c72b2a6c7d86 SHA512 324d1946eea6702a45da5a832af95c633afe895bf1447edeeac3ddafa43a7a274244b5f752a94aec16e2046b20277de3fc89d8dd27e460f22f8af1778f5bd8af WHIRLPOOL c5f64cecb1f1556fa46f6cedac15f837cb4957969cc53e7ef563ce39b06665bc0a3e53d74e18ff0b2259e97dc1686d8acd0c3900c5eafe8f429dc6ed4a0f2118
 EBUILD blender-2.70.ebuild 7772 SHA256 17a4c2f16b1a96e3fe38fcd397beda94bf67922018769a370c8253eec32df6c2 SHA512 ccb51d409481078924c431359bf58fa06deaed336b7b5538c2910d20a82ac62d08151fbab3a14f49555834e395d1fbd4cf7e929978153a975fcb64cf98eeded6 WHIRLPOOL 6e5fce7efeafd28e05b427045077875335f69ef3b4e003e9b1f956979ad22dfaf3b14d46205270898e883f4c3fa9df6df856085e2a116478b2591130aca85ce7
-EBUILD blender-2.70a-r1.ebuild 7613 SHA256 faf27217adddf5841a45516948f1cf57fb42ffa44e579fff2f72337f693f3000 SHA512 090ed3493a81c8a30dc55a80831bb72c5084d342a22f169bc4e88c411c396410471fe2da845a7e7760ad1871b4f31fd1aa2758c191a3f642c58f365028b10180 WHIRLPOOL c6e9e5b237d83a1c8c8ea324b6e1c8f96f24d64bb19b5f98b3ef38583fc264291c725cbeeba6a5333d728bdb26d7bdfc6be6de6917a3a0c0bce21f4edc9f38e5
+EBUILD blender-2.70a-r1.ebuild 7656 SHA256 e0be5f10f84faa615d8047082b42a3a1785ab78b9100554fef22ff0e6169b038 SHA512 e710ba26ce304c36ce2ee74619396b44070f5189bd815e751a23b2ba1cc286201c0c6932a9cc1d99e848af6790602101aba374f57911b3d31a47f197dc22bcbb WHIRLPOOL 460a463e18f3fb2d8dc8e8d944dbbb2dcd169adaf9d5a3e1151b5b327ed5342fbfe2bcabe44ff6f4b34ecbf0c361f5a691ed548189e1bfaa9a3cf5f943024830
 EBUILD blender-2.70a.ebuild 7810 SHA256 7bce4cfabcaa12b5d937deb4c85fb1eff4adfab504cf90c80e95046c89234ba8 SHA512 1013059ec00e75aca05a577c9786361108bd196b8c054d47dc1df48f157a9cfd5b1afc6785d3d72ec4263520a7c170e350efeb6b7e7d833a1fa8fec9baa787ba WHIRLPOOL 292c34aa159fbdb8b9eb9fbf983e592f33e2fb67caf04cc478855cd181fb25177b15892ec7b0131e6cf31099337ab3fbe4083ce565140f48a4431edae7d063f1
-MISC ChangeLog 46203 SHA256 a669a686bfb2f3527ac6afa93e9bb83c2a2a2c0ec51f4d6472a07434fad4b2bb SHA512 6f5b6321d83e3df3f983aee0eb4fbc683d298c12e85f39fd60375d23f47d5b7642ea49311340661c9b9f8a77d5ad810ec7afc371ba32abe91996ad6caec74864 WHIRLPOOL 1d26c39b0e780ea21f8678a5d8101ed11e9bf28dabf8279a52611523248cb6d6430fa234733b9a4607e39ec942fd756600b4a7907808085c578ded32fcda5068
+MISC ChangeLog 46357 SHA256 d200955e2151ff1a37df27a5ba4a384f079f2c687c86d749c3aefa8be8682beb SHA512 6edf55a7285f7c7a833d49106640d03658164cc41f8cbecd34c4ca72b243d62de890f64f80474579a0e4fede3f568c4a23cff3317749de7fc89b2eb2cb0130d7 WHIRLPOOL 1a7416b3e90bdc9731c3e2d61ada870230f4c49e0ae3d9fc93bd250b6934a3925b6abccc7affccd4f0e1bdd30909691cfba6a3cabfa93ec4c4677677457069d8
 MISC metadata.xml 2420 SHA256 da8715c8e1b7319223b0e3b48a88ec7ce307efda73f98824fa2defb8b951c52b SHA512 720927dbf1abc75da95b9dacf20ca0553bd167341ef6fbc182c7fcb145d05702e2875ea7d43531140f82d0618e24ae68bae42d9a400ef73945a4d203c1ccbebc WHIRLPOOL 364cdd61304fa0645a6a0a0e293a89050e575a8d8d8f2e9d9862cb38073ab40d4c31f81fa8b27b4a84e20a0137dc8eedc2ac9e1a4e54b1a6f6432166d319601e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTTpQ1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTUaCCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgXBgQAOGeH9jUfKGWWYoGt9uJsUYt
-zQbM+gf+K6wUhTPOYt8f6Cp28NmJWRBxPChMhfY09RbxwBIaHXz3lq6OamJdsZDU
-WTHT7+UvPBThzwz1sIZ293rvckKjZIBMR88iPeUF3QTSToeM5XP59yV7HMrugvXI
-8i4EcKRwKujL8BSyy2HOgvOYFeCOErmRajLs0fpLF/ee+lLkfAt+x/hmR7eNe9g8
-8q2ryutjWz40T/ZOZZaq7Y6XoGcm2HvDElRMmqJu3qFM/Lt9hbxxkPvAhF3NvSPy
-ams/f3dkO2zh80/orYJ9gyfifgKSzWpwQwQNXWyG8NlMA89AnOiBiSOyR028Q7+S
-3kjwm7UOqjZSw61miiudI9C8bR1/zTPRFVlokT7l5W+yzbEyHBSQkJBg7zorKRQY
-DB+Ku1mBrt5NFfoogxDNI/FhNYcKDN89Y8o0e/Fa3yiLfUy7b8oz+9JXgUHP+yyI
-YF5ZeulXRBdd1wCtaK3z5QufEo07E4Vn2gSosxq0wgu/OxWwqphXPP34B7ndyyQj
-9fyQuvcFNh1JkY2ssVGPCEzLU6GAsy7P8Ja4wLDppEPnxUaDOLlgHEo3a94qM/r6
-wst+L4clbx9ONZhHrb3dLtWJNMXBaJTOEjuXdlMMOWELxBcLp6hAtQrmZjVsmipZ
-cMsn0J/pJArYWkk64CoG
-=0utQ
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgsMYP/2MmT0gRMzpejF7+h5o82P7w
+EDVSOSOwxHvcqez3FU2BMLNcVVwjTElqnIIQ6T3OI8YRhO15QMKkZ2nIxofKxj7P
+I54QLDRqZgtz8Mj6bFlEBQzPNzeCn8l0uY4eRfz4vRrdc9mufLJJOv/vtZvGlqkT
+6XASThxv5hLYKA2bV4dSoy0ac3Ugu5Iwdb52z49iccdlY14eaLSoQ4XhlOZQQKnz
+1nBH6l1022Yjwuk+5CDKEgkNOOwGnOLujGv2Ly/SkPPl1XVfgW/BZu1R++3eKEyt
+soLubmHrHzziogYEiREEe0+24t2cbuN1YR3mb0G0WcSiaV5qC0kc+05OrqSFk8nf
+jdRbqjOvn2Mrbhr03ghifinxbNMlQFgLUTqsdNnjzAZfJdS/BHUAyIfRIl3KGXlJ
+bO0phpkCutW0zpu1vj4gNqpomcQfeBrDv+Ik6E2VH/PF1+yDchDO1nkTrMFDyWfo
+vnu+sQchY6u062bSBkmocerJh21wQcXkdQXnOzwOMQNkHP9Ackvb0KW3l3f/IDIy
+eHQWxtPb4NKtBv/xljOnp1J5HIJhVQPfFr9BAKK2cqZxDsyEx2VMqckuQedZ0+UJ
+P6atQt1KklNByEd1KjOAnnt17uCg1TZq+SKyn7KGOniinuhbFENnI7tw1Qrej590
+I04khXgMGwyfelDgV0fL
+=rZZH
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.70a-r1.ebuild b/media-gfx/blender/blender-2.70a-r1.ebuild
index b9b354c4feac..6b9d10576718 100644
--- a/media-gfx/blender/blender-2.70a-r1.ebuild
+++ b/media-gfx/blender/blender-2.70a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70a-r1.ebuild,v 1.1 2014/04/16 14:31:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70a-r1.ebuild,v 1.2 2014/04/18 22:00:34 hasufell Exp $
 
 # TODO:
 #   bundled-deps: bullet is modified
@@ -114,7 +114,8 @@ src_prepare() {
 		"${FILESDIR}"/04-${PN}-2.70-unbundle-glog.patch \
 		"${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \
 		"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
-		"${FILESDIR}"/07-${PN}-2.70-sse2.patch
+		"${FILESDIR}"/07-${PN}-2.70-sse2.patch \
+		"${FILESDIR}"/${PN}-2.70a-openmp.patch
 
 	# remove some bundled deps
 	rm -r \
diff --git a/media-gfx/blender/files/blender-2.70a-openmp.patch b/media-gfx/blender/files/blender-2.70a-openmp.patch
new file mode 100644
index 000000000000..2c2afde12437
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.70a-openmp.patch
@@ -0,0 +1,38 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Apr 18 21:42:45 UTC 2014
+Subject: fix unguarded calls to omp_get_thread_num()
+
+--- blender-v2.70a/source/blender/editors/sculpt_paint/paint_cursor.c
++++ blender-v2.70a/source/blender/editors/sculpt_paint/paint_cursor.c
+@@ -248,8 +248,13 @@ static int load_tex(Brush *br, ViewConte
+ 
+ 					if (col) {
+ 						float rgba[4];
+-
+-						paint_get_tex_pixel_col(mtex, x, y, rgba, pool, omp_get_thread_num());
++						int thread_num;
++#ifdef _OPENMP
++						thread_num = omp_get_thread_num();
++#else
++						thread_num = 0;
++#endif
++						paint_get_tex_pixel_col(mtex, x, y, rgba, pool, thread_num);
+ 
+ 						buffer[index * 4]     = rgba[0] * 255;
+ 						buffer[index * 4 + 1] = rgba[1] * 255;
+@@ -257,7 +262,14 @@ static int load_tex(Brush *br, ViewConte
+ 						buffer[index * 4 + 3] = rgba[3] * 255;
+ 					}
+ 					else {
+-						float avg = paint_get_tex_pixel(mtex, x, y, pool, omp_get_thread_num());
++						float avg;
++						int thread_num;
++#ifdef _OPENMP
++						thread_num = omp_get_thread_num();
++#else
++						thread_num = 0;
++#endif
++						avg = paint_get_tex_pixel(mtex, x, y, pool, thread_num);
+ 
+ 						avg += br->texture_sample_bias;
+