[Lunar-commits] <moonbase> OpenSceneGraph: Version bump and adjusting the BUILD and DEPENDS.

[Dennis `stumbles` Veatch]

commit 6bb11fd4c05e12e51f2c467236e7dc79b4568bc5
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu May 12 06:59:22 2011 -0400

    OpenSceneGraph: Version bump and adjusting the BUILD and DEPENDS.
---
 graphics/OpenSceneGraph/BUILD   |   19 +++++--------------
 graphics/OpenSceneGraph/DEPENDS |    1 +
 graphics/OpenSceneGraph/DETAILS |    6 +++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/graphics/OpenSceneGraph/BUILD b/graphics/OpenSceneGraph/BUILD
index de1e18e..c4d9ae9 100644
--- a/graphics/OpenSceneGraph/BUILD
+++ b/graphics/OpenSceneGraph/BUILD
@@ -1,25 +1,16 @@
 (
 
-  OOTB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
-
-  if in_depends $MODULE xulrunner ;  then
   sedit "s:xulrunner-js:mozilla-js:g" CMakeModules/FindXUL.cmake &&
   sedit "s:xulrunner-nspr:mozilla-nspr:g" CMakeModules/FindXUL.cmake &&
   sedit "s:xulrunner-nss:mozilla-nss:g" CMakeModules/FindXUL.cmake &&
+
   export XUL_INCLUDE_DIR=/usr/include/xulrunner-$(installed_version xulrunner) &&
   export XUL_LIBRARIES=/usr/lib/xulrunner-$(installed_version xulrunner) 
-  fi &&
-
-  mkdir $OOTB_DIR  &&
-  cd $OOTB_DIR     &&
-
-# A q&d fix to get this to compile with ffmpeg-0.6. Revisit on the next OSG bump.
-  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" &&
-
 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX   \
-                           -DCMAKE_BUILD_TYPE=RELEASE              \
-                           $OPTS                                  &&
+  cmake -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX   \
+        -DCMAKE_BUILD_TYPE=RELEASE              \
+        -Wno-dev                                \
+        $OPTS .                                &&
 
   default_make
 
diff --git a/graphics/OpenSceneGraph/DEPENDS b/graphics/OpenSceneGraph/DEPENDS
index 4e6efba..84fd041 100644
--- a/graphics/OpenSceneGraph/DEPENDS
+++ b/graphics/OpenSceneGraph/DEPENDS
@@ -8,3 +8,4 @@ depends  %XINELIB
 
 optional_depends xulrunner "" "" "for xulrunner support"
 optional_depends gtkglext  "" "" "for gtkglext support"
+optional_depends dcmtk     "" "" "for DICOM standards support"
diff --git a/graphics/OpenSceneGraph/DETAILS b/graphics/OpenSceneGraph/DETAILS
index 019cc93..add2508 100644
--- a/graphics/OpenSceneGraph/DETAILS
+++ b/graphics/OpenSceneGraph/DETAILS
@@ -1,11 +1,11 @@
           MODULE=OpenSceneGraph
-         VERSION=2.8.3
+         VERSION=2.8.4
           SOURCE=$MODULE-$VERSION.zip
       SOURCE_URL=http://www.openscenegraph.org/downloads/stable_releases/$MODULE-$VERSION/source
-      SOURCE_VFY=sha1:90502e4cbd47aac1689cc39d25ab62bbe0bba9fc
+      SOURCE_VFY=sha1:356ecd39f7e714dabb6776e23303fe3f1798a7cf
         WEB_SITE=http://www.openscenegraph.org
          ENTERED=20100605
-         UPDATED=20100605
+         UPDATED=20110512
            SHORT="A high performance real-time graphics toolkit"
 
 cat << EOF