4 files changed, 201 insertions, 2 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 95dd4ac82262..837c3c1977e7 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.173 2009/04/29 12:25:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.174 2009/07/02 18:37:16 lu_zero Exp $
+
+*blender-2.49a (02 Jul 2009)
+
+  02 Jul 2009; Luca Barbato <lu_zero@gentoo.org>
+  +files/blender-2.49a-sys-openjpeg.patch, +blender-2.49a.ebuild:
+  New version with many improvements thanks to Michael Buss
+  <michael.buss@comcast.net>, Hans Nieser <h.nieser@xs4all.nl> and the many
+  others that contributed in the bug #272861
 
   15 Apr 2009; Markus Meier <maekke@gentoo.org> blender-2.48a-r3.ebuild:
   make sure that libsdl is built with joystick with USE=blender-game by R Stephan
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 7f60af50ff7e..085bc5688a8b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,9 +4,12 @@ AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ac
 AUX blender-2.46-ffmpeg.patch 3823 RMD160 33f41651b1a6bc6d497ba01ab710ca3d7a1559c0 SHA1 82ce585db15a3c88625b0c04e649bd08b3c35b41 SHA256 ad75babcc08ae41f2a7c71bc457bd56a0ef39b5ae1e92ede2cdb0a34d7cbcc85
 AUX blender-2.48-ffmpeg-20081014.patch 839 RMD160 b1fbad04a890dcc1698d02f5351d6d79cae42d91 SHA1 e931f1a85c5c01918b960936d4da5888eacfd64c SHA256 d6114d2647758e39608fcfdb05da00811f062ea3fc4c41cef3a6e2977bc5b0c4
 AUX blender-2.48a-CVE-2008-4863.patch 696 RMD160 b61dc085d0154be3850fa4b53985f670cd177adf SHA1 805f18290965c2e74778628c4e2a1888ea77d8ab SHA256 fee1896c791a623181ebf681f4ad67c610677e82575a95a46e896b747f980418
+AUX blender-2.49a-sys-openjpeg.patch 452 RMD160 7029b3d257839d4ca8ce58a9f8e46503651b1765 SHA1 85551623c4293d9dff4dc8d26584a753b3ccd581 SHA256 437f016b9f7c48281015838a22203c4db9ef6b62dac01aa86faa1c9793bff182
 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
+DIST blender-2.49a.tar.gz 23039535 RMD160 f37100c7a02c75b622b8e055f32f06e064a62de2 SHA1 59f5be96eda874bb901390f55a70d58cf8e0b979 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
 EBUILD blender-2.48a-r3.ebuild 4133 RMD160 9fe866fe26404ff233526ce0bb3c25ed38e0c777 SHA1 27cc6ff87860fc3623a4a9fd4db288435d6da4c7 SHA256 5f1f4112dc9edc04ed77b97d5daa5d27a1be96e8d4c995209909f06790aadea3
