Blender compiles at least.

5 files changed, 151 insertions, 37 deletions

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index d4d0069..176f067 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,4 +1,4 @@
-AUX blender-2.60-bmake.patch 424 RMD160 0520e3f4a9a02be1b679d38934c2358a6f1c1fa2 SHA1 347a95208976878c56ebcd42f3484c95eca4c0fe SHA256 f69ecf7cd54ba9099408568f436e65b18e4d55f15ac1c07054cbd7c8d18c24bf
+AUX blender-2.60-bmake.patch 3429 RMD160 585fe2729d0756fbb80d62b35da96d7c7d07b78d SHA1 7832d676e4625ec139bfc9fe113604f4c810a614 SHA256 3432df1f780503ad34a96c83d3faea9fabe2fa58f1bcdf6a52a2d7ae33874f16
 AUX blender-2.60-doxyfile.patch 595 RMD160 f4890f0ead6943f323bc61e7f6766c2133e8591b SHA1 0fd7c202f044224cf9944596cf36cfcd56b39067 SHA256 d267e0fab4ecb9be78b9238a9c2af60ac9d5ddb7b42f73f479b9266704605883
 AUX blender-2.60-eigen.patch 13804 RMD160 67b2d444f35ac5b9f2e2fc1ee93a105feadc83db SHA1 943ba7ebd2f37102b62d790d7ad4795695fba268 SHA256 b973b07db667ab84eebae24c47805772f6f2694bb77cb8846431d502c56b54d8
 AUX blender-2.60-glew.patch 1128 RMD160 392907190c8c970a1b2f0b20067d9f1bf108edbc SHA1 e9890bc4c420b16ce4f9c9c6cfc71c13852e4de3 SHA256 a43f0a0ac2a0cc5096e8488c926e7a32933a5910300440590a1cac5e1bb73f20
@@ -6,8 +6,9 @@ AUX blender-2.60-openjpeg.patch 1731 RMD160 898318cfdc0c5daafd39d1f0f116531c6a2f
 AUX blender-2.60a-CVE-2009-3850-v3.patch 7787 RMD160 02afc6ef3bcdf314c693c44be0cfc649ffd4ebf3 SHA1 031b42d09021b027dde631f08bc8e973299edab9 SHA256 1aebbdd475ccdb1d4e77c4c1ae4c3205e76a1a06f7dcd5e70624c141f42d204b
 AUX blender-2.60a-cmake.patch 1878 RMD160 c8e2c5f77fad86475b10b4634ba6efdf1f8f3ac4 SHA1 8e0c38ed3fe1bdfeb74ac6313d4aaae661fd742c SHA256 540602705f85971378fe86e28c2ac888a21085c49a6fe1cca762b30b922e77e8
 AUX blender-2.60a-enable_site_module.patch 974 RMD160 e93ddcd1372751951b6e56f72c764e2043747574 SHA1 84aed7ab30f5de1989ee63b4584db7acd6747b54 SHA256 dfafc00a08504c0c3259083d01e535e00f9a952db4a551dbacf0a62ad1a5c768
+AUX blender-2.60a-insecure.desktop 494 RMD160 1ab958fd4eb3f7347947395261caa7876d69a23a SHA1 98afd4f185c652bdb4db27095f660f7b79b5692b SHA256 9cb6ae0b0bed6ce2c91a5fd1fd820433e257858f03b0cebb035084e4c5d0035d
 AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
-AUX blender-desktop.patch 641 RMD160 af973d38300270e20eb76331da26e619b1d8d73f SHA1 aae3b7dc1ab89e40a6269c4a9593f0f064010eb8 SHA256 fe7e11d4793fce2b2ec4559fbeba05fe395d4b728764e8cc66e6881e7444d7fb
+AUX blender-desktop.patch 640 RMD160 add97012f2b8ff7041ead9fb1c97ae58c906a38b SHA1 442ae5983f03862033533bfe99e2928e0dcb8299 SHA256 ae0cd2c105457f4b92568b820064122b4c0d0831616c77378866e3c3982e084d
 DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124
-EBUILD blender-2.60a.ebuild 13321 RMD160 a03ea6d0cc72c0037b7c9c166b2559bcdd16b37e SHA1 e70601385f0f227d87a92c092cf4649dfb0413af SHA256 3232ce5a820fc438f5c074e1e5992d86cac55f991f4a57cacd5fd30338939d0a
+EBUILD blender-2.60a.ebuild 13316 RMD160 075a2a68d7fc4d551b18a386283b9d34ee5c5b6f SHA1 7d6360c27e989d916358b5cacf47772c57e14ce4 SHA256 1e5ebe72a99fdc22325fbf648a27492bd6349bf6a01a77407723a4a05356d2b7
 MISC metadata.xml 1953 RMD160 d34820d0ff77c323156115939aa16575c4d08130 SHA1 220ede2f65489b3ce59c8b79a714b4984d91f5b2 SHA256 6189d779179d2c30e4f99b91fcc09f7cf4e09d41b80312c33455df7ce24eee73
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index 7d20edf..5c6b34c 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -13,7 +13,7 @@ fi
 inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
 
 IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
