spns #29324: FD34

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index d4e4a740e66cbc3a281088f955538d6e480e56a8..878f0656112891c86e13a9e9a5f8b12c18441b92 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -24,6 +24,7 @@ APPLICATION :
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
         SALOME_ACTOR_DELEGATE_TO_VTK : '1'
+        SALOME_GMSH_HEADERS_STD : '1'
     }
     products :
     {

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 5c8715493cb4555530ffeaea0a5bb22163ec1464..f632e82f364749a337c9b4ccf60d342ef03be44d 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -24,6 +24,7 @@ APPLICATION :
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
         SALOME_ACTOR_DELEGATE_TO_VTK : '1'
+        SALOME_GMSH_HEADERS_STD : '1'
     }
     products :
     {
@@ -245,12 +246,12 @@ __overwrite__ :
         'APPLICATION.products.Sphinx'    : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip'            }
     }
     {
-        # FD 34 qt5 package is qt5-qtbase-devel.
         __condition__ : "VARS.dist in ['FD34']"
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.omniORB'  : '4.2.4'
         'APPLICATION.products.omniORBpy': '4.2.4'
-        'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }
-        'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
+        'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'             }
+        'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'           }
+        'APPLICATION.products.gdal'     : {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD34'             } # spns #29324
     }
 ]

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 3aef13ce1288d02e67bb04c748a6515ba4098b4e..a4c06f740b8ac0300601e30078589337d06c813c 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -19,6 +19,7 @@ APPLICATION :
            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
            SALOME_USE_64BIT_IDS : '1'
            VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
+           SALOME_GMSH_HEADERS_STD : '1'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger

diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh
index a56533082dd409d06bcbab8b7b9118c713d91d18..643db4135f1cffae1ff482b49d1344a5d44a93cf 100755 (executable)
--- a/products/compil_scripts/ParaView-5.9.0.sh
+++ b/products/compil_scripts/ParaView-5.9.0.sh
@@ -12,8 +12,7 @@ CMAKE_OPTIONS=""
 ### common compiler and install settings
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
-if [ -n "$SAT_DEBUG" ]
-then
+if [ -n "$SAT_DEBUG" ]; then
     CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Debug"
 else
     CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
@@ -30,19 +29,16 @@ CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 ### OpenGL settings
 CMAKE_OPTIONS+=" -DOpenGL_GL_PREFERENCE:STRING=LEGACY"
 CMAKE_OPTIONS+=" -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON"
-if [ $VERSION == "V9_7_0" ] || [ $VERSION == "V9_8_0" ]; then
-    echo "INFO: skipping CATALYST..."
-else
-    echo "INFO: setting CATALYST"
-    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
-    CMAKE_OPTIONS+=" -DPARAVIEW_AUTOLOAD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
-    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_CATALYST_ADAPTORS=ON"
-    CMAKE_OPTIONS+=" -DUSE_CATALYST:BOOL=ON"
-    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST=ON"
-fi
+
+echo "INFO: setting CATALYST"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_AUTOLOAD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_CATALYST_ADAPTORS=ON"
+CMAKE_OPTIONS+=" -DUSE_CATALYST:BOOL=ON"
+CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST=ON"
+
 ### spns #20550 - Headless mode
-if [ -n "$PARAVIEW_HEADLESS_MODE" ]
-then
+if [ -n "$PARAVIEW_HEADLESS_MODE" ]; then
     EGL_FOUND=false
     LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
     case $LINUX_DISTRIBUTION in
@@ -65,8 +61,7 @@ then
 fi
 
 ### Ray-tracing settings
-if [ -n "$OSPRAY_ROOT_DIR" ]
-then
+if [ -n "$OSPRAY_ROOT_DIR" ]; then
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_RAYTRACING:BOOL=ON"
     CMAKE_OPTIONS+=" -DVTK_ENABLE_OSPRAY:BOOL=ON"
     CMAKE_OPTIONS+=" -Dospray_DIR:PATH=${OSPRAY_ROOT_DIR}/lib/cmake/ospray-${OSPRAY_VERSION}"
