Changes 2.41:

* GLSL pixel and vertex shaders
* Full access to Blenders material capabilities
* Split screen and multi-viewports
* Number of fixes were made to the physics system
* Return of the armature capabilities

6 files changed, 84 insertions, 25 deletions

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 238e92057b3..5bb2e6377b5 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2006/02/10 20:34:25 adam Exp $
 
-DISTNAME=	blender-2.37a
-PKGREVISION=	3
+DISTNAME=	blender-2.41
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.umn.edu/pub/blender.org/source/ \
 		http://download.blender.org/source/
@@ -22,9 +21,10 @@ LDFLAGS+=		-lcrypto
 
 INSTALLATION_DIRS=	bin
 
+# remember to change the line number after an update
 post-patch:
 	${MV} ${WRKSRC}/SConstruct ${WRKSRC}/SConstruct.orig
-	${AWK} '{print} NR == 54 {print "env.Append(LINKFLAGS = \"-Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib\")"}' ${WRKSRC}/SConstruct.orig > ${WRKSRC}/SConstruct
+	${AWK} '{print} NR == 62 {print "env.Append(LINKFLAGS = \"-Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib\")"}' ${WRKSRC}/SConstruct.orig > ${WRKSRC}/SConstruct
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -46,8 +46,9 @@ do-install:
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/Mesa/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 .include "../../lang/python/pyversion.mk"
diff --git a/graphics/blender/PLIST b/graphics/blender/PLIST
index ac7bcdfab31..dff51875a40 100644
--- a/graphics/blender/PLIST
+++ b/graphics/blender/PLIST
@@ -1,22 +1,25 @@
-@comment $NetBSD: PLIST,v 1.4 2005/08/03 11:58:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/02/10 20:34:25 adam Exp $
 bin/blender
 bin/blender-bin
+share/blender/scripts/3ds_export.py
+share/blender/scripts/3ds_import.py
 share/blender/scripts/Apply_def.py
 share/blender/scripts/Axiscopy.py
 share/blender/scripts/DirectX8Exporter.py
 share/blender/scripts/DirectXExporter.py
-share/blender/scripts/UVpaint05.py
 share/blender/scripts/ac3d_export.py
 share/blender/scripts/ac3d_import.py
+share/blender/scripts/archimap.py
 share/blender/scripts/armature_symetry.py
-share/blender/scripts/batch_name_edit.py
 share/blender/scripts/bevel_center.py
 share/blender/scripts/blender2cal3d.py
+share/blender/scripts/blenderLipSynchro.py
 share/blender/scripts/bpymodules/BPyBlender.py
 share/blender/scripts/bpymodules/BPyMathutils.py
 share/blender/scripts/bpymodules/BPyNMesh.py
 share/blender/scripts/bpymodules/BPyRegistry.py
 share/blender/scripts/bpymodules/ai2obj.py
+share/blender/scripts/bpymodules/boxpack2d.py
 share/blender/scripts/bpymodules/defaultdoodads.py
 share/blender/scripts/bpymodules/eps2obj.py
 share/blender/scripts/bpymodules/gimp2obj.py
@@ -26,7 +29,8 @@ share/blender/scripts/bvh2arm.py
 share/blender/scripts/bvh_export.py
 share/blender/scripts/bvh_import.py
 share/blender/scripts/camera_changer.py
-share/blender/scripts/clean_mesh.py
+share/blender/scripts/collada_export.py
+share/blender/scripts/collada_import.py
 share/blender/scripts/config.py
 share/blender/scripts/console.py
 share/blender/scripts/discombobulator.py
@@ -35,6 +39,9 @@ share/blender/scripts/doc_browser.py
 share/blender/scripts/envelope_assignment.py
 share/blender/scripts/envelope_symmetry.py
 share/blender/scripts/fixfromarmature.py
+share/blender/scripts/flt_export.py
+share/blender/scripts/flt_filewalker.py
+share/blender/scripts/flt_import.py
 share/blender/scripts/help_browser.py
 share/blender/scripts/help_getting_started.py
 share/blender/scripts/help_manual.py
