blender: fixed/improved scons based build and removed oboslete compile patch

multimedia/blender/blender.conf

@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../blender/blender.conf
+# Copyright (C) 2011 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -12,14 +13,70 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-blender_custmain() {
-	export PATH
-# in x86-64 linking fails, needs to be told where xorg is
+blender_preconf() {
+	var_append sconsopt ' ' "BF_BUILDDIR='sde-build'"
+	var_append sconsopt ' ' "BF_INSTALLDIR='sde-install'"
+	var_append sconsopt ' ' "BF_DOCDIR='sde-install/doc'"
+	# in x86-64 linking fails, needs to be told where xorg is
 	var_append sconsopt ' ' "BF_OPENGL_LIBPATH=`pkg-config x11 --libs-only-L`"
 	var_append sconsopt ' ' "BF_OPENGL_INC=`pkg-config x11 --cflags-only-I`"
-	scons $sconsopt BUILD_BLENDER_PLAYER=yes
-	install ../build/linux2/bin/* $root$bindir/
+
+	# FFMPeg Support
+	if pkginstalled -f ffmpeg; then
+		var_append sconsopt ' '  "BF_FFMPEG=\"$( pkgprefix -r ffmpeg )\""
+		var_append sconsopt ' '  "BF_FFMPEG_LIB=\"avdevice avformat avcodec swscale avutil\""
+		# var_append cmakeopt ' ' "WITH_FFMPEG=ON"
+	fi
+}
+hook_add preconf 9 'blender_preconf'
+
+blender_build_plugins() {
+	chmod +x sde-install/plugins/bmake
+	eval $MAKE -C sde-install/plugins
 }
-custmain="blender_custmain"
+hook_add inmake 9 'blender_build_plugins'
+
+blender_install() {
+	cd sde-install
+
+	# install binaries
+	mkdir -p $root$bindir
+	install -m 755 blender $root$bindir
+	install -m 755 blenderplayer $root$bindir
+
+	# install plugins
+	mkdir -p $root$libdir/$pkg
+	for x in sequence texture; do
+		mkdir -p $root$libdir/$pkg/$x
+		install -m 755 plugins/$x/*.so $root$libdir/$pkg/$x
+	done
 
+	# install plugin headers
+	mkdir -p $root$includedir/$pkg
+	install plugins/include/*.h $root$includedir/$pkg
+
+	# install scripts
+	mkdir -p $root$datadir/$pkg
+	cp -av .blender/scripts $root$datadir/$pkg
+
+	# install locales
+	if [ "$SDECFG_DISABLE_NLS" != 1 ]; then
+		for x in .blender/locale/* ; do
+			local lcsrcdir="$x/LC_MESSAGES"
+			local lcdestdir="$root$datadir/locale/$( basename $x )/LC_MESSAGES"
+			mkdir -p $lcdestdir
+			cp -av "$lcsrcdir/blender.mo" "$lcdestdir"
+		done
+	fi
+
+	# install icon and desktop file
+	for x in icons/* ; do cp $x/* $root$datadir/icons/hicolor/$( basename $x)/apps/; done
+	cp -av ../release/freedesktop/blender.desktop $root/$datadir/applications/
+
+	# install documentation files
+	cp -av *.{txt,html,pdf} $root$docdir
+}
+hook_add postmake 9 'blender_install'
 
+# do not run scons install
+sconsinstopt=''

multimedia/blender/compile.patch

@@ -1,36 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../blender/compile.patch
-# Copyright (C) 2009 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- blender-2.48a/config/linux2-config.py.orig	2008-10-22 19:38:22.000000000 +0300
-+++ blender-2.48a/config/linux2-config.py	2009-02-27 23:24:58.000000000 +0200
-@@ -5,7 +5,7 @@
- BF_VERSE_INCLUDE = "#extern/verse/dist"
- 
- BF_PYTHON = '/usr'
--BF_PYTHON_VERSION = '2.5'
-+BF_PYTHON_VERSION = '2.6'
- WITH_BF_STATICPYTHON = False
- BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
- BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-@@ -44,7 +44,7 @@
- # BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
- 
- BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
--BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath z'
- BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
- # BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-