New version

(Portage version: 2.1.5)

4 files changed, 383 insertions, 1 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 22e589d42fb4..12af3f44fbb1 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.140 2008/05/11 13:07:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.141 2008/05/22 01:32:02 lu_zero Exp $
+
+*blender-2.46-r1 (22 May 2008)
+*blender-2.46 (22 May 2008)
+
+  22 May 2008; Luca Barbato <lu_zero@gentoo.org>
+  +files/blender-2.46-ffmpeg.patch, +blender-2.46.ebuild,
+  +blender-2.46-r1.ebuild:
+  New Version
 
   11 May 2008; Markus Meier <maekke@gentoo.org> -blender-2.43.ebuild:
   old
diff --git a/media-gfx/blender/blender-2.46-r1.ebuild b/media-gfx/blender/blender-2.46-r1.ebuild
new file mode 100644
index 000000000000..67cad7c27b9b
--- /dev/null
+++ b/media-gfx/blender/blender-2.46-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46-r1.ebuild,v 1.1 2008/05/22 01:32:02 lu_zero Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="jpeg mozilla png sdl static truetype"
+IUSE="blender-game ffmpeg jpeg nls openal openexr png verse"
+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 )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	jpeg? ( media-libs/jpeg )
+	media-libs/tiff
+	>=dev-lang/python-2.4
+	nls? ( >=media-libs/freetype-2.0
+			virtual/libintl
+			>=media-libs/ftgl-2.1 )
+	openal? ( media-libs/openal
+			media-libs/freealut )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	>=media-libs/libsdl-1.2
+	virtual/opengl"
+
+DEPEND=">=dev-util/scons-0.98
+	x11-libs/libXt
+	x11-proto/inputproto
+	${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_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
+
+	if use ffmpeg ; then
+		cd "${S}"/extern
+#		rm -rf ffmpeg libmp3lame x264
+		cat <<- EOF >> "${S}"/user-config.py
+		BF_FFMPEG="/usr"
+		BF_FFMPEG_LIB="avformat avcodec swscale avutil"
+		EOF
+	fi
+	# pass compiler flags to the scons build system
+	# and set python version to current version in use
+	python_version
+	cat <<- EOF >> "${S}"/user-config.py
+		CFLAGS += '${CFLAGS}'
+		BF_PYTHON_VERSION="${PYVER}"
+		BF_PYTHON_INC="/usr/include/python${PYVER}"
+		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+		BF_PYTHON_LIB="python${PYVER}"
+	EOF
+
+}
+
+src_compile() {
+	for arg in 'openal' \
+			'openexr' \
+			'jpeg' \
+			'ffmpeg' \
+			'png' \
+			'verse' \
+			'nls international' \
+			'blender-game gameengine'; do
+		blend_with ${arg}
+	done
+
+	# 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
+
+	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 "${FILESDIR}"/${PN}.png
+	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
+}
diff --git a/media-gfx/blender/blender-2.46.ebuild b/media-gfx/blender/blender-2.46.ebuild
new file mode 100644
index 000000000000..a5447ce90507
--- /dev/null
+++ b/media-gfx/blender/blender-2.46.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.46.ebuild,v 1.1 2008/05/22 01:32:02 lu_zero Exp $
+
+inherit multilib flag-o-matic eutils python
+
+#IUSE="jpeg mozilla png sdl static truetype"
+IUSE="blender-game ffmpeg jpeg nls openal openexr png verse"
+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 )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r1
+			media-libs/x264 )
+	jpeg? ( media-libs/jpeg )
+	media-libs/tiff
+	>=dev-lang/python-2.4
+	nls? ( >=media-libs/freetype-2.0
+			virtual/libintl
+			>=media-libs/ftgl-2.1 )
+	openal? ( media-libs/openal
+			media-libs/freealut )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	>=media-libs/libsdl-1.2
+	virtual/opengl"
+
+DEPEND=">=dev-util/scons-0.98
+	x11-libs/libXt
+	x11-proto/inputproto
+	${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_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/blender-2.37-dirs.patch
+	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
+
+	if use ffmpeg ; then
+		cd "${S}"/extern
+#		rm -rf ffmpeg libmp3lame x264
+		cat <<- EOF >> "${S}"/user-config.py
+		BF_FFMPEG="/usr"
+		BF_FFMPEG_LIB="avformat avcodec swscale avutil"
+		EOF
+	fi
+	# pass compiler flags to the scons build system
+	# and set python version to current version in use
+	python_version
+	cat <<- EOF >> "${S}"/user-config.py
+		CFLAGS += '${CFLAGS}'
+		BF_PYTHON_VERSION="${PYVER}"
+		BF_PYTHON_INC="/usr/include/python${PYVER}"
+		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+		BF_PYTHON_LIB="python${PYVER}"
+	EOF
+
+}
+
+src_compile() {
+	for arg in 'openal' \
+			'openexr' \
+			'jpeg' \
+			'ffmpeg' \
+			'png' \
+			'verse' \
+			'nls international' \
+			'blender-game gameengine'; do
+		blend_with ${arg}
+	done
+
+	# 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
+
+	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 "${FILESDIR}"/${PN}.png
+	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
+}
diff --git a/media-gfx/blender/files/blender-2.46-ffmpeg.patch b/media-gfx/blender/files/blender-2.46-ffmpeg.patch
new file mode 100644
index 000000000000..b06854c7e57f
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.46-ffmpeg.patch
@@ -0,0 +1,100 @@
+diff -urN blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c
+--- blender-2.46/source/blender/blenkernel/intern/writeffmpeg.c	2008-05-20 12:02:12.000000000 +0200
++++ blender-2.46.orig/source/blender/blenkernel/intern/writeffmpeg.c	2008-05-19 16:38:16.000000000 +0200
+@@ -29,11 +29,11 @@
+ 
+ #include <stdlib.h>
+ 
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavutil/rational.h>
++#include <libswscale/swscale.h>
++#include <libavcodec/opt.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/rational.h>
+-#include <ffmpeg/swscale.h>
+-#include <ffmpeg/opt.h>
+ 
+ #if LIBAVFORMAT_VERSION_INT < (49 << 16)
+ #define FFMPEG_OLD_FRAME_RATE 1
+diff -urN blender-2.46/source/blender/imbuf/intern/anim.c blender-2.46.orig/source/blender/imbuf/intern/anim.c
+--- blender-2.46/source/blender/imbuf/intern/anim.c	2008-05-20 12:05:41.000000000 +0200
++++ blender-2.46.orig/source/blender/imbuf/intern/anim.c	2008-05-19 16:38:41.000000000 +0200
+@@ -83,10 +83,10 @@
+ #include "IMB_anim5.h"
+ 
+ #ifdef WITH_FFMPEG
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavutil/rational.h>
++#include <libswscale/swscale.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/rational.h>
+-#include <ffmpeg/swscale.h>
+ 
+ #if LIBAVFORMAT_VERSION_INT < (49 << 16)
+ #define FFMPEG_OLD_FRAME_RATE 1
+diff -urN blender-2.46/source/blender/imbuf/intern/IMB_anim.h blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h
+--- blender-2.46/source/blender/imbuf/intern/IMB_anim.h	2008-05-20 12:04:33.000000000 +0200
++++ blender-2.46.orig/source/blender/imbuf/intern/IMB_anim.h	2008-05-19 16:38:41.000000000 +0200
+@@ -76,9 +76,9 @@
+ #endif /* WITH_QUICKTIME */
+ 
+ #ifdef WITH_FFMPEG
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
+ #endif
+ 
+ #include "IMB_imbuf_types.h"
+diff -urN blender-2.46/source/blender/imbuf/intern/util.c blender-2.46.orig/source/blender/imbuf/intern/util.c
+--- blender-2.46/source/blender/imbuf/intern/util.c	2008-05-20 12:05:04.000000000 +0200
++++ blender-2.46.orig/source/blender/imbuf/intern/util.c	2008-05-19 16:38:41.000000000 +0200
+@@ -62,8 +62,8 @@
+ #endif
+ 
+ #ifdef WITH_FFMPEG
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
+ 
+ #if LIBAVFORMAT_VERSION_INT < (49 << 16)
+ #define FFMPEG_OLD_FRAME_RATE 1
+diff -urN blender-2.46/source/blender/src/buttons_scene.c blender-2.46.orig/source/blender/src/buttons_scene.c
+--- blender-2.46/source/blender/src/buttons_scene.c	2008-05-20 12:03:50.000000000 +0200
++++ blender-2.46.orig/source/blender/src/buttons_scene.c	2008-05-19 16:38:39.000000000 +0200
+@@ -108,9 +108,9 @@
+ 
+ #ifdef WITH_FFMPEG
+ 
++#include <libavcodec/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
++#include <libavformat/avformat.h>
++#include <libavcodec/opt.h>
+-#include <ffmpeg/avcodec.h> /* for PIX_FMT_* and CODEC_ID_* */
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/opt.h>
+ 
+ static int ffmpeg_preset_sel = 0;
+ 
+diff -urN blender-2.46/source/blender/src/hddaudio.c blender-2.46.orig/source/blender/src/hddaudio.c
+--- blender-2.46/source/blender/src/hddaudio.c	2008-05-20 12:02:42.000000000 +0200
++++ blender-2.46.orig/source/blender/src/hddaudio.c	2008-05-19 16:38:39.000000000 +0200
+@@ -33,9 +33,9 @@
+ #endif
+ 
+ #ifdef WITH_FFMPEG
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavutil/rational.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/rational.h>
+ #if LIBAVFORMAT_VERSION_INT < (49 << 16)
+ #define FFMPEG_OLD_FRAME_RATE 1
+ #else