New Version

5 files changed, 195 insertions, 26 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 1309642e8f62..e64e3fdce003 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/blender
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.26 2003/12/07 08:53:33 brandy Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.27 2004/02/04 01:50:06 lu_zero Exp $
+
+*blender-2.32 (04 Feb 2004)
+
+  04 Feb 2004; Luca Barbato <lu_zero@gentoo.org> blender-2.32.ebuild,
+  files/blender-2.32.patch:
+  New blender release
 
   07 Dec 2003; Brandy Westcott brandy@gentoo.org blender-2.31a.ebuild:
   Added blender.desktop file.
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b064e8d2bb57..8bc406a054d9 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,28 +1,28 @@
-MD5 b85001a84dca16ebd1b349e4bd715e06 blender-2.23-r1.ebuild 1098
-MD5 677ebfa2d4e274aad4330a516c2f1663 blender-2.30.ebuild 1947
-MD5 ecab9de91cc4b34b45b458106b829968 blender-2.26.ebuild 648
+MD5 1cc1c01e663e5d7d47d3d590dd0ffa3a blender-2.31.ebuild 1944
+MD5 8d53a8f680674ed45009450a66a3b7fb blender-2.31a.ebuild 2383
+MD5 7e0280bda419deb6d31152c5e26cbe33 blender-2.28c.ebuild 2182
+MD5 796631fdd5ac50b83d45b5950d2e95aa ChangeLog 4022
+MD5 3fe7083bc088189c3f62f446dfea9a6e blender-2.32.ebuild 2366
+MD5 b21e910af76146422c6602e68c45a61e blender-2.27.ebuild 689
+MD5 d3eba695aaee4c4ce9eac27c6a7c5ad3 metadata.xml 588
+MD5 83fc42b8a548d0eefaef6c783b3b153c blender-2.28a.ebuild 1996
+MD5 cb1be06a68ee67f037f995a772697c14 blender-2.28.ebuild 1995
+MD5 06f5a85552e2afc3edb6737885c07912 blender-2.30.ebuild 1946
+MD5 0464f0ed1b67976af1b0985b50b0e86d blender-2.23-r1.ebuild 1097
+MD5 43d18af30ef486d988c3d521a3f6d0ce blender-2.26.ebuild 647
+MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
+MD5 705b95605426ad9d562457fdbbff5460 files/blender-2.32.patch 2562
+MD5 21158d7f37f745ab78dcb437e3f5fac7 files/digest-blender-2.28 66
 MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
-MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
-MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
+MD5 504960c3dfcf520f65e3d9e59c81a598 files/digest-blender-2.32 66
+MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
+MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
+MD5 6534f3035e2370d87c8c3cb943c5a119 files/digest-blender-2.26 66
 MD5 d49beb1d5a2182b3b1f1a4c123145c96 files/configure-fix-2.31.patch 655
-MD5 da440d4ab4dddbda368a23ea4d62f97e files/digest-blender-2.23-r1 154
 MD5 6057638080d3c5c999219113ecf0ee6b files/blender-2.31a-plugins.patch 641
-MD5 6534f3035e2370d87c8c3cb943c5a119 files/digest-blender-2.26 66
-MD5 723758c1783633a74f493588a2913b46 files/digest-blender-2.27 66
-MD5 21158d7f37f745ab78dcb437e3f5fac7 files/digest-blender-2.28 66
-MD5 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
-MD5 64c3289608ad29370759d1c278d02a0c files/digest-blender-2.31 66
-MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
-MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
 MD5 aacb0f08e5496b93ec12751242c0a9ab files/digest-blender-2.28c 67
