media-gfx/blender: Fix 2.57-r1 for Linux 3.x (bug #381099)

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

4 files changed, 34 insertions, 4 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 078d82c78779..528db4ad1be0 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.201 2011/07/09 16:56:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.202 2011/10/29 03:36:58 sping Exp $
+
+  29 Oct 2011; Sebastian Pipping <sping@gentoo.org> blender-2.57-r1.ebuild,
+  +files/blender-2.57-linux-3.patch:
+  Allow compilation of Blender 2.57-r1 against Linux 3.x (bug #381099)
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> blender-2.49b-r2.ebuild:
   ppc64 stable wrt #349847
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9c38fd97b8f3..b01a14b37357 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
@@ -18,6 +21,7 @@ AUX blender-2.57-eigen.patch 940 RMD160 9acf7cd0fadb1fac515a16535d82569d2adb110b
 AUX blender-2.57-glew.patch 443 RMD160 bc2606d216bd9231a96fc7bd891deaf13f710c93 SHA1 3cb12219dcfa6045b96325dcbc4192a4c065c5bf SHA256 002e144e516d7532f450565a176af736146d74d7de1ab18b1ad4796c12f26a0f
 AUX blender-2.57-insecure.desktop 498 RMD160 f6649a7aafa6c08dae5422360d6dacaede35ec23 SHA1 e955ef75b5e86c55269ee0ed0550bd729ebc22ef SHA256 584916335a55683013cc6548016238874c26cf3ce152dea30464db221d306a1d
 AUX blender-2.57-libav-0.7.patch 10216 RMD160 8768b33a64bafbdcdc343e95beb3cf853f21b3f8 SHA1 120de93ff7563681723be5ebab3d807ed8f5de40 SHA256 98e64d6090f496fc35ae41d7a2aaecbe494a02d99576b082ee6fb78e91e71562
+AUX blender-2.57-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
 AUX blender.desktop 199 RMD160 a55286923d1422f620dff35226a42fcbaf8c60a9 SHA1 c5ad8c540571a254756ac541c64933e80406aa16 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
@@ -29,7 +33,14 @@ EBUILD blender-2.49a.ebuild 4872 RMD160 ddfae1234db4ef3ba48ce6d2d69fe68b6ba43d0c
 EBUILD blender-2.49b-r1.ebuild 4890 RMD160 9fdab3e883a12078c8da8296767d73e957148289 SHA1 41884006c86fab05ba0900e87baa9cc92d7baf1a SHA256 ecda8468309ec51b140a285ea2b6c4cd0d1f0d45ef6ca4798bad160084a603c7
 EBUILD blender-2.49b-r2.ebuild 4944 RMD160 2cc9329b20d030c424004ce2a4e8b11f0afe7fd5 SHA1 031af009ceee3bf5e1d076e9671a87c3860fd8cf SHA256 3cd3540fe84c3d8006d6cde9922364c0330a059a096affd9eb3e61a697ba5592
 EBUILD blender-2.49b.ebuild 4830 RMD160 1371b3f5393f3cd76a909d6ef19a8b1667582aa9 SHA1 0fb604433885eb4ec3e7bf0634c2e2cce61c418d SHA256 b139d96960468061bb20c5a9d9515bb5fc8686436e28e4d3c1e31b104c6344f2
-EBUILD blender-2.57-r1.ebuild 13821 RMD160 686ef54af3870b624d60710984db8bf7429ca56f SHA1 77464d58876bef683d341b11b19f59ff1f7b1cf4 SHA256 a55f5b6b57fcb2401c529808ed2fc21cc26fa2d74a96954c8c1f283bf2f186b4
+EBUILD blender-2.57-r1.ebuild 13886 RMD160 2c015370756af10d79f0a20b9574ae8dac571bb9 SHA1 43d91e329713cb90ce3ba1d233244140dfe50374 SHA256 e1a0dec4f0f3e28f0d8b2230388ed211aa78e1aa138426c9b385287c7f5f84c8
 EBUILD blender-2.57.ebuild 13818 RMD160 16c9eb9b0ba563fd4240fb2f8c9efd6d72fae4e7 SHA1 8bd8f3b9aeada5e687fc62e0fcca5a4ea1250066 SHA256 1ff0f09c13e150018691d33b0585f4c33e93c84efca65d7e7609de112a4238df
-MISC ChangeLog 30379 RMD160 d132ed00b8f2cfc0ae30bf24b730706e99362b2e SHA1 962898d30d4f7f25c6642b50c2954b84b2d3f89f SHA256 2f66bd59c7856cdf2be68899a9240ad83065318d442fa177f79c78bff6d310fc
+MISC ChangeLog 30559 RMD160 7fbff3dc5e4faa7cbc0661a8e30b077a65b7cf0c SHA1 7d75355a6fbd1fa3e745b509ee158f76e9884a36 SHA256 ef4d7fe66bc1fc0773f2245f8e90a84d13e508aa7dee776218ed63a72b567ce2
 MISC metadata.xml 1799 RMD160 7330ec5ccf7f7a86f31abf0b5f45bf84025c505a SHA1 a8bc4c5db954f24ea50e879b1bdbd5753430b3ee SHA256 f4bc849a0cc6a805fe6624699c5c1b9248336f7b879484f777f31b7c755759ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6rdNoACgkQsAvGakAaFgAL4QCgyIhgE6rNpnlJYlkCvRcnoVSh
+WFoAni2DO57qko2K2zp1nnUZ43jxXL/6
+=LsRs
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild
index 66fd0fb76d60..63a4fbba139a 100644
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ b/media-gfx/blender/blender-2.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.3 2011/07/08 10:22:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.4 2011/10/29 03:36:58 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 
@@ -152,6 +152,9 @@ src_prepare() {
 #	einfo "Removing bundled Bullet2 ..."
 #	rm -r extern/bullet2
 #	epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
+
+	# Linux 3.x (bug #381099)
+	epatch "${FILESDIR}"/${P}-linux-3.patch
 }
 
 src_configure() {
diff --git a/media-gfx/blender/files/blender-2.57-linux-3.patch b/media-gfx/blender/files/blender-2.57-linux-3.patch
new file mode 100644
index 000000000000..6a96b49d12ca
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.57-linux-3.patch
@@ -0,0 +1,12 @@
+--- SConstruct	2011-10-29 05:18:43.149564401 +0200
++++ SConstruct	2011-10-29 05:19:37.332887017 +0200
+@@ -165,6 +165,9 @@
+ if crossbuild and platform not in ('win32-vc', 'win64-vc'):
+     platform = 'linuxcross'
+ 
++if platform == 'linux3':
++    platform = 'linux2'  # Workaround for Linux 3.x
++
+ env['OURPLATFORM'] = platform
+ 
+ configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")