Update for new products

diff --git a/config_files/ParaView-3.10.sh b/config_files/ParaView-3.10.sh
index 02874de23cefa4d52f693b92f34fb9ebbae08890..60905e2d6da13bd663a559b78dfa302030210c71 100755 (executable)
--- a/config_files/ParaView-3.10.sh
+++ b/config_files/ParaView-3.10.sh
@@ -89,6 +89,12 @@ if [ "${need_patch_mutable}" == "1" ] ; then
        sed -i "s%\([[:space:]]*\)PyVTKSpecialObject.h%\1PyVTKSpecialObject.h\n\1PyVTKMutableObject.h%g" \
        VTK/Wrapping/Python/CMakeLists.txt )
 fi
+# 3. patch for ftgl (incompatibility with OCCT 6.5)
+need_patch_ftgl=1
+if [ "${need_patch_ftgl}" == "1" ] ; then
+    cp patches/paraview-3.10.1-ftgl.patch ${PRODUCT_SRC_DIR}
+    ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < paraview-3.10.1-ftgl.patch )
+fi
 
 # to generate environment scripts
 try_preinstalled
@@ -112,10 +118,10 @@ tcl_includes=""
 tcl_libs=""
 tcldir="`where_tcl`"
 if [ $? -eq 0 ] && [ -e ${tcldir}/tclConfig.sh ] ; then
-    tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g"`
-    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g"`
+    tcl_version=`grep -e "TCL_VERSION=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_VERSION=[\'|\"]\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
+    tcl_includes=`grep -e "TCL_INCLUDE_SPEC=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_INCLUDE_SPEC=[\'|\"]-I\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
     if [ -z "$tcl_includes" ] ; then tcl_includes=/usr/include ; fi
-    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g"`
+    tcl_libs=`grep -e "TCL_PACKAGE_PATH=.*" ${tcldir}/tclConfig.sh | sed -e "s%TCL_PACKAGE_PATH=[\'|\"]\(.*\)[\'|\"]%\1%g" | sed -e "s%^[[:space:]]%%g;s%[[:space:]]\+$%%g"`
 fi
     
 CMAKE_OPTIONS=""
@@ -184,6 +190,14 @@ fi
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_USE_VISITBRIDGE=ON"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOSTDIR}"
 
+### gl2ps settings
+if [ "${GL2PSHOME}" != "" ]; then
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_GL2PS:BOOL=ON"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DVTK_USE_SYSTEM_GL2PS:BOOL=ON"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_INCLUDE_DIR:STRING=${GL2PSHOME}/include"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DGL2PS_LIBRARY:STRING=${GL2PSHOME}/lib/libgl2ps.so"
+fi
+
 ### Extra options (switch off non-used Paraview plug-ins)
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessing:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
@@ -231,7 +245,9 @@ used gcc=$GCC
 EOF
 check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
 
-### 'make install` has been replaced by `cpack`
+#######
+# `make install` has been replaced by `cpack` since Paraview 3.10.0
+#######
 use_make_install=0
 if [ "${use_make_install}" == "1" ] ; then
     check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
@@ -250,11 +266,18 @@ if [ "${use_make_install}" == "1" ] ; then
     fi
 else
     check_job ${PRODUCT_DIR}/CPACK.LOG cpack -G TGZ --config Applications/ParaView/CPackParaView-DevelopmentConfig.cmake
