[Lunar-commits] <moonbase> opencascade: Adding a patch I created to clean up the BUILD. Just to note, this could have

[Dennis `stumbles` Veatch]

commit b0632de8c4ec955adf65d059b698b16cec4835c2
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Dec 15 07:50:32 2011 -0500

    opencascade: Adding a patch I created to clean up the BUILD. Just to note, this could have
    
    gone in /opt/$MODULE, however there is nothing in this package the actually conflicts with
    the system.
    
    In any case this patch does the following;
    
    1. Shoves env_DRAW.sh in /etc/profile.d and adjusts its paths accordingly.
    2. Since installation into /opt would have mitigated things being installed in /usr/src, there
       still would have been /usr/lin and /usr/Linux symlinks created; not needed now. All headers
       are thrown in /usr/include/opencascade with their respective subdirs.
    3. Fixes the ftgl naming and pathing issues with the headers; this was the instigator.
    4. Fixes the include paths for qt4.
    5. Because of the way they deal with options most of the dependencies still require a path which
       is why for example the DEPENDS has; --with-ftgl=/usr, else you get make failures like; -Lyes/lib.
---
 zbeta/opencascade/BUILD   |   28 +++++++---------------------
 zbeta/opencascade/DEPENDS |   15 ++++++---------
 zbeta/opencascade/DETAILS |    5 ++++-
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/zbeta/opencascade/BUILD b/zbeta/opencascade/BUILD
index 4b7ab0b..a6fb622 100644
--- a/zbeta/opencascade/BUILD
+++ b/zbeta/opencascade/BUILD
@@ -2,33 +2,19 @@
 
   cd ros &&
 
+  patch_it $SOURCE2 0 &&
+
+  ./build_configure &&
+
   export CFLAGS+=" -fpermissive" &&
   export CXXFLAGS+=" -fpermissive" &&
 
-  if in_depends $MODULE ftgl ; then
-    sedit "s:FTFont.h:FTGL/ftgl.h:" inc/OpenGl_FontMgr.hxx src/OpenGl/OpenGl_FontMgr.hxx &&
-    sedit "s:FTGLTextureFont.h:FTGL/FTGLTextureFont.h:" src/OpenGl/OpenGl_FontMgr.cxx &&
-    sedit "s:FTLibrary.h:FTGL/FTLibrary.h:" src/OpenGl/OpenGl_FontMgr.cxx &&
-    sedit "s:FTFace.h:FTGL/FTFace.h:" src/OpenGl/OpenGl_FontMgr.cxx &&
-    sedit "s:FTFont.h:FTGL/FTFont.h:" inc/OpenGl_TextRender.hxx 
-  fi &&
-
   if in_depends $MODULE qt4 ; then
-     . /etc/profile.d/qt4.rc &&
-     sedit "s:\$qt/include:/usr/include/qt4:g" configure   &&
-     sedit "s:\$qt/include/:/usr/include/qt4/:g" configure &&
-     sedit "s:\$qt/lib:/usr/lib/qt4:g" configure
+     . /etc/profile.d/qt4.rc 
   fi &&
 
-  sedit "s:FTGL.h:ftgl.h:g" configure &&
-  
-  ./build_configure &&
-
-  ./configure $flags --prefix=/usr         \
-                     --disable-debug       \
-                     --enable-production   \
-                     $OPTS                &&
+  OPTS+=" --disable-debug --enable-production --prefix=/usr" &&
 
-  default_make
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/opencascade/DEPENDS b/zbeta/opencascade/DEPENDS
index 12c80e5..4e36dcc 100644
--- a/zbeta/opencascade/DEPENDS
+++ b/zbeta/opencascade/DEPENDS
@@ -1,15 +1,12 @@
 depends libXmu
 
-optional_depends "tk"        "--with-tk" "--without-tk"        "for TK GUI support"
-
-optional_depends "tcl"       "--with-tcl" "--without-tcl"       "for tcl scripting support"
-
-optional_depends "ftgl"      "--with-ftgl=/usr"                     \
-                             "--without-ftgl"      "for OpenGL font rendering support"
-
-optional_depends "gl2ps"     "--with-gl2ps=/usr"    "--without-gl2ps"     "for OpenGL postscript printing support"
+optional_depends "tk"        "--with-tk"             "--without-tk"        "for TK GUI support"
+optional_depends "tcl"       "--with-tcl"            "--without-tcl"       "for tcl scripting support"
+optional_depends "ftgl"      "--with-ftgl=/usr"      "--without-ftgl"      "for OpenGL font rendering support"
+optional_depends "gl2ps"     "--with-gl2ps=/usr"     "--without-gl2ps"     "for OpenGL postscript printing support"
 optional_depends "FreeImage" "--with-freeimage=/usr" "--without-freeimage" "for various image file format support"
-optional_depends "qt4"       "--with-qt"        "--without-qt"        "for Qt widget support"
+optional_depends "freetype2" "--with-freetype=/usr"  "--without-freetype"  "for freetype2 font support"
+optional_depends "qt4"       "--with-qt=/usr"        "--without-qt"        "for Qt widget support"
 
 optional_depends "%JAVA_SDK" "--with-java-include=$JAVA_HOME/include" "" "for java bindings support"
 
diff --git a/zbeta/opencascade/DETAILS b/zbeta/opencascade/DETAILS
index a14c679..a42023e 100644
--- a/zbeta/opencascade/DETAILS
+++ b/zbeta/opencascade/DETAILS
@@ -1,12 +1,15 @@
           MODULE=opencascade
          VERSION=6.5.2
           SOURCE=OpenCASCADE652.tar.gz
+         SOURCE2=opencascade-652-config-makefile-ftgl.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=http://files.opencascade.com/OCCT/OCC_6.5.2_release/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:cbcf54d0f7f4615b4ca7ef86281cd1e622e0642b
+     SOURCE2_VFY=sha1:49a434a4bb3f2ff46edd05e35a0c34769967f839
         WEB_SITE=http://www.opencascade.org/
          ENTERED=20111213
-         UPDATED=20111214
+         UPDATED=20111215
            SHORT="Open Source alternative to proprietary 3D modeling kernels"
 
 cat << EOF