summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2011-11-13 18:52:07 +0000
committerSebastian Pipping <sping@gentoo.org>2011-11-13 18:52:07 +0000
commit1ee974f5a3fb88e30b8fc6fba94d7f49e19d73b4 (patch)
tree60cb5ff9cbf11f0f8094b289655d000dc6da0171 /media-gfx/blender
parentConvert USE=nocxx to USE=cxx. (diff)
downloadhistorical-1ee974f5a3fb88e30b8fc6fba94d7f49e19d73b4.tar.gz
historical-1ee974f5a3fb88e30b8fc6fba94d7f49e19d73b4.tar.bz2
historical-1ee974f5a3fb88e30b8fc6fba94d7f49e19d73b4.zip
media-gfx/blender: Fix compilation (bug #390427)
Package-Manager: portage-2.1.10.34/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/blender')
-rw-r--r--media-gfx/blender/ChangeLog6
-rw-r--r--media-gfx/blender/Manifest14
-rw-r--r--media-gfx/blender/blender-2.60a.ebuild5
3 files changed, 21 insertions, 4 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index a5def01cf9d5..b1e716614631 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.210 2011/11/13 12:04:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.211 2011/11/13 18:52:07 sping Exp $
+
+ 13 Nov 2011; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild:
+ Disable 3D mouse (as libspnav is not packaged yet) to fix compilation (bug
+ #390427)
*blender-2.60a (13 Nov 2011)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index cf9cbfaab6d6..35e8e2fa188b 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
@@ -44,6 +47,13 @@ EBUILD blender-2.48a-r3.ebuild 4044 RMD160 831a9636988fb1a5ca9a406e45e6bf204511b
EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e SHA1 3537ea47e3ccb11df14c321580559e04452bb7ee SHA256 67af33393f99caee9c451feb548d98836d2a0d75c714c253ec01416281339ed4
EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
EBUILD blender-2.57-r1.ebuild 13935 RMD160 e379b03c655891ed9bfc0c0542ab5a955cc3710b SHA1 2d988031adfed101d7c6bec64ae36b7bfefba460 SHA256 98934feed8e0cc661dac38746f1a8322088269c470fb32c84d1af2c494f8f834
-EBUILD blender-2.60a.ebuild 13687 RMD160 9d134c0802f237e32cb15021bc24f679a3207462 SHA1 700d1604bc61e5ddad2a19d3e2e0ce02c16b6b01 SHA256 4c137e28b5937e3a9f985831fb693774e3622b9005b02d29bcddc606499f1141
-MISC ChangeLog 32543 RMD160 14c63caa6d17460e19dcf978b1ced18afb2bd547 SHA1 4943c137ed5eee37cb14f443375cd04a1b28088d SHA256 bf93f1220d5205e58093edde6dfff7dff2d18f1b9099ce4e43cf25a2840e79c2
+EBUILD blender-2.60a.ebuild 13780 RMD160 55509870acbacb34af70b7d0479e96ab44d894a3 SHA1 8e2b789d55809fb1d4e83cdd37016048c0e2c366 SHA256 636e6d7216f541c90f7f11c08af1a4bee00fa61dd8e55eefb25007b76c062d86
+MISC ChangeLog 32704 RMD160 8cc261158c4fa8ecd9d4516f7a4ae63eaeba5a8a SHA1 06df9a2a01123e10359a611e983937fa07aed231 SHA256 6192c6bb1c9a173a63f775afa1f57b363758bf7e237fe0c0c0f1868079c9b6ea
MISC metadata.xml 1799 RMD160 7330ec5ccf7f7a86f31abf0b5f45bf84025c505a SHA1 a8bc4c5db954f24ea50e879b1bdbd5753430b3ee SHA256 f4bc849a0cc6a805fe6624699c5c1b9248336f7b879484f777f31b7c755759ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk7AEdsACgkQsAvGakAaFgCs9ACcDreFdJzqw7vLFwLz8s7qdfVV
+VeAAmwQZC4CKhcBThC8fvgzmtVxzzxJ4
+=bL89
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index 1f5a972554a1..beb073c0beef 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.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.60a.ebuild,v 1.1 2011/11/13 12:04:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.2 2011/11/13 18:52:07 sping Exp $
PYTHON_DEPEND="3:3.2"
EAPI=4
@@ -275,6 +275,9 @@ src_configure() {
blend_with ${arg}
done
+ # libspnav not yet packaged (bug #390427)
+ echo 'WITH_BF_3DMOUSE=0' >> "${S}"/user-config.py
+
# enable debugging/testing support
use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py