-    bindir=`find ${PRODUCT_BUILD_DIR}/_CPack_Packages -type d -name "ParaView-*-3.10*"`
-    cp -rf ${bindir}/* ${PRODUCT_DIR}
+    bindir=`find ${PRODUCT_BUILD_DIR}/_CPack_Packages -type d -name "ParaView-*-${PVLIBVERSION}*"`
+    if [ "${bindir}" != "" ] ; then
+        cp -rf ${bindir}/* ${PRODUCT_DIR}
+    else
+       echo "Error on cpack step! CPack archive is not found! Exiting"
+    fi
 fi 
 
-# patch Paraview problem for bad VisItBridge configuration), required at least for Paraview 3.10.0 (fixed in 3.10.1)
+#######
+# patch Paraview problem (bad VisItBridge configuration)
+# NOT NEEDED SINCE PARAVIEW 3.10.1
+#######
 patch_visit_usage=0
 if [ "${patch_visit_usage}" == "1" ] ; then
     sed -i "s%SET(PARAVIEW_USE_VISITBRIDGE \"ON\")%SET(PARAVIEW_USE_VISITBRIDGE \"OFF\")%g" ${PRODUCT_DIR}/lib/paraview-${PVLIBVERSION}/ParaViewConfig.cmake

diff --git a/config_files/patches/paraview-3.10.1-ftgl.patch b/config_files/patches/paraview-3.10.1-ftgl.patch
new file mode 100755 (executable)
index 0000000..c4e942b
--- /dev/null
+++ b/config_files/patches/paraview-3.10.1-ftgl.patch
@@ -0,0 +1,1181 @@
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeTools.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeTools.cxx
+--- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeTools.cxx        2011-04-13 20:17:26.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeTools.cxx     2011-10-07 10:27:34.000000000 +0400
+@@ -31,6 +31,10 @@
+ // The embedded fonts
+ #include "fonts/vtkEmbeddedFonts.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++using namespace ftgl;
++#endif
++
+ // Print debug info
+ #define VTK_FTFC_DEBUG 0
+ #define VTK_FTFC_DEBUG_CD 0
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.cxx
+--- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.cxx    2011-04-13 20:17:26.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.cxx 2011-10-07 10:20:19.000000000 +0400
+@@ -33,6 +33,10 @@
+ 
+ #include <sys/stat.h>
+ 
++#ifdef FTGL_USE_NAMESPACE
++using namespace ftgl;
++#endif
++
+ // Print debug info
+ 
+ #define VTK_FTFC_DEBUG 0
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.h ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.h
+--- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.h      2011-04-13 20:17:26.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.h   2011-10-07 09:25:07.000000000 +0400
+@@ -32,6 +32,8 @@
+ 
+ // FreeType
+ 
++#include <FTGL.h>
++
+ #include "vtk_freetype.h"  //since ft2build.h could be in the path
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+@@ -42,7 +44,14 @@
+ # define VTK_FREETYPE_CACHING_SUPPORTED
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ class FTFont;
++#ifdef FTGL_USE_NAMESPACE
++}
++#endif
+ 
+ //----------------------------------------------------------------------------
+ // Singleton cleanup
+@@ -243,7 +252,11 @@
+   struct Entry
+   {
+     vtkTextProperty *TextProperty;
++#ifdef FTGL_USE_NAMESPACE
++    ftgl::FTFont *Font;
++#else
+     FTFont *Font;
++#endif
+     float LargestAscender;
+     float LargestDescender;
+   };
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
+--- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx     2011-04-13 20:17:26.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx  2011-10-07 10:35:15.000000000 +0400
+@@ -33,6 +33,9 @@
+ #include "vtk_gl2ps.h"
+ #endif // VTK_USE_GL2PS
+ 
++#ifdef FTGL_USE_NAMESPACE
++using namespace ftgl;
++#endif
+ 
+ //----------------------------------------------------------------------------
+ // Print debug info
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h
+--- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h       2011-04-13 20:17:26.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h    2011-10-07 11:17:46.000000000 +0400
+@@ -26,9 +26,18 @@
+ 
+ #include "vtkTextMapper.h"
+ 
++//#include <FTGL.h>
++//
++//#ifdef FTGL_USE_NAMESPACE
++//namespace ftgl
++//{
++//#endif
+ //BTX
+-class FTFont;
++//class FTFont;
+ //ETX
++//#ifdef FTGL_USE_NAMESPACE
++//}
++//#endif
+ 
+ class VTK_RENDERING_EXPORT vtkOpenGLFreeTypeTextMapper : public vtkTextMapper
+ {
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp       2011-10-06 20:28:22.000000000 +0400
+@@ -3,6 +3,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTBitmapGlyph::FTBitmapGlyph( FT_Glyph _glyph)
+ :  FTGlyph(),
+@@ -110,3 +114,7 @@
+ 
+   return advance;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.h    2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.h 2011-10-06 20:28:50.000000000 +0400
+@@ -9,6 +9,10 @@
+ #include "FTGL.h"
+ #include  "FTGlyph.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ /**
+  * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
+@@ -72,6 +76,9 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTBitmapGlyph__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp      2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp   2011-10-06 20:52:10.000000000 +0400
+@@ -8,6 +8,11 @@
+ #define RenderFunctionName RenderOpenGL
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ void FTBitmapGlyph::RenderFunctionName(const FT_Vector& pen,
+                                        const FTGLRenderContext *)
+ {
+@@ -19,3 +24,7 @@
+   // Restore the glyph origin
+   glBitmap( 0, 0, 0.0, 0.0, (float)(-pen.x - pos.x), (float)(-pen.y + pos.y), (const GLubyte *)0 );
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.cpp      2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.cpp   2011-10-06 20:29:58.000000000 +0400
+@@ -3,6 +3,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTCharmap::FTCharmap( FT_Face face)
+ :  ftFace( face),
+@@ -112,3 +116,7 @@
+   }
+ #endif
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.h        2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.h     2011-10-06 20:29:38.000000000 +0400
+@@ -24,6 +24,11 @@
+ #endif
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ /**
+  * FTCharmap takes care of specifying the encoding for a font and mapping
+  * character codes to glyph indices.
+@@ -134,5 +139,8 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTCharmap__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp        2011-10-06 20:30:45.000000000 +0400
+@@ -6,6 +6,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
+ :  FTGlyph(),
+@@ -234,3 +238,7 @@
+   
+   return advance;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.h     2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.h  2011-10-06 20:30:29.000000000 +0400
+@@ -9,6 +9,11 @@
+ #include "FTGLgl.h"
+ #include "FTGlyph.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTVectoriser;
+ 
+ /**
+@@ -70,6 +75,9 @@
+   
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTExtrdGlyph__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.cpp      2011-10-06 20:31:28.000000000 +0400
+@@ -6,6 +6,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTFace::FTFace()
+ :  charMap(0),
+@@ -140,5 +144,6 @@
+   }
+ }
+ 
+-
+-
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.h        2011-10-06 20:31:11.000000000 +0400
+@@ -9,6 +9,11 @@
+ 
+ #include "FTSize.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTCharmap;
+ 
+ /**
+@@ -158,5 +163,8 @@
+     FT_Error err;
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTFace__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.cpp      2011-10-06 20:32:15.000000000 +0400
+@@ -6,6 +6,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTFont::FTFont()
+ :  numFaces(0),
+@@ -287,3 +291,6 @@
+   pen.y += kernAdvance.y;
+ }
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.h        2011-10-06 20:32:19.000000000 +0400
+@@ -7,6 +7,11 @@
+ #include "FTGL.h"
+ #include "FTFace.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGlyphContainer;
+ class FTGlyph;
+ 
+@@ -273,6 +278,9 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTFont__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGL.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGL.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGL.h     2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGL.h  2011-10-06 20:51:26.000000000 +0400
+@@ -5,6 +5,8 @@
+ #include "vtkftglConfig.h"
+ #endif
+ 
++#define FTGL_USE_NAMESPACE
++
+ // To include debug memory manager by Paul Nettle (midnight@FluidStudios.com)
+ // http://www.FluidStudios.com/publications.html
+ // Get this code and use it. It will open your eyes:)
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp      2011-10-06 20:47:00.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGLBitmapFont::FTGLBitmapFont()
+ {}
+@@ -62,3 +66,7 @@
+     this->RenderOpenGL(string, context);
+     }
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.h        2011-10-06 20:33:27.000000000 +0400
+@@ -5,6 +5,11 @@
+ 
+ #include "FTFont.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGlyph;
+ 
+ /**
+@@ -67,4 +72,8 @@
+         
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif  //  __FTGLBitmapFont__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp     2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp  2011-10-06 20:53:28.000000000 +0400
+@@ -9,6 +9,11 @@
+ #define RenderFunctionName RenderOpenGL
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ void FTGLBitmapFont::RenderFunctionName(const char* string,
+                                         const FTGLRenderContext *context)
+ {  
+@@ -44,3 +49,7 @@
+   glPopAttrib();
+   glPopClientAttrib();
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp       2011-10-06 20:47:04.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGLExtrdFont::FTGLExtrdFont()
+ :  depth(0)
+@@ -28,4 +32,6 @@
+   return NULL;
+ }
+ 
+-
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.h    2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.h 2011-10-06 20:34:02.000000000 +0400
+@@ -5,6 +5,11 @@
+ 
+ #include  "FTFont.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGlyph;
+ 
+ 
+@@ -42,6 +47,9 @@
+     
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTGLExtrdFont__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp        2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp     2011-10-06 20:34:27.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGLOutlineFont::FTGLOutlineFont()
+ {}
+@@ -63,3 +67,6 @@
+ 
+ }
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.h  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.h       2011-10-06 20:34:31.000000000 +0400
+@@ -5,6 +5,11 @@
+ 
+ #include "FTFont.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGlyph;
+ 
+ 
+@@ -53,4 +58,9 @@
+     virtual FTGlyph* MakeGlyph( unsigned int g);
+     
+ };
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif // __FTGLOutlineFont__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp      2011-10-06 20:50:30.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGLPixmapFont::FTGLPixmapFont()
+ {}
+@@ -60,3 +64,7 @@
+     this->RenderOpenGL(string, context);
+     }
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.h        2011-10-06 20:35:05.000000000 +0400
+@@ -6,6 +6,11 @@
+ 
+ #include "FTFont.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGlyph;
+ 
+ 
+@@ -68,5 +73,9 @@
+     
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif  //  __FTGLPixmapFont__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp     2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp  2011-10-06 20:56:22.000000000 +0400
+@@ -9,6 +9,11 @@
+ #define RenderFunctionName RenderOpenGL
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ void FTGLPixmapFont::RenderFunctionName(const char* string,
+                                         const FTGLRenderContext *context)
+ {  
+@@ -44,3 +49,7 @@
+   glPopAttrib();
+   glPopClientAttrib();
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp        2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp     2011-10-06 20:35:40.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGLPolygonFont::FTGLPolygonFont()
+ {}
+@@ -27,4 +31,6 @@
+   return NULL;
+ }
+ 
+-
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.h  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.h       2011-10-06 20:35:44.000000000 +0400
+@@ -5,6 +5,11 @@
+ 
+ #include  "FTFont.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGlyph;
+ 
+ 
+@@ -38,6 +43,9 @@
+     
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTGLPolygonFont__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp        2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp     2011-10-06 20:36:08.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ inline GLuint NextPowerOf2( GLuint in)
+ {
+@@ -173,3 +177,6 @@
+   glPopAttrib();
+ }
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.h  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.h       2011-10-06 20:36:10.000000000 +0400
+@@ -5,6 +5,11 @@
+ #include "FTGLgl.h"
+ #include "FTFont.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTTextureGlyph;
+ 
+ 
+@@ -141,6 +146,9 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif // __FTGLTextureFont__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.cpp        2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.cpp     2011-10-06 20:36:53.000000000 +0400
+@@ -3,6 +3,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGlyph::FTGlyph()
+ :  advance(0),
+@@ -22,3 +26,7 @@
+     FT_Done_Glyph( glyph );
+     }
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.h  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.h       2011-10-06 20:36:57.000000000 +0400
+@@ -7,6 +7,10 @@
+ 
+ #include "FTGL.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ /**
+  * FTBBox
+@@ -142,6 +146,9 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTGlyph__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp       2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp    2011-10-06 20:42:17.000000000 +0400
+@@ -5,6 +5,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
+ :  preCache( p),
+@@ -65,3 +69,7 @@
+ //  kernAdvance.y = advance.y + kernAdvance.y;
+   return kernAdvance;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.h 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.h      2011-10-06 20:42:13.000000000 +0400
+@@ -19,6 +19,11 @@
+ #endif
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ /**
+  * FTGlyphContainer holds the post processed FTGlyph objects.
+  *
+@@ -142,5 +147,8 @@
+     
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTGlyphContainer__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.cpp      2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.cpp   2011-10-06 20:42:45.000000000 +0400
+@@ -5,6 +5,11 @@
+ 
+ #include <NoSTL/FTCallbackVector.h>
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ FTLibrary *FTLibrary::Instance = 0;
+ FTLibraryCleanup FTLibrary::Cleanup;
+ FTCallbackVector *FTLibraryCleanup::Dependencies = 0;
+@@ -152,3 +157,7 @@
+ 
+   return true;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.h        2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.h     2011-10-06 20:42:54.000000000 +0400
+@@ -7,6 +7,10 @@
+ #include FT_FREETYPE_H
+ //#include FT_CACHE_H
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ /**
+  * FTLibrary class is the global accessor for the Freetype library.
+@@ -114,4 +118,8 @@
+     static FTLibrary* Instance;
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif  //  __FTLibrary__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp      2011-10-06 20:43:27.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
+ :  FTGlyph(),
+@@ -89,3 +93,6 @@
+   return advance;
+ }
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.h        2011-10-06 20:43:29.000000000 +0400
+@@ -9,8 +9,12 @@
+ #include "FTGLgl.h"
+ #include "FTGlyph.h"
+ 
+-class FTVectoriser;
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
++class FTVectoriser;
+ 
+ /**
+  * FTOutlineGlyph is a specialisation of FTGlyph for creating outlines.
+@@ -77,6 +81,9 @@
+   
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTOutlineGlyph__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp  2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp       2011-10-06 20:43:55.000000000 +0400
+@@ -3,6 +3,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTPixmapGlyph::FTPixmapGlyph( FT_Glyph _glyph)
+ :  FTGlyph(),
+@@ -157,3 +161,7 @@
+ 
+   return advance;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.h    2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.h 2011-10-06 20:43:51.000000000 +0400
+@@ -9,6 +9,10 @@
+ #include "FTGL.h"
+ #include  "FTGlyph.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ /**
+  * FTPixmapGlyph is a specialisation of FTGlyph for creating pixmaps.
+@@ -77,4 +81,8 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif  //  __FTPixmapGlyph__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp      2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp   2011-10-06 20:58:01.000000000 +0400
+@@ -8,6 +8,11 @@
+ #define GetCurrentColorFunctionName GetCurrentColorOpenGL
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ void FTPixmapGlyph::GetCurrentColorFunctionName(float colour[4],
+                                                 const FTGLRenderContext *)
+ {
+@@ -29,3 +34,7 @@
+   // Restore the glyph origin
+   glBitmap( 0, 0, 0.0, 0.0, (float)(-pen.x - pos.x), (float)(-pen.y + pos.y), (const GLubyte *)0);
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp    2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp 2011-10-06 20:44:20.000000000 +0400
+@@ -4,6 +4,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
+ :  FTGlyph(),
+@@ -84,3 +88,7 @@
+   
+   return advance;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.h      2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.h   2011-10-06 20:44:22.000000000 +0400
+@@ -10,6 +10,11 @@
+ #include "FTGLgl.h"
+ #include "FTGlyph.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTVectoriser;
+ 
+ /**
+@@ -75,6 +80,9 @@
+   
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTPolyGlyph__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.cpp      2011-10-06 20:45:03.000000000 +0400
+@@ -3,6 +3,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTSize::FTSize()
+ :  ftFace(0),
+@@ -91,3 +95,7 @@
+ {
+   return 0;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.h        2011-10-06 20:45:06.000000000 +0400
+@@ -7,7 +7,10 @@
+ 
+ #include "FTGL.h"
+ 
+-
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ /**
+  * FTSize class provides an abstraction layer for the Freetype Size.
+@@ -119,5 +122,9 @@
+     
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif  //  __FTSize__
+ 
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp      2011-10-06 20:45:28.000000000 +0400
+@@ -3,6 +3,10 @@
+   #include "mmgr.h"
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ FTTextureGlyph::FTTextureGlyph( FT_Glyph glyph, int id, int xOffset, int yOffset, GLsizei width, GLsizei height)
+ :  FTGlyph(),
+@@ -109,3 +113,6 @@
+ 
+ }
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.h        2011-10-06 20:45:30.000000000 +0400
+@@ -10,6 +10,10 @@
+ #include "FTGLgl.h"
+ #include "FTGlyph.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
+ 
+ /**
+  * FTTextureGlyph is a specialisation of FTGlyph for creating texture
+@@ -101,5 +105,8 @@
+     
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTTextureGlyph__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.cpp
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.cpp   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.cpp        2011-10-06 20:46:20.000000000 +0400
+@@ -47,6 +47,11 @@
+ 
+ } // End of extern C
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ //=============================================================================
+ 
+ bool operator == ( const ftPoint &a, const ftPoint &b) 
+@@ -419,3 +424,7 @@
+   }
+ 
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.h     2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.h  2011-10-06 20:45:52.000000000 +0400
+@@ -13,6 +13,11 @@
+ #define CALLBACK
+ #endif
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ /**
+  * ftPoint class is a basic 3 dimensional point for holding outline font
+  * point data.
+@@ -423,5 +428,8 @@
+ 
+ };
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
+ 
+ #endif  //  __FTVectoriser__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h      2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h   2011-10-06 20:55:06.000000000 +0400
+@@ -23,6 +23,11 @@
+ 
+ #include "FTGL.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGL_EXPORT FTCharToGlyphIndexMap
+ {
+ public:
+@@ -150,4 +155,8 @@
+   this->Indices[pos.quot][pos.rem] = g;
+ }
+ 
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif
++
+ #endif  //  __FTCharToGlyphIndexMap__
+diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTVector.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTVector.h
+--- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTVector.h   2011-04-13 20:17:27.000000000 +0400
++++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTVector.h        2011-10-06 20:55:47.000000000 +0400
+@@ -16,6 +16,11 @@
+ 
+ #include "FTGL.h"
+ 
++#ifdef FTGL_USE_NAMESPACE
++namespace ftgl
++{
++#endif
++
+ class FTGL_EXPORT FT_VECTOR_CLASS_NAME
+ {
+ public:
+@@ -285,3 +290,7 @@
+     }
+   this->Size = n;
+ }
++
++#ifdef FTGL_USE_NAMESPACE
++} // namespace ftgl
++#endif