-MD5 fc5a649e2b6bfd7b436d1db41cd1e8f4 files/digest-blender-2.31a 67
-MD5 a13520b8046c792869ea5cae8374f6f3 files/configure-fix-2.31a.patch 658
-MD5 a855ab3ef355897d6896804f54ce21bd files/blender-2.12 36
-MD5 6a812bacb0726fbad7f0c35b02ed58b1 blender-2.28.ebuild 1996
-MD5 55deca9446401facc4703eceef64b33b blender-2.28a.ebuild 1997
-MD5 3a2e83e3f2f9b2f12a20973f0b4164eb blender-2.28c.ebuild 2183
-MD5 455348ecc7d508146b159478c045454c blender-2.31.ebuild 1945
-MD5 24f0b24bddb729ccebaedc0374d7bb1c blender-2.27.ebuild 690
-MD5 b2c6be1e75bdc60296b183270f96ab3d blender-2.31a.ebuild 2384
-MD5 4014ce7395abb18dc2e2b5e210ba1dd7 ChangeLog 3872
-MD5 d3eba695aaee4c4ce9eac27c6a7c5ad3 metadata.xml 588
+MD5 da440d4ab4dddbda368a23ea4d62f97e files/digest-blender-2.23-r1 154
+MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
+MD5 f22dcdbc692118213454a8c31bc459ff files/digest-blender-2.28a 67
+MD5 723758c1783633a74f493588a2913b46 files/digest-blender-2.27 66
+MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
diff --git a/media-gfx/blender/blender-2.32.ebuild b/media-gfx/blender/blender-2.32.ebuild
new file mode 100644
index 000000000000..fd23fc656f4b
--- /dev/null
+++ b/media-gfx/blender/blender-2.32.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.32.ebuild,v 1.1 2004/02/04 01:50:06 lu_zero Exp $
+
+inherit flag-o-matic
+replace-flags -march=pentium4 -march=pentium3
+
+IUSE="sdl jpeg png mozilla truetype static"
+#IUSE="${IUSE} blender-game blender-plugin"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2 | BL"
+KEYWORDS="~x86 ~ppc" # ~amd64"
+
+DEPEND="virtual/x11
+	blender-game? ( dev-games/ode )
+	sdl? ( media-libs/libsdl )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	mozilla? ( net-www/mozilla )
+	truetype? ( >=freetype-2.0 )
+	fmod? ( media-libs/fmod )
+	>=media-libs/openal-20020127
+	>=media-libs/libsdl-1.2
+	>=media-libs/libvorbis-1.0
+	>=dev-libs/openssl-0.9.6
+	>=media-gfx/yafray-0.0.6"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/blender-2.32.patch
+	cd ${S}/release/plugins
+	chmod 755 bmake
+}
+
+
+src_compile() {
+	local myconf=""
+
+	# SDL Support
+	use sdl && myconf="${myconf} --with-sdl=/usr"
+	#	|| myconf="${myconf} --without-sdl"
+
+	# Jpeg support
+	use jpeg && myconf="${myconf} --with-libjpeg=/usr"
+
+	# PNG Support
+	use png && myconf="${myconf} --with-libpng=/usr"
+
+	# ./configure points at the wrong mozilla directories and will fail
+	# with this enabled. (A simple patch should take care of this)
+	use mozilla && myconf="${myconf} --with-mozilla=/usr"
+
+	# TrueType support (For text objects)
+	use truetype && myconf="${myconf} --with-freetype2=/usr"
+
+	# Build Staticly
+	use static && myconf="${myconf} --enable-blenderstatic"
+
+	# Build the game engine
+	# use blender-game && myconf="${myconf} --enable-gameblender"
+
+	# Build the plugin (Will fail, requires gameblender)
+	# use blender-plugin && myconf="${myconf} --enable-blenderplugin"
+
+	econf ${myconf} || die
+	emake || die
+	cd ${S}/release/plugins
+	emake || die
+
+}
+
+src_install() {
+	einstall || die
+
+	exeinto /usr/lib/${PN}/textures
+	doexe ${S}/release/plugins/texture/*.so
+	exeinto /usr/lib/${PN}/sequences
+	doexe ${S}/release/plugins/sequence/*.so
+
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/${PN}.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+
+	dodoc COPYING INSTALL README release_2*
+
+}
diff --git a/media-gfx/blender/files/blender-2.32.patch b/media-gfx/blender/files/blender-2.32.patch
new file mode 100644
index 000000000000..687870268e06
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.32.patch
@@ -0,0 +1,69 @@
+diff -ruN blender-2.32.orig/configure blender-2.32/configure
+--- blender-2.32.orig/configure	2004-02-04 00:40:04.233004048 +0100
++++ blender-2.32/configure	2004-02-04 00:44:13.789065760 +0100
+@@ -22221,8 +22221,8 @@
+            with_mozilla =$withval
+         fi
+         if test x$with_mozilla != "yes"; then
+-           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
+-           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
++           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
++           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
+         fi
+ 
+ fi;
+@@ -26003,7 +26003,6 @@
+   fi
+ 
+ 
+-  rm -f conf.sdltest
+ 
+ 
+ echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
+diff -ruN blender-2.32.orig/release/plugins/bmake blender-2.32/release/plugins/bmake
+--- blender-2.32.orig/release/plugins/bmake	2004-02-04 00:40:02.213311088 +0100
++++ blender-2.32/release/plugins/bmake	2004-02-04 00:43:52.975229944 +0100
+@@ -60,7 +60,7 @@
+ 	LDFLAGS="-Bshareable";
+ elif ( test $UNAME = "Linux" ) then
+ 	CC="gcc";
+-	CFLAGS="-fPIC -funsigned-char -O2";
++#	CFLAGS="-fPIC -funsigned-char -O2";
+ 
+ 	LD="ld";
+ 	LDFLAGS="-Bshareable";
+@@ -112,6 +112,8 @@
+ 	INCLUDES=-I..;
+ elif ( test -f "../include/plugin.h" ) then
+ 	INCLUDES=-I../include
++elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
++	INCLUDES=-I../../../source/blender/blenpluginapi
+ else 
+ 	echo "Couldn't find plugin.h";
+ 	exit;
+diff -ruN blender-2.32.orig/source/blender/blenlib/Makefile.am blender-2.32/source/blender/blenlib/Makefile.am
+--- blender-2.32.orig/source/blender/blenlib/Makefile.am	2004-02-04 01:25:28.052920480 +0100
++++ blender-2.32/source/blender/blenlib/Makefile.am	2004-02-04 01:33:59.561159408 +0100
+@@ -47,7 +47,8 @@
+ 
+ INCLUDES = -I$(top_srcdir)/source/blender/makesdna \
+ 	-I$(top_srcdir)/intern/guardedalloc \
+-	-I$(top_srcdir)/source/blender/include
++	-I$(top_srcdir)/source/blender/include \
++	-I$(top_srcdir)/source/blender/blenkernel
+ 
+ EXTRA_DIST = \
+ 	Makefile \
+diff -ruN blender-2.32.orig/source/blender/blenlib/Makefile.in blender-2.32/source/blender/blenlib/Makefile.in
+--- blender-2.32.orig/source/blender/blenlib/Makefile.in	2004-02-04 01:25:28.074917136 +0100
++++ blender-2.32/source/blender/blenlib/Makefile.in	2004-02-04 01:34:28.189807192 +0100
+@@ -240,7 +240,8 @@
+ 
+ INCLUDES = -I$(top_srcdir)/source/blender/makesdna \
+ 	-I$(top_srcdir)/intern/guardedalloc \
+-	-I$(top_srcdir)/source/blender/include
++	-I$(top_srcdir)/source/blender/include \
++	-I$(top_srcdir)/source/blender/blenkernel
+ 
+ 
+ EXTRA_DIST = \
diff --git a/media-gfx/blender/files/digest-blender-2.32 b/media-gfx/blender/files/digest-blender-2.32
new file mode 100644
index 000000000000..d2cc05759542
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.32
@@ -0,0 +1 @@
+MD5 ebde5f573e19b7b8b64401d293c989e7 blender-2.32.tar.bz2 5661028