From bc7971565005d8ea5120065467dc9b5f9ee1fe33 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 7 Oct 2019 18:26:54 +1300 Subject: [PATCH 1/4] Mesa: upgraded to version 19.2.0 (#2180). --- distrib/linux/mesa/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/distrib/linux/mesa/CMakeLists.txt b/distrib/linux/mesa/CMakeLists.txt index c88d905223..25dc8ca0ba 100644 --- a/distrib/linux/mesa/CMakeLists.txt +++ b/distrib/linux/mesa/CMakeLists.txt @@ -3,11 +3,11 @@ project(Mesa) # Name and version of our package set(PACKAGE_NAME Mesa) -set(PACKAGE_VERSION 19.1.5) +set(PACKAGE_VERSION 19.2.0) # Git tag for our library -set(GIT_TAG v19.1.5) +set(GIT_TAG v19.2.0) # 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} 9e4065df67863fd08d7b3285db22d7c59c50eb8e + ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 269dcad57654e6b154d87e8cba2064a1a6113b37 SHA1_FILES ${SHA1_FILES} - SHA1_VALUES dd9385da7685f84853a97207275cda816f0d2fc0) + SHA1_VALUES 2af98eacbf638d97ae736ed83aa79e3d726a5e93) else() # Build Mesa as an external project From 1bdbb856645a392d078cf8171fe6f019f8c5ae83 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 7 Oct 2019 18:31:11 +1300 Subject: [PATCH 2/4] Slight update to our downloads page (#2180). --- doc/downloads/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/downloads/index.js b/doc/downloads/index.js index 7f41847f3d..8521d1a91d 100644 --- a/doc/downloads/index.js +++ b/doc/downloads/index.js @@ -39,7 +39,7 @@ var jsonData = { "versions": [ "changes": [ { "change": "SED-ML support: added support left and right triangle symbols (see issue #2173)." }, { "change": "Simulation Experiment view: properly handle the Graph Panel properties (see issue #2171). Make sure that curves are plotted with all of their original settings when reloading a SED-ML file (see issue #2176)." }, - { "change": "Third-party libraries: upgraded the OpenSSL library to version 1.1.1d (see issue #2157). Upgraded LLVM+Clang to version 9.0.0 (see issue #2161)." } + { "change": "Third-party libraries: upgraded the OpenSSL library to version 1.1.1d (see issue #2157). Upgraded LLVM+Clang to version 9.0.0 (see issue #2161). Upgraded Mesa to version 19.2.0 (see issue #2180)." } ] }, { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1, From 6cc039dd67f013fb628e7ce7afbf18520c6295e1 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 7 Oct 2019 18:39:24 +1300 Subject: [PATCH 3/4] Python: documentation builds require Python and its packages to be fully installed. --- cmake/common.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/common.cmake b/cmake/common.cmake index 44c27ff14c..d757973e60 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -138,6 +138,10 @@ macro(build_documentation DOCUMENTATION_NAME) ${PROJECT_BUILD_DIR}/doc/${DOCUMENTATION_NAME} ) + # Make our local target depend on having Python fully installed + + add_dependencies(${DOCUMENTATION_BUILD} ${PYTHON_DEPENDENCIES}) + # Make our local target depend on our project build target and make our # documentation build target depend on our local target From ac692d81505d27a87e51f113bf011f5bb2a6e4cd Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 7 Oct 2019 18:43:01 +1300 Subject: [PATCH 4/4] Revert "Python: documentation builds require Python and its packages to be fully installed." This reverts commit 6cc039dd67f013fb628e7ce7afbf18520c6295e1. --- cmake/common.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmake/common.cmake b/cmake/common.cmake index d757973e60..44c27ff14c 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -138,10 +138,6 @@ macro(build_documentation DOCUMENTATION_NAME) ${PROJECT_BUILD_DIR}/doc/${DOCUMENTATION_NAME} ) - # Make our local target depend on having Python fully installed - - add_dependencies(${DOCUMENTATION_BUILD} ${PYTHON_DEPENDENCIES}) - # Make our local target depend on our project build target and make our # documentation build target depend on our local target