@@ -246,12 +241,24 @@ fi
 # GDAL see bos #26944
 if [ -n "$GDAL_ROOT_DIR" ]; then
     echo "INFO: switching ON GDAL"
-    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_GDAL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_GDAL:BOOL=ON"
     if [ "$GDAL_ROOT_DIR" != "/usr" ]; then
         CMAKE_OPTIONS+=" -DGDAL_ROOT_DIR=$GDAL_ROOT_DIR"
        CMAKE_OPTIONS+=" -DGDAL_LIBRARY=$GDAL_ROOT_DIR/lib/libgdal.so"
        CMAKE_OPTIONS+=" -DGDAL_INCLUDE_DIR=$GDAL_ROOT_DIR/include"
     fi
+    CMAKE_OPTIONS+=" -DPARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=ON"
+    CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_GeographicalMap:BOOL=ON"
+fi
+
+# NETCDF see bos #26944
+if [ -n "$NETCDF_ROOT_DIR" ]; then
+    echo "INFO: switching ON NETCDF"
+    CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON"
+    if [ "NETCDF_ROOT_DIR" != "/usr" ]; then
+        CMAKE_OPTIONS+=" -DNETCDF_ROOT_DIR=$NETCDF_ROOT_DIR"
+    fi
+    CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersParallelGeometry=YES"
 fi
 
 echo

diff --git a/products/compil_scripts/gmsh-4.8.4.sh b/products/compil_scripts/gmsh-4.8.4.sh
index 5916f93a7b3b74c6430f3ea28ab89a9b097b3a73..0bed6cb9d409002eac47430b06864a39bd393771 100755 (executable)
--- a/products/compil_scripts/gmsh-4.8.4.sh
+++ b/products/compil_scripts/gmsh-4.8.4.sh
@@ -60,7 +60,9 @@ then
 fi
 
 echo
-if [ $VERSION == "V9_8_0" ]; then
+if [ -n "$SALOME_GMSH_HEADERS_STD" ]; then
+    echo "Using standard directory structure"
+else
     echo "*** copy all .h in sources to install"
     cp -f --backup=numbered `find $SOURCE_DIR -name "*.h"` $PRODUCT_INSTALL/include/ && \
         mv $PRODUCT_INSTALL/include/gmsh/* $PRODUCT_INSTALL/include/ && \
@@ -72,7 +74,6 @@ if [ $VERSION == "V9_8_0" ]; then
     fi
 fi
 
-
 echo
 echo "########## END"
 

diff --git a/products/gdal.pyconf b/products/gdal.pyconf
index 5688bb4f46f996040b00afdb7f494984e6d7d899..1383ac8eca31d2c654a62ea58b39f6cfe73b0836 100644 (file)
--- a/products/gdal.pyconf
+++ b/products/gdal.pyconf
@@ -4,10 +4,6 @@ default :
     build_source : "script"
     compil_script :  $name + $VARS.scriptExtension
     get_source : "archive"
-    archive_info :
-    {
-       archive_name : "gdal-" + $APPLICATION.products.gdal + ".tar.gz"
-    }
     environ :
     {
        env_script : $name + ".py"
@@ -40,3 +36,9 @@ version_2_4_0:
 {
     compil_script :  'gdal-2.4.0' + $VARS.scriptExtension
 }
+
+version_2_4_0_FD34:
+{
+    compil_script :  'gdal-2.4.0.sh'
+    patches : ["gdal.0001-r2000.patch"]
+}

diff --git a/products/patches/gdal.0001-r2000.patch b/products/patches/gdal.0001-r2000.patch
new file mode 100644 (file)
index 0000000..4808a72
--- /dev/null
+++ b/products/patches/gdal.0001-r2000.patch
@@ -0,0 +1,12 @@
+diff -Naur gdal_ref/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal_new/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+--- gdal_ref/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2022-01-10 21:48:58.000000000 +0100
++++ gdal_new/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2022-03-15 12:09:23.888534108 +0100
+@@ -38,7 +38,7 @@
+ #include <iostream>
+ #include <memory>
+ #include <string>
+-
++#include <limits>
+ #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
+ // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
+ #include <sstream>