Mesa: upgraded to version 19.3.2 (closes #2281).

opencor · Jan 16, 2020 · 391bbc7 · 391bbc7
2 parents 6e30e6f + d638b6f
commit 391bbc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -38,7 +38,7 @@ var jsonData = { "versions": [
                      ],
                      "changes": [
                        { "change": "<strong>Simulation Experiment view:</strong> can now customise the font size of the different bits of text in a graph panel (see issue <a href=\"https://github.com/opencor/opencor/issues/2271\">#2271</a>). Fixed a small GUI glitch on macOS (see issue <a href=\"https://github.com/opencor/opencor/issues/2277\">#2277</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 9.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2269\">#2269</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.1.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2272\">#2272</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.28.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2280\">#2280</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 9.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2269\">#2269</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.1.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2272\">#2272</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.28.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2280\">#2280</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 19.3.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/2281\">#2281</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/src/3rdparty/linux/mesa/CMakeLists.txt b/src/3rdparty/linux/mesa/CMakeLists.txt
@@ -3,11 +3,11 @@ project(Mesa)
 # Name and version of our package
 
 set(PACKAGE_NAME Mesa)
-set(PACKAGE_VERSION 19.2.6)
+set(PACKAGE_VERSION 19.3.2)
 
 # Git tag for our library
 
-set(GIT_TAG v19.2.6)
+set(GIT_TAG v19.3.2)
 
 # Specify where our local package will be installed
 
@@ -30,9 +30,9 @@ if(USE_PREBUILT_MESA_PACKAGE)
     # Retrieve the library's package
 
     retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                          ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 0943cd1413a302c943d6e613f44775ca216e8374
+                          ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 5404f50c9077550c07eda77e0485531d16976990
                           SHA1_FILES ${SHA1_FILES}
-                          SHA1_VALUES 6d8f2e89ef80e7f0f3fc4307e3b286a212664dd7)
+                          SHA1_VALUES 6557a462bc6f1d8d94dcd8ff6b67ea7a1ccafe58)
 else()
     # Build Mesa as an external project
 
@@ -55,7 +55,7 @@ else()
         CONFIGURE_COMMAND
             ""
         BUILD_COMMAND
-            scons build=release libgl-xlib
+            scons force_scons=1 build=release libgl-xlib
         INSTALL_COMMAND
             cp ${PACKAGE_BUILD_DIR}/build/linux-x86_64/gallium/targets/libgl-xlib/${SHARED_LIBRARY} <INSTALL_DIR>/lib
         BUILD_BYPRODUCTS