-	+dds debug fftw jack apidoc sndfile lcms tweak-mode sdl sse \
+	+dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
 	redcode +zlib iconv contrib collada verse 3dmouse"
 
 LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
@@ -123,11 +123,12 @@ src_prepare() {
 
 	# TODO: write a proper Makefile to replace the borked bmake script
 	epatch "${FILESDIR}"/${PN}-${SLOT}-bmake.patch
+	chmod 755 "${WORKDIR}"/${P}/release/plugins/bmake
 
 	# OpenJPEG
 	einfo "Removing bundled OpenJPEG ..."
 	rm -r extern/libopenjpeg
-	#epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
+	epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
 
 	# Glew
 	einfo "Removing bundled Glew ..."
@@ -285,21 +286,14 @@ src_configure() {
 }
 
 src_compile() {
-	escons || die \
-		'!!! Please add "${S}/scons.config" when filing bugs reports \
-		to bugs.gentoo.org'
+	escons
 
 	einfo "Building plugins ..."
-	cd "${WORKDIR}"/${P}/release/plugins \
-		|| die "dir ${WORKDIR}/${P}/release/plugins do not exist"
-	chmod 755 bmake
-
 	# FIX: plugins are built without respecting user's LDFLAGS
 	emake \
 		CFLAGS="${CFLAGS} -fPIC" \
 		LDFLAGS="$(raw-ldflags) -Bshareable" \
-		> /dev/null \
-		|| die "plugins compilation failed"
+		-C release/plugins
 }
 
 src_install() {
@@ -318,6 +312,7 @@ src_install() {
 
 		export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${SLOT}/scripts"
 		export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles"
+		export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${SLOT}/plugins"
 			exec /usr/bin/blender-bin-${SLOT} \$*
 	EOF
 
@@ -338,13 +333,16 @@ src_install() {
 #	fi
 
 	# install plugins
-	exeinto /usr/share/${PN}/${SLOT}/textures
+	exeinto /usr/lib/${PN}/${SLOT}/plugins/texture
 	doexe "${WORKDIR}"/${P}/release/plugins/texture/*.so
-	exeinto /usr/share/${PN}/${SLOT}/sequences
+	exeinto /usr/lib/${PN}/${SLOT}/plugins/sequences
 	doexe "${WORKDIR}"/${P}/release/plugins/sequence/*.so
 	insinto /usr/include/${PN}/${SLOT}
-	doins "${WORKDIR}"/${P}/release/plugins/include/*.h
-#	rm -r "${WORKDIR}"/${P}/release/plugins || die
+	doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
+#	rm -r "${WORKDIR}"/${P}/release/plugins
+#	insinto /usr/share/${PN}/${SLOT}
+#	doins "${WORKDIR}"/${P}/release/datafiles
+#	doins "${WORKDIR}"/${P}/release/scripts
 
 	# install desktop file
 	insinto /usr/share/pixmaps
@@ -354,11 +352,12 @@ src_install() {
 	insinto /usr/share/applications
 	cp release/freedesktop/blender.desktop \
 		release/freedesktop/blender-${SLOT}.desktop
-	doins release/freedesktop/blender-${SLOT}.desktop || die
-	newins "${FILESDIR}"/${P}-insecure.desktop ${PN}-${SLOT}-insecure.desktop || die
+	doins release/freedesktop/blender-${SLOT}.desktop
+	newins "${FILESDIR}"/${P}-insecure.desktop ${PN}-${SLOT}-insecure.desktop
 
 	# install docs
-#	use doc && dodoc release/text/BlenderQuickStart.pdf
+	doman "${WORKDIR}"/${P}/doc/manpage/blender.1
+	use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
 	if use apidoc; then
 
 		einfo "Generating (BGE) Blender Game Engine API docs ..."
@@ -391,23 +390,23 @@ src_install() {
 	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
 
 	# installing blender
-	insinto /usr/share/${PN}/${SLOT}
-	doins -r "${WORKDIR}"/install/${PV}/*
-#        doins -r "${WORKDIR}"/install/${SLOT}/*
+	insinto /usr/share/${PN}/${PV}
+	doins -r "${WORKDIR}"/install/${SLOT}/*
+
 
 	# FIX: making all python scripts readable only by group 'users',
 	#	  so nobody can modify scripts apart root user, but python
 	#	  cache (*.pyc) can be written and shared across the users.
-	chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-	chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
+#	chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
+#	chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
 }
 
-pkg_preinst() {
-	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-	then
-		rm -r "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-	fi
-}
+#pkg_preinst() {
+#	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
+#	then
+#		rm -r "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
+#	fi
+#}
 
 pkg_postinst() {
 	echo
diff --git a/media-gfx/blender/files/blender-2.60-bmake.patch b/media-gfx/blender/files/blender-2.60-bmake.patch
index 0fff6d8..0ce8fa7 100644
--- a/media-gfx/blender/files/blender-2.60-bmake.patch
+++ b/media-gfx/blender/files/blender-2.60-bmake.patch
@@ -1,15 +1,114 @@
---- release/plugins/bmake   2010-03-21 17:44:20.500741049 +0100
-+++ release/plugins/bmake   2010-03-21 17:44:33.659740173 +0100
+diff -Npur release/plugins.orig/bmake release/plugins/bmake
+--- release/plugins.orig/bmake	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/bmake	2011-11-11 15:01:40.637923565 +0100
 @@ -57,10 +57,10 @@
 	LDFLAGS="-Bshareable";
  elif ( test $UNAME = "Linux" ) then
 	CC="gcc";
 -	CFLAGS="-fPIC -funsigned-char -O2";
-+#   CFLAGS="-fPIC -funsigned-char -O2";
++#	CFLAGS="-fPIC -funsigned-char -O2";
 
 	LD="ld";
 -	LDFLAGS="-Bshareable";
-+#   LDFLAGS="-Bshareable";
++#	LDFLAGS="-Bshareable";
  elif ( test $UNAME = "SunOS" ) then
 	CC="cc";
 	CFLAGS="-O";
+@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then
+ 	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;
+ fi
+ 
+ LIBM=`fgrep "#include <math.h>" $CFILE`
+-LIBC=`fgrep "#include <std" $CFILE`
+ 
+-LIBS=
++LIBS="-lc"
+ 
+ if ( test -n "$LIBM" ) then
+ 	LIBS="$LIBS -lm"; 
+ fi
+-if ( test -n "$LIBC" ) then 
+-	LIBS="$LIBS -lc"; 
+-fi
+ 
+ echo "$CC $CFLAGS -c $CFILE $INCLUDES"
+ $CC $CFLAGS -c $CFILE $INCLUDES
+diff -Npur release/plugins.orig/sequence/color-correction-hsv.c release/plugins/sequence/color-correction-hsv.c
+--- release/plugins.orig/sequence/color-correction-hsv.c	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/sequence/color-correction-hsv.c	2011-11-11 15:03:47.233921332 +0100
+@@ -15,7 +15,7 @@
+  *
+  */
+ 
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include <stdio.h>
+ 
+diff -Npur release/plugins.orig/sequence/color-correction-yuv.c release/plugins/sequence/color-correction-yuv.c
+--- release/plugins.orig/sequence/color-correction-yuv.c	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/sequence/color-correction-yuv.c	2011-11-11 15:02:10.446923031 +0100
+@@ -15,7 +15,7 @@
+  *
+  */
+ 
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include <stdio.h>
+ 
+diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c
+--- release/plugins.orig/sequence/dnr.c	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/sequence/dnr.c	2011-11-11 15:03:30.049921648 +0100
+@@ -15,7 +15,7 @@
+  *
+  */
+ 
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include <stdio.h>
+ 
+diff -Npur release/plugins.orig/sequence/gamma.c release/plugins/sequence/gamma.c
+--- release/plugins.orig/sequence/gamma.c	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/sequence/gamma.c	2011-11-11 15:01:58.982923268 +0100
+@@ -15,7 +15,7 @@
+  *
+  */
+ 
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include "util.h"
+ #include <stdio.h>
+diff -Npur release/plugins.orig/texture/clouds2.c release/plugins/texture/clouds2.c
+--- release/plugins.orig/texture/clouds2.c	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/texture/clouds2.c	2011-11-11 15:02:23.104922789 +0100
+@@ -27,7 +27,7 @@
+  * ***** END GPL LICENSE BLOCK *****
+  */
+  
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ 
+ /* ******************** GLOBAL VARIABLES ***************** */
+diff -Npur release/plugins.orig/texture/tiles.c release/plugins/texture/tiles.c
+--- release/plugins.orig/texture/tiles.c	2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/texture/tiles.c	2011-11-11 15:04:05.749921038 +0100
+@@ -27,7 +27,7 @@
+  * ***** END GPL LICENSE BLOCK *****
+  */
+ 
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ 
+ /* ******************** GLOBAL VARIABLES ***************** */
diff --git a/media-gfx/blender/files/blender-2.60a-insecure.desktop b/media-gfx/blender/files/blender-2.60a-insecure.desktop
new file mode 100644
index 0000000..bb820b9
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.60a-insecure.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Blender-2.6 (reduced security)
+GenericName=3D modeller
+GenericName[es]=modelador 3D
+GenericName[de]=3D Modellierer
+GenericName[fr]=modeleur 3D
+GenericName[ru]=Редактор 3D-моделей
+Comment=3D modeling, animation, rendering and post-production
+Comment[es]=modelado 3D, animación, renderizado y post-producción
+Exec=blender-2.60 --enable-autoexec
+Icon=blender-2.6
+Terminal=false
+Type=Application
+Categories=Graphics;3DGraphics;
+MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-desktop.patch b/media-gfx/blender/files/blender-desktop.patch
index f5a566d..b86671c 100644
--- a/media-gfx/blender/files/blender-desktop.patch
+++ b/media-gfx/blender/files/blender-desktop.patch
@@ -13,7 +13,7 @@
  Comment[es]=modelado 3D, animación, renderizado y post-producción
 -Exec=blender
 -Icon=blender
-+Exec=blender-2.60a
++Exec=blender-2.60
 +Icon=blender-2.6
  Terminal=false
  Type=Application