From e5e2a18ef24504d943250dcbdf4778bb544604e7 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 11 Apr 2022 17:20:39 +0200
Subject: [PATCH] embed mesa 19.0.8 in archive

---
 applications/SALOME-9.6.0-MPI.pyconf     | 2 +-
 applications/SALOME-9.6.0.pyconf         | 2 +-
 applications/SALOME-9.8.0-native.pyconf  | 2 +-
 applications/SALOME-master-native.pyconf | 4 ++--
 applications/SALOME-master.pyconf        | 2 +-
 products/ParaView.pyconf                 | 2 +-
 products/gdal.pyconf                     | 2 +-
 products/mesa.pyconf                     | 6 ++++++
 products/qt.pyconf                       | 2 +-
 9 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/applications/SALOME-9.6.0-MPI.pyconf b/applications/SALOME-9.6.0-MPI.pyconf
index 9262173..e052ab8 100644
--- a/applications/SALOME-9.6.0-MPI.pyconf
+++ b/applications/SALOME-9.6.0-MPI.pyconf
@@ -177,6 +177,6 @@ __overwrite__ :
   {
     #
     __condition__ : "VARS.dist in ['UB20.04']"
-      'APPLICATION.products.qt'    : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_0_4'}
+      'APPLICATION.products.qt'    : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_04'}
   }
 ]
diff --git a/applications/SALOME-9.6.0.pyconf b/applications/SALOME-9.6.0.pyconf
index 7164315..bebe629 100644
--- a/applications/SALOME-9.6.0.pyconf
+++ b/applications/SALOME-9.6.0.pyconf
@@ -225,7 +225,7 @@ __overwrite__ :
 
   {
     __condition__ : "VARS.dist in ['UB20.04']"
-    'APPLICATION.products.qt'       : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_0_4' }
+    'APPLICATION.products.qt'       : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_04' }
   }
 
 ]
diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index dedd843..3d4a4c8 100644
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -197,7 +197,7 @@ __overwrite__ :
         'APPLICATION.products.opencv'  : '3.2.0'
         'APPLICATION.products.cminpack': 'native'
         'APPLICATION.products.PyFMI'    : {tag: '2.5',   base: 'no', section: 'version_2_5_no_pip'                }
-        'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_0_4'}
+        'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB20_04'             }
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 3d91d89..2b773c7 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -77,7 +77,7 @@ APPLICATION :
         markupsafe : 'native'
         matplotlib : 'native'
         medfile : '4.1.1'
-        mesa : 'native'
+        mesa : {tag : '19.0.8', base: 'no', section: 'version_19_0_8_x86_64'}
         MeshGems : '2.14-4'
         metis : 'native'
         mpi4py: 'native'
@@ -200,7 +200,7 @@ APPLICATION :
     }
     properties :
     {
-        mesa_launcher_in_package : "no"
+        mesa_launcher_in_package : "yes"
         repo_dev : "yes"
         pip : 'yes'
         pip_install_dir : 'python'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index d062eb1..1a5635a 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -236,7 +236,7 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['UB20.04']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
-        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_0_4'} # spns #29324
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324
     }
 
     {
diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index c696870..101c11e 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -261,7 +261,7 @@ version_5_9_0_FD32 :
               ]
 }
 
-version_5_9_0_UB20_0_4 :
+version_5_9_0_UB20_04 :
 {
     compil_script :  'ParaView-5.9.0.sh'
     archive_info : {archive_name : "ParaView-5.9.0-lata.tar.gz"}
diff --git a/products/gdal.pyconf b/products/gdal.pyconf
index 628ea0e..a04959f 100644
--- a/products/gdal.pyconf
+++ b/products/gdal.pyconf
@@ -65,7 +65,7 @@ version_2_4_0_DB10:
               ]
 }
 
-version_2_4_0_UB20_0_4:
+version_2_4_0_UB20_04:
 {
     compil_script :  'gdal-2.4.0.sh'
     patches : ["gdal.0001-r2000.patch",
diff --git a/products/mesa.pyconf b/products/mesa.pyconf
index 5f76a9d..ed7bf5b 100644
--- a/products/mesa.pyconf
+++ b/products/mesa.pyconf
@@ -43,3 +43,9 @@ version_19_0_8_win:
 {
   patches: []
 }
+
+version_19_0_8_x86_64:
+{
+  compil_script: 'mesa-19.0.8-x86_64.sh'
+  archive_info : {archive_name : "mesa-19.0.8-x86_64-" + $VARS.dist + ".tar.gz"}
+}
diff --git a/products/qt.pyconf b/products/qt.pyconf
index 7b44107..dccf7f2 100644
--- a/products/qt.pyconf
+++ b/products/qt.pyconf
@@ -65,7 +65,7 @@ version_5_9_1_FD32 :
 	    ]
 }
 
-version_5_9_1_UB20_0_4 :
+version_5_9_1_UB20_04 :
 {
   compil_script :  "qt-5.9.1.sh"
   patches : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch',
-- 
2.30.2