@@ -50,14 +57,23 @@ share/blender/scripts/kloputils.py
 share/blender/scripts/knife.py
 share/blender/scripts/lightwave_export.py
 share/blender/scripts/lightwave_import.py
+share/blender/scripts/md2_export.py
+share/blender/scripts/md2_import.py
+share/blender/scripts/mesh_bbrush_menu.py
+share/blender/scripts/mesh_cleanup.py
+share/blender/scripts/mesh_tri2quad.py
+share/blender/scripts/mirror_bone_weights.py
 share/blender/scripts/nendo_export.py
 share/blender/scripts/nendo_import.py
 share/blender/scripts/obdatacopier.py
 share/blender/scripts/obj_export.py
 share/blender/scripts/obj_import.py
+share/blender/scripts/object_batch_name_edit.py
 share/blender/scripts/off_export.py
 share/blender/scripts/off_import.py
 share/blender/scripts/paths_import.py
+share/blender/scripts/ply_export.py
+share/blender/scripts/ply_import.py
 share/blender/scripts/radiosity_export.py
 share/blender/scripts/radiosity_import.py
 share/blender/scripts/raw_export.py
@@ -74,12 +90,16 @@ share/blender/scripts/truespace_export.py
 share/blender/scripts/truespace_import.py
 share/blender/scripts/unweld.py
 share/blender/scripts/uv_export.py
+share/blender/scripts/uvpaint.py
 share/blender/scripts/videoscape_export.py
 share/blender/scripts/vrml97_export.py
+share/blender/scripts/widgetwizard.py
 share/blender/scripts/wings_export.py
 share/blender/scripts/wings_import.py
 share/blender/scripts/wrl2export.py
 share/blender/scripts/x3d_export.py
+share/blender/scripts/xfig_export.py
+share/blender/scripts/xsi_export.py
 @dirrm share/blender/scripts/bpymodules
 @dirrm share/blender/scripts
 @dirrm share/blender
diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index c852b582291..c79d3bbfd61 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.18 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.19 2006/02/10 20:34:25 adam Exp $
 
-SHA1 (blender-2.37a.tar.gz) = 8070654abdca449658f8fb7c9ecfc4fb7e445465
-RMD160 (blender-2.37a.tar.gz) = 77a78a9f5ead45b7d1f67837c30446afbe937889
-Size (blender-2.37a.tar.gz) = 7990789 bytes
+SHA1 (blender-2.41.tar.gz) = 839dfece3b6efbf10694ac535d88e3745c3253ec
+RMD160 (blender-2.41.tar.gz) = 7857eac2acda18ee24db4bb147bcf780025e2c12
+Size (blender-2.41.tar.gz) = 9464385 bytes
 SHA1 (patch-ab) = 3c8b57b1aac2aba141d8392ce8e9c7759febd68f
 SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
-SHA1 (patch-ae) = 5bf3ac144f8934c517115a7633b86a47627cc922
+SHA1 (patch-ae) = 4d9fdef4141445534e0fb476d9e14b42fcaf29d7
+SHA1 (patch-af) = 9c4d6b2f0c6fcbc097e54c6c1883ca422f29226d
+SHA1 (patch-ag) = 72fd964fd80932dde366a67a794c6aff2800dfe1
diff --git a/graphics/blender/patches/patch-ae b/graphics/blender/patches/patch-ae
index 1be043d2047..f1b3ec15156 100644
--- a/graphics/blender/patches/patch-ae
+++ b/graphics/blender/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
+$NetBSD: patch-ae,v 1.4 2006/02/10 20:34:25 adam Exp $
 
---- SConstruct.orig	2005-05-29 19:14:21.000000000 +0000
+--- SConstruct.orig	2006-01-22 23:46:29.000000000 +0100
 +++ SConstruct
-@@ -34,7 +34,7 @@ else:
+@@ -38,7 +38,7 @@ else:
  	playername = 'blenderplayer$PROGSUFFIX'
  
  # Build directory.
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
  
  bs_config.parseOpts()
  