-MISC ChangeLog 25644 RMD160 3b28d24b23d2a1d60acd88175886320d95bae4d4 SHA1 56249465bed9f815d9f4556ddb6c8ee83ba8ea36 SHA256 39fedbf21061a81209c7f68b3fc338b512c962411f8f03964ede0d0c759bec08
+EBUILD blender-2.49a.ebuild 4841 RMD160 e7a1041846f698000e90f9b064a4054a0e32b022 SHA1 9e3b66117147e7714555ce9279e8a045be5809c0 SHA256 2c762529d2ea0cbcb3f1f1740cf92d301bef80de4abef5ee56b7e730cb87d3f3
+MISC ChangeLog 25969 RMD160 c7cc16639bf8edec2f85240a893551c4b2caba1e SHA1 ff926234a640765eb7ba4c5c5423953ec2623492 SHA256 0b942fa3af95eb6a8633eb3bee66b5e8b9cc76c319e9988f350c4360658732c9
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
diff --git a/media-gfx/blender/blender-2.49a.ebuild b/media-gfx/blender/blender-2.49a.ebuild
new file mode 100644
index 000000000000..633d924036ea
--- /dev/null
+++ b/media-gfx/blender/blender-2.49a.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49a.ebuild,v 1.1 2009/07/02 18:37:16 lu_zero Exp $
+
+EAPI=2
+
+inherit multilib eutils python
+
+IUSE="blender-game ffmpeg nls ogg openmp verse openal"
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL BSD )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	media-libs/jpeg
+	media-libs/openjpeg
+	media-libs/tiff
+	>=dev-lang/python-2.5
+	nls? ( >=media-libs/freetype-2.0
+		virtual/libintl
+		>=media-libs/ftgl-2.1 )
+	openal? ( >=media-libs/openal-1.6.372 )
+	>=media-libs/freealut-1.1.0-r1
+	media-libs/openexr
+	media-libs/libpng
+	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
+	>=media-libs/libsdl-1.2
+	ogg? ( media-libs/libogg )
+	virtual/opengl"
+
+DEPEND=">=dev-util/scons-0.98
+	sys-devel/gcc[openmp?]
+	x11-base/xorg-server
+	${RDEPEND}"
+
+blend_with() {
+	local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+	if useq $1; then
+		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	else
+		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/blender-2.48a-CVE-2008-4863.patch
+	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
+	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
+	rm -f "${S}/release/scripts/bpymodules/"*.pyc
+}
+
+src_configure() {
+
+	# add ffmpeg info to the scons build info
+	cat <<- EOF >> "${S}"/user-config.py
+		BF_FFMPEG="/usr"
+		BF_FFMPEG_LIB="avdevice avformat avcodec swscale avutil"
+	EOF
+
+	#  set python version to current version in use
+	python_version
+	cat <<- EOF >> "${S}"/user-config.py
+		BF_PYTHON_VERSION="${PYVER}"
+		BF_PYTHON_INC="/usr/include/python${PYVER}"
+		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+		BF_PYTHON_LIB="python${PYVER}"
+	EOF
+
+	# add system openjpeg into scons build.
+	cat <<- EOF >> "${S}"/user-config.py
+		BF_OPENJPEG = "/usr"
+		BF_OPENJPEG_INC = "/usr/include"
+		BF_OPENJPEG_LIB = "openjpeg"
+	EOF
+
+
+	#set CFLAGS used in /etc/make.conf correctly	
+
+	echo "CFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
+		  | sed -e "s:,]: ]:" >> "${S}"/user-config.py
+
+	echo "CXXFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`]" \
+		 | sed -e "s:,]: ]:" >> "${S}"/user-config.py
+
+
+	# check for blender-game USE flag.
+	# blender-game will merge with blenderplayer.
+
+	for arg in \
+			'openal'\
+			'ffmpeg' \
+			'blender-game player' \
+			'blender-game gameengine' \
+			'nls international' \
+			'ogg' \
+			'openmp' \
+			'verse' ; do
+		blend_with ${arg}
+	done
+}
+
+src_compile() {
+	# scons uses -l differently -> remove it
+	scons ${MAKEOPTS/-l[0-9]} || die \
+	'!!! Please add "${S}/scons.config" when filing bugs reports \
+	to bugs.gentoo.org'
+
+	cd "${WORKDIR}"/install/linux2/plugins
+	chmod 755 bmake
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe "${WORKDIR}"/install/linux2/blender
+	use blender-game && doexe "${WORKDIR}"/install/linux2/blenderplayer
+
+	dodir /usr/share/${PN}
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
+	insinto /usr/include/${PN}
+	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
+
+	if use nls ; then
+		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
+			"${D}"/usr/share/${PN}
+		mv "${WORKDIR}"/install/linux2/.blender/locale \
+			"${D}"/usr/share/locale
+	fi
+
+	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
+
+	insinto /usr/share/pixmaps
+	doins "${WORKDIR}"/install/linux2/icons/scalable/blender.svg
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+
+	dodoc INSTALL README
+	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
+
+}
+
+pkg_preinst(){
+	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
+	then
+		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
+	fi
+}
+
+pkg_postinst(){
+	elog "blender uses python integration.  As such, may have some"
+	elog "inherit risks with running unknown python scripting."
+	elog " "
+	elog "CVE-2008-1103-1.patch has been removed as it interferes"
+	elog "with autosave undo features. Up stream blender coders"
+	elog "have not addressed the CVE issue as the status is still"
+	elog "a CANDIDATE and not CONFIRMED."
+	elog " "
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to ~tmp or another tmp file under your home"
+	elog "directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+}
diff --git a/media-gfx/blender/files/blender-2.49a-sys-openjpeg.patch b/media-gfx/blender/files/blender-2.49a-sys-openjpeg.patch
new file mode 100644
index 000000000000..a9e46ea3497a
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.49a-sys-openjpeg.patch
@@ -0,0 +1,11 @@
+--- blender/tools/Blender.py.orig	2009-06-16 14:57:16.000000000 +0200
++++ blender/tools/Blender.py	2009-07-02 15:53:49.000000000 +0200
+@@ -170,6 +170,8 @@
+ 	if lenv['WITH_BF_OPENAL']:
+ 		if not lenv['WITH_BF_STATICOPENAL']:
+ 			syslibs += Split(lenv['BF_OPENAL_LIB'])
++	if lenv['WITH_BF_OPENJPEG']:
++		syslibs += Split(lenv['BF_OPENJPEG_LIB'])
+ 	if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
+ 		if lenv['CC'] == 'cl.exe':
+ 			syslibs += ['vcomp']