From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 7 Jan 2022 12:15:32 +0000 (+0100)
Subject: spns #26832: Debian 11
X-Git-Tag: V9_9_0~242
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b56c06471822e822dc12c954ed0c86d21c838402;p=tools%2Fsat_salome.git

spns #26832: Debian 11
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 14e29dc..8beefee 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -195,7 +195,7 @@ __overwrite__ :
         # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
         # deeper investigations need to be done in its sources. Use embedded openCV product where
         # native one is 4.X.
-        __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34']"
+        __condition__ : "VARS.dist in ['FD32', 'UB20.04', 'FD34', 'DB11']"
         'APPLICATION.products.opencv' : '3.2.0'
     }
     {
@@ -212,6 +212,10 @@ __overwrite__ :
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB10'}
     }
+    {
+        __condition__ : "VARS.dist in ['DB11']"
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_DB11'}
+    }
     {
         # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
         # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
@@ -233,7 +237,7 @@ __overwrite__ :
         'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
     }
     {
-        __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
+        __condition__ : "VARS.dist in ['DB10', 'DB11', 'UB20.04']"
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'    : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'}
     }
diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index e24d8e3..8318e09 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -273,6 +273,24 @@ version_5_9_0_DB10 :
               ]
 }
 
+version_5_9_0_DB11 :
+{
+    compil_script :  'ParaView-5.9.0.sh'
+    archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"}
+    # two other LATA patches already included in archive
+    patches : ['paraview.0003-ParaViewClient.patch',
+               'paraview.0005-ParaView_find_cgns.patch',
+               'paraview-5.9_qt-minimum-version.patch',
+               'paraview.0003-ParaViewClient_native.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
+               'paraview.0008-ParaView_coincident_rendering.patch',
+               'paraview.0017-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
+               'paraview.0018-spns-26351-autoconvert.patch',
+               'paraview.0019-spns-26344-VTK-OpenMP.patch'
+              ]
+}
+
 version_5_8_0 :
 {
     compil_script :  'ParaView-5.8.0.sh'
diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index fbbf15f..5348332 100644
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -22,7 +22,7 @@ default :
                    "libXpm-devel", "libXft-devel", "sqlite-devel"]
         apt : ["libbsd0", "libbz2-1.0", "libc6", "libdc1394-22", "libdrm2", "libegl1", "libexif12", "libexpat1",
                "libfftw3-double3", "libfontconfig1", "libgl1", "libglu1-mesa", "libgomp1", "libgphoto2-6", "libice6",
-               "libjbig0", "libjsoncpp1", "libltdl7", "liblzma5", "libncurses5", "libnuma1", "libpcre3", "libquadmath0",
+               "libjbig0", "libltdl7", "liblzma5", "libncurses5", "libnuma1", "libpcre3", "libquadmath0",
                "libraw1394-11", "libsm6", "libstdc++6", "libtiff5", "libudev1", "libusb-1.0-0", "libuuid1", "libx11-6",
                "libx11-xcb1", "libxau6", "libxcb1", "libxcb-glx0", "libxcb-xfixes0", "libxcb-xkb1", "libxdmcp6",
                "libxext6", "libxft2", "libxi6", "libxkbcommon0", "libxkbcommon-x11-0", "libxmu6", "libxpm4", "libxrender1",
@@ -61,18 +61,26 @@ default :
         "DB08" :
         {
             apt : ["libopenexr6", "libwebp5", "libgfortran3", "libilmbase6", "libevent-2.0-5", "libpng12-0", "libgcc-4.9-dev",
-                   "libffi6", "libtinfo5", "libgphoto2-port10"]
+                   "libffi6", "libtinfo5", "libgphoto2-port10", "libjsoncpp1"]
         }
         "DB09" :
         {
             apt : ["libopenexr22", "libwebp6", "libgfortran3", "libilmbase12", "libevent-2.0-5", "libpng16-16", "libgcc-6-dev",
-                   "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0"]
+                   "libffi6", "libtinfo5", "libgphoto2-port12", "libglx0", "libopengl0", "libjsoncpp1"]
             apt_dev : ["libtbb-dev"]
         }
         "DB10" :
         {
             apt : ["libopenexr23", "libwebp6", "libgfortran5", "libilmbase23", "libevent-2.1-6", "libpng16-16", "libgcc-8-dev",
-                   "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0"]
+                   "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp1"]
+            apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
+                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
+
+        }
+        "DB11" :
+        {
+            apt : ["libopenexr25", "libwebp6", "libgfortran5", "libilmbase25", "libevent-2.1-7", "libpng16-16", "libgcc-10-dev",
+                   "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp24"]
             apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
                        "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]