-@@ -53,7 +53,92 @@ sdl_env = Environment (ENV = os.environ)
+@@ -61,7 +61,102 @@ sdl_env = Environment (ENV = os.environ)
  freetype_env = Environment (ENV = os.environ)
  env = Environment (ENV = os.environ)
  
@@ -26,9 +26,11 @@ $NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
 +	use_openal = 'false'
 +	use_fmod = 'false'
 +	use_quicktime = 'false'
-+	use_sumo = 'false'	# TODO
++	use_sumo = 'true'
 +	use_ode = 'false'
++	use_bullet = 'true'
 +	use_buildinfo = 'true'
++	use_fluidsim = 'true'
 +	build_blender_dynamic = 'true'
 +	build_blender_static = 'false'
 +	build_blender_player = 'false'
@@ -55,6 +57,10 @@ $NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
 +	jpeg_lib = ['jpeg']
 +	jpeg_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
 +	jpeg_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
++	# tiff library information
++	tiff_lib = ['tiff']
++	tiff_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
++	tiff_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
 +	# OpenGL library information
 +	opengl_lib = ['GL', 'GLU']
 +	opengl_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
@@ -73,10 +79,14 @@ $NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
 +	qhull_lib = []	   # TODO
 +	qhull_libpath = []  # TODO
 +	qhull_include = ['#extern/qhull/include']
++	# Bullet library information
++	bullet_lib = []
++	bullet_libpath = []
++	bullet_include = ['#extern/bullet','#extern/bullet/LinearMath','#extern/bullet/Bullet','#extern/bullet/BulletDynamics']
 +	# ODE library information
 +	ode_lib = ['ode']
-+	ode_libpath = ['#../lib/linux-glibc2.2.5-i386/ode/lib']
-+	ode_include = ['#../lib/linux-glibc2.2.5-i386/ode/include']
++	ode_libpath = os.environ[ 'ADD_C_LIB_DIRS' ].split(",")
++	ode_include = os.environ[ 'ADD_C_INCLUDE_DIRS' ].split(",")
 +	# Python library information
 +	python_lib = ['python%d.%d' % sys.version_info[0:2]]
 +	python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']
@@ -104,13 +114,13 @@ $NetBSD: patch-ae,v 1.3 2005/08/03 11:58:14 adam Exp $
 +elif sys.platform == 'linux2' or sys.platform == 'linux-i386':
  	use_international = 'true'
  	use_gameengine = 'true'
- 	use_openal = 'false'
-@@ -600,7 +685,7 @@ elif sys.platform=='openbsd3':
+ 	use_openal = 'true'
+@@ -561,7 +656,7 @@ elif string.find (sys.platform, 'irix') 
  	use_openal = 'false'
  	use_fmod = 'false'
  	use_quicktime = 'false'
 -	use_sumo = 'false'
 +	use_sumo = 'true'
  	use_ode = 'false'
- 	use_buildinfo = 'true'
- 	build_blender_dynamic = 'true'
+ 	use_bullet = 'false'
+ 	use_buildinfo = 'false'
diff --git a/graphics/blender/patches/patch-af b/graphics/blender/patches/patch-af
new file mode 100644
index 00000000000..34e0d8bef8b
--- /dev/null
+++ b/graphics/blender/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2006/02/10 20:34:25 adam Exp $
+
+--- extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp.orig	2006-02-10 20:35:26.000000000 +0100
++++ extern/bullet/BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp
+@@ -36,7 +36,7 @@
+ #if defined (WIN32)
+ #include <malloc.h>
+ #else
+-#if defined (__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <stdlib.h>
+ #else
+ #include <alloca.h>
diff --git a/graphics/blender/patches/patch-ag b/graphics/blender/patches/patch-ag
new file mode 100644
index 00000000000..e3964a10b9f
--- /dev/null
+++ b/graphics/blender/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2006/02/10 20:34:25 adam Exp $
+
+--- extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp.orig	2006-02-10 20:42:45.000000000 +0100
++++ extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
+@@ -42,7 +42,7 @@
+ #if defined (WIN32)
+ #include <malloc.h>
+ #else
+-#if defined (__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <stdlib.h>
+ #else
+ #include <alloca.h>