Bumped to 2.31a; added patch so we can compile plugins.

7 files changed, 145 insertions, 2 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 1658481d808e..327ef51e1b8c 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2003/12/04 10:23:42 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.25 2003/12/04 11:15:56 brandy Exp $
+
+*blender-2.31a (05 Dec 2003)
+
+  05 Dec 2003; Brandy Westcott brandy@gentoo.org blender-2.31a.ebuild:
+  Bumped to 2.31a; added patch so we can compile plugins.
 
   04 Dec 2003; Brandy Westcott brandy@gentoo.org
   files/configure-fix-2.31.patch:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b0eea72ea641..f8697a60cf93 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -6,12 +6,15 @@ 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 6b3c8867fc4f79990577cf0a502d36b3 ChangeLog 3610
+MD5 cde3d4c8b93d0bca49a63c16e0e9d9b9 blender-2.31a.ebuild 2317
+MD5 22ba1c4d59e2c00e98e7a5e650034cad ChangeLog 3770
 MD5 bd3394aef9cdd2a2fa952218288fa4ea metadata.xml 585
 MD5 f9d20818255d723bce691f341a34dc38 files/configure-fix-2.30.patch 655
+MD5 d95ef10fee53b71576c6da6c8163e748 files/blender.png 2119
 MD5 b5356307d35d0bfe73149428cafe23ff files/configure-fix.patch 754
 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
@@ -19,4 +22,6 @@ MD5 edbe7fddec312f94a65155ba4303398a files/digest-blender-2.30 66
 MD5 64c3289608ad29370759d1c278d02a0c files/digest-blender-2.31 66
 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
diff --git a/media-gfx/blender/blender-2.31a.ebuild b/media-gfx/blender/blender-2.31a.ebuild
new file mode 100644
index 000000000000..da69b46a5b2f
--- /dev/null
+++ b/media-gfx/blender/blender-2.31a.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.31a.ebuild,v 1.1 2003/12/04 11:15:56 brandy 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"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/configure-fix-${PV}.patch
+	epatch ${FILESDIR}/${P}-plugins.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}/sequence
+	doexe ${S}/release/plugins/sequence/*.so
+
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/${PN}.png
+
+	dodoc COPYING INSTALL README release_2*
+
+}
diff --git a/media-gfx/blender/files/blender-2.31a-plugins.patch b/media-gfx/blender/files/blender-2.31a-plugins.patch
new file mode 100644
index 000000000000..c6212e6a3a38
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.31a-plugins.patch
@@ -0,0 +1,20 @@
+--- blender-2.31a.orig/release/plugins/bmake	2003-12-04 21:12:20.000000000 +1300
++++ blender-2.31a/release/plugins/bmake	2003-12-04 21:13:12.000000000 +1300
+@@ -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 --git a/media-gfx/blender/files/blender.png b/media-gfx/blender/files/blender.png
new file mode 100644
index 000000000000..864a97a294d1
--- /dev/null
+++ b/media-gfx/blender/files/blender.png
diff --git a/media-gfx/blender/files/configure-fix-2.31a.patch b/media-gfx/blender/files/configure-fix-2.31a.patch
new file mode 100644
index 000000000000..1ec91901f105
--- /dev/null
+++ b/media-gfx/blender/files/configure-fix-2.31a.patch
@@ -0,0 +1,21 @@
+--- blender-2.31a.orig/configure	2003-12-04 23:47:25.000000000 +1300
++++ blender-2.31a/configure	2003-12-04 23:49:54.000000000 +1300
+@@ -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;
+@@ -26002,7 +26002,6 @@
+   fi
+ 
+ 
+-  rm -f conf.sdltest
+ 
+ 
+ echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
diff --git a/media-gfx/blender/files/digest-blender-2.31a b/media-gfx/blender/files/digest-blender-2.31a
new file mode 100644
index 000000000000..e9edd6a60837
--- /dev/null
+++ b/media-gfx/blender/files/digest-blender-2.31a
@@ -0,0 +1 @@
+MD5 834d9236b233951d854b02f7cd3721fb blender-2.31a.tar.bz2 4540160