[Lunar-commits] CVS: moonbase/graphics/blender BUILD, 1.2, 1.3 DEPENDS, 1.2, 1.3 DETAILS, 1.6, 1.7

[Auke Kok]

Update of /var/cvs/lunar/moonbase/graphics/blender
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/graphics/blender

Modified Files:
	BUILD DEPENDS DETAILS 
Log Message:
Blender update: now use scons... yuck! well anyway it builds but with bumps.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/blender/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	17 May 2004 12:40:48 -0000	1.2
+++ BUILD	11 Oct 2004 12:58:42 -0000	1.3
@@ -1,15 +1,20 @@
 (
 
-  sedit 's:NAN_PYTHON_VERSION ?= 2.2:NAN_PYTHON_VERSION ?= 2.3:g' source/nan_definitions.mk &&
-  sedit 's:NAN_MESA ?= /usr:NAN_MESA ?= /usr/X11R6:g' source/nan_definitions.mk &&
-  make &&
+  # Setup our environment
+  sedit "s:use_openal = \'false\':use_openal = \'true\':" SConstruct &&
+  sedit "s:build_blender_player = \'false\':build_blender_player = \'true\':" SConstruct &&
+  # Configure SCons...I'm not sure I like this sytem...
+  if echo $OPTS | grep -q "enable-gameblender" ; then
+    sedit "s:use_ode = \'false\':use_ode = \'true\':" SConstruct
+  else
+    sedit "s:use_gameengine = \'true\':use_gameengine = \'false\':" SConstruct
+  fi &&
+
+  if echo $OPTS | grep -q "enable-blenderplugin" ; then
+    sedit "s:build_blender_plugin = \'false\':build_blender_plugin = \'true\':"  SConstruct
+  fi &&
+  scons &&
   prepare_install &&
-  install -m755 obj/linux-glibc2.3.2-i386/bin/blender /usr/bin/ &&
-  install -m755 obj/linux-glibc2.3.2-i386/bin/blenderplayer /usr/bin/ &&
-  install -m755 obj/linux-glibc2.3.2-i386/bin/blenderstatic /usr/bin/ &&
-  install -m755 obj/linux-glibc2.3.2-i386/bin/Blender3DPlugin.so /usr/lib/ &&
-  install -m755 obj/linux-glibc2.3.2-i386/bin/npBlender3DPlugin.so /usr/lib/ &&
-  mkdir -p /usr/share/doc/blender &&
-  cp -av obj/linux-glibc2.3.2-i386/bin/.blender /usr/share/doc/blender
+  install -m 755 blender /usr/bin
 
 ) > $C_FIFO 2>&1

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/blender/DEPENDS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEPENDS	16 Feb 2004 13:14:17 -0000	1.2
+++ DEPENDS	11 Oct 2004 12:58:42 -0000	1.3
@@ -1,8 +1,25 @@
-depends autoconf  &&
-depends automake  &&
-depends libtool   &&
-depends libpng    &&
-depends jpeg      &&
-depends Python    &&
-depends openal-cvs
+depends libpng     &&
+depends jpeg       &&
+depends Python     &&
+depends scons      &&
+depends openal-cvs &&
 
+optional_depends  libogg                  \
+                  ""                      \
+                  ""                      \
+                  "for OGG file support"  &&
+
+optional_depends  libvorbis                  \
+                  ""                         \
+                  ""                         \
+                  "for Vorbis file support" &&
+
+optional_depends  ode                           \
+                  "--enable-gameblender"        \
+                  "--disable-gameblender"       \
+                  "for the GameBlender engine"  &&
+
+optional_depends  yafray                 \
+                  ""                     \
+                  ""                     \
+                  "for Yafray modeling"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/graphics/blender/DETAILS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DETAILS	5 Oct 2004 09:30:05 -0000	1.6
+++ DETAILS	11 Oct 2004 12:58:42 -0000	1.7
@@ -1,11 +1,11 @@
           MODULE=blender
-         VERSION=2.33a
+         VERSION=2.34
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://download.blender.org/source/
-      SOURCE_VFY=md5:987aafbbca4c13a648516fbd35caac08
+      SOURCE_VFY=sha1:a3688787e6af170792d04fec1956153be0a95b7a
         WEB_SITE=http://www.blender3d.org/
          ENTERED=20030929
-         UPDATED=20040517
+         UPDATED=2004101
            SHORT="3D editor for modeling, animation, and rendering."
 PSAFE=no
 cat << EOF