summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-08-30 16:58:53 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-08-30 16:58:53 +0000
commit34d14107be21ecaec768476de462741333c4be16 (patch)
tree694bf073f2bfb9591b00a0d31bae7e1d857cea95 /media-gfx/blender
parentPunt unused versions. GStreamer 0.8 is going away. (diff)
downloadgentoo-2-34d14107be21ecaec768476de462741333c4be16.tar.gz
gentoo-2-34d14107be21ecaec768476de462741333c4be16.tar.bz2
gentoo-2-34d14107be21ecaec768476de462741333c4be16.zip
Compilation fix for python versions other than 2.4
(Portage version: 2.1.3.7)
Diffstat (limited to 'media-gfx/blender')
-rw-r--r--media-gfx/blender/ChangeLog5
-rw-r--r--media-gfx/blender/blender-2.44.ebuild13
2 files changed, 11 insertions, 7 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index f1fef7a8ecd1..ff027c2c5d5c 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/blender
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.119 2007/08/07 23:31:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.120 2007/08/30 16:58:53 voyageur Exp $
+
+ 30 Aug 2007; Bernard Cafarelli <voyageur@gentoo.org> blender-2.44.ebuild:
+ Compilation fix for python versions other than 2.4, closes bug #152700
07 Aug 2007; Luca Barbato <lu_zero@gentoo.org>
+files/blender-2.44-swscale.patch, blender-2.44.ebuild:
diff --git a/media-gfx/blender/blender-2.44.ebuild b/media-gfx/blender/blender-2.44.ebuild
index 8ac326dfb4b3..a17e1366d16c 100644
--- a/media-gfx/blender/blender-2.44.ebuild
+++ b/media-gfx/blender/blender-2.44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.5 2007/08/07 23:31:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.6 2007/08/30 16:58:53 voyageur Exp $
inherit multilib flag-o-matic eutils python
@@ -68,13 +68,14 @@ src_unpack() {
mv ${T}/Makefile ${T}/common.mak ffmpeg
fi
# pass compiler flags to the scons build system
- # and set python version to newest stable in portage
+ # and set python version to current version in use
+ python_version
cat <<- EOF >> ${S}/user-config.py
CFLAGS += '${CFLAGS}'
- BF_PYTHON_VERSION="2.4"
- BF_PYTHON_INC="/usr/include/python2.4"
- BF_PYTHON_BINARY="/usr/bin/python2.4"
- BF_PYTHON_LIB="python2.4"
+ BF_PYTHON_VERSION="${PYVER}"
+ BF_PYTHON_INC="/usr/include/python${PYVER}"
+ BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+ BF_PYTHON_LIB="python${PYVER}"
EOF
}