diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-07-17 06:33:23 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-07-17 06:33:23 +0000 |
| commit | ad1426914e8b749aa02e16bcab4c43a685832067 (patch) | |
| tree | 542aaf2aeb71099331ab263ecc40b3eb1ebe908a /media-gfx/blender | |
| parent | marked x86 per bug 326647 (diff) | |
| download | gentoo-2-ad1426914e8b749aa02e16bcab4c43a685832067.tar.gz gentoo-2-ad1426914e8b749aa02e16bcab4c43a685832067.tar.bz2 gentoo-2-ad1426914e8b749aa02e16bcab4c43a685832067.zip | |
Restored accidentally dropped patch for linux-3. Thanks to Sergey Isachenko for the report.
(Portage version: 2.2.0_alpha116_p10/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'media-gfx/blender')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.49b-r2.ebuild | 4 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.49b-linux-3.patch | 12 |
3 files changed, 20 insertions, 3 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 820fc6b212b3..c8d0e05a94eb 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.231 2012/07/16 12:05:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.232 2012/07/17 06:33:23 slyfox Exp $ + + 17 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/blender-2.49b-linux-3.patch, blender-2.49b-r2.ebuild: + Restored accidentally dropped patch for linux-3. Thanks to Sergey Isachenko + for the report. *blender-2.63a-r2 (16 Jul 2012) diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild index 7e43c29065c0..7837a4b3ba0a 100644 --- a/media-gfx/blender/blender-2.49b-r2.ebuild +++ b/media-gfx/blender/blender-2.49b-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.15 2012/06/14 15:18:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.16 2012/07/17 06:33:23 slyfox Exp $ EAPI=2 @@ -63,7 +63,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch epatch "${FILESDIR}"/${PN}-2.49b-CVE-2009-3850-v4.patch - epatch "${FILESDIR}"/${PN}-2.57-linux-3.patch # Bug #381099 + epatch "${FILESDIR}"/${PN}-2.49b-linux-3.patch # Bug #381099 epatch "${FILESDIR}"/${PN}-2.49b-subversion-1.7.patch epatch "${FILESDIR}"/${P}-libav-0.7.patch rm -f "${S}/release/scripts/bpymodules/"*.pyc diff --git a/media-gfx/blender/files/blender-2.49b-linux-3.patch b/media-gfx/blender/files/blender-2.49b-linux-3.patch new file mode 100644 index 000000000000..6a96b49d12ca --- /dev/null +++ b/media-gfx/blender/files/blender-2.49b-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") |