From 48488a4e3ecc06d534715b1a54f30738b0a73f35 Mon Sep 17 00:00:00 2001
From: maintenance team <salome-mnt@opencascade.com>
Date: Mon, 29 Oct 2007 11:19:27 +0000
Subject: [PATCH] Update for series 4X

---
 config_files/{VTK-4.2.6.sh => VTK-5.0.0.sh} | 75 ++++++++++++---------
 1 file changed, 43 insertions(+), 32 deletions(-)
 rename config_files/{VTK-4.2.6.sh => VTK-5.0.0.sh} (85%)

diff --git a/config_files/VTK-4.2.6.sh b/config_files/VTK-5.0.0.sh
similarity index 85%
rename from config_files/VTK-4.2.6.sh
rename to config_files/VTK-5.0.0.sh
index e4e1068..5aa2e83 100755
--- a/config_files/VTK-4.2.6.sh
+++ b/config_files/VTK-5.0.0.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : VTK-4.2.6.sh
+#  File      : VTK-5.0.0.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
@@ -63,26 +63,9 @@ source ${INSTALL_WORK}/$SHRC
 
 makedir ${PRODUCT_DIR}_SRC
 
-check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${PRODUCT_DIR}_SRC
+check_jb tar xfz ${SOURCE_DIR}/cmake-2.2.3.tar.gz -C ${PRODUCT_DIR}_SRC
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}_SRC
 
-# apply patches for 64-bit platforms
-if test `uname -m` = "x86_64" ; then
-    if [ -f patches/cmake-1.6.6-lib64.patch ] ; then
-	cp patches/cmake-1.6.6-lib64.patch ${PRODUCT_DIR}_SRC/cmake-1.6.6_SRC
-	( cd ${PRODUCT_DIR}_SRC/cmake-1.6.6_SRC ; patch -p1 < cmake-1.6.6-lib64.patch )
-    fi
-    if [ -f patches/vtk-4.2.6-lib64.patch ] ; then
-	cp patches/vtk-4.2.6-lib64.patch ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC
-	( cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC ; patch -p1 < vtk-4.2.6-lib64.patch )
-    fi
-fi
-# apply patch: fix pb with importing Python vtk modules on some platforms
-if [ -f patches/vtk-4.2.6-patented.patch ] ; then
-    cp patches/vtk-4.2.6-patented.patch ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC
-    ( cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC ; patch -p1 < vtk-4.2.6-patented.patch )
-fi
-
 # to generate environment scripts
 try_preinstalled
 }
@@ -95,7 +78,12 @@ install_source
 # build sources
 makedir ${PRODUCT_DIR}
 
-cd ${PRODUCT_DIR}_SRC/cmake-1.6.6_SRC
+cd ${PRODUCT_DIR}_SRC/cmake-2.2.3_SRC
+
+chmod +w ./configure
+#INV - bug in a cmake configure 
+cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
+chmod 755 ./configure
 
 check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
 cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
@@ -125,6 +113,10 @@ if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
 fi
     
 VTK_CMAKE_OPTIONS=""
+
+### compiler options
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS"-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1"
+
 ### common VTK settings
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DBUILD_SHARED_LIBS:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
@@ -135,14 +127,24 @@ VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_HYBRID:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PARALLEL:BOOL=ON"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_PATENTED:BOOL=OFF" 
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_RENDERING:BOOL=ON"
+VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
   if test `uname -m` = "x86_64" ; then
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
   fi
-
+#INV: provide additional flags Mandriva 2007.0
+#is_mandriva2007=0
+#if [ -e /etc/redhat-release ] ; then
+#  grep -e "Mandriva Linux release 2007.0" /etc/redhat-release > /dev/null
+#  if [ $? == 0 ] ; then is_mandriva2007=1 ; fi
+#fi
 ### Wrap Python settings
 if [ "${python_version}" != "" ]; then
+#if [ $is_mandriva2007 == 1 ] ; then
+#VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=OFF"
+#else
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_PYTHON:BOOL=ON"
+#fi
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_EXECUTABLE:STRING=${PYTHONHOME}/bin/python${python_version}"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_INCLUDE_PATH:STRING=${PYTHONHOME}/include/python${python_version}"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DPYTHON_LIBRARY:STRING=${PYTHONHOME}/lib/python${python_version}/config/libpython${python_version}.a"
@@ -150,7 +152,11 @@ fi
 ### Wrap Tcl settings
 if [ "${tcl_version}" != "" ] && [ "${tcl_includes}" != "" ] && [ "${tcl_libs}" != "" ] ; then
 # suppose that tcl and tk are installed in the same dir
+#if [ $is_mandriva2007 == 1 ] ; then
+#VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=OFF"
+#else
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DVTK_WRAP_TCL:BOOL=ON"
+#fi
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_INCLUDE_PATH:STRING=${tcl_includes}"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_LIBRARY:STRING=${tcl_libs}/libtcl${tcl_version}.so"
 VTK_CMAKE_OPTIONS=$VTK_CMAKE_OPTIONS" -DTCL_STUB_LIBRARY:STRING=${tcl_libs}/libtclstub${tcl_version}.a"
@@ -177,7 +183,7 @@ cat > ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 used VTK settings:
 $VTK_CMAKE_OPTIONS
 EOF
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ${PRODUCT_DIR}_SRC/cmake-1.6.6_SRC/Source/cmake . $VTK_CMAKE_OPTIONS
+check_job ${PRODUCT_DIR}/CONFIGURE.LOG ${PRODUCT_DIR}_SRC/cmake-2.2.3_SRC/Source/cmake . $VTK_CMAKE_OPTIONS
 
 cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
 used gcc=$GCC
@@ -191,16 +197,21 @@ cd ${PRODUCT_DIR}_SRC/${PRODUCT}_SRC/Wrapping/Python
 check_job ${PRODUCT_DIR}/SETUPPYTHON.LOG python setup.py install --prefix=${PRODUCT_DIR}
 
 # set correct symbolic links - bug of python wrappings installation
-  if test `uname -m` = "x86_64" ; then
-      cd ${PRODUCT_DIR}/lib64/python${python_version}/site-packages/vtk_python
-  else
-      cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages/vtk_python
-  fi
-  ln -sf ../../../vtk/*Python*.so .
+      cd ${PRODUCT_DIR}/include
+      ln -sf vtk-5.0 vtk
 
-  if test `uname -m` = "x86_64" ; then
-      cd ${PRODUCT_DIR}; ln -s lib64 lib
-  fi
+      if test `uname -m` = "x86_64" ; then
+	  cd ${PRODUCT_DIR}/lib; ln -s ../lib64/python${python_version} .
+      fi
+      cd ${PRODUCT_DIR}/lib/python${python_version}/site-packages
+      ln -sf vtk vtk_python 
+
+      cd ${PRODUCT_DIR}/lib
+      ln -sf ../lib vtk
+
+      if test `uname -m` = "x86_64" ; then
+	  cd ${PRODUCT_DIR}/lib64; ln -sf ../lib/* .
+      fi
 
 #du -sk ${PRODUCT_DIR}_SRC > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR};
@@ -238,7 +249,7 @@ export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 shift
 REMOVE_SRC_TMP=$8;
-export PRODUCT="VTK-4.2.6"
+export PRODUCT="VTK-5.0.0"
 export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
-- 
2.39.2