From 67e914c73188ed5c951422d5fc0d7b980859c567 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 2 Sep 2019 13:52:29 +1200 Subject: [PATCH 1/5] Mesa: upgraded to version 19.1.5 (#2149). --- distrib/linux/mesa/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distrib/linux/mesa/CMakeLists.txt b/distrib/linux/mesa/CMakeLists.txt index 81420730d8..460ce6b22b 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.1) +set(PACKAGE_VERSION 19.1.5) # Git tag for our library -set(GIT_TAG v19.1.1) +set(GIT_TAG v19.1.5) # Specify where our local package will be installed From 45060622b2df46b35bffb11a46d7e22055ade35c Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 2 Sep 2019 13:53:27 +1200 Subject: [PATCH 2/5] Only build the Mesa library. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28de6e4a45..159f7e39f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ option(ENABLE_TESTS "Enable the tests to be built" OFF) if(NOT WIN32 AND NOT APPLE) option(USE_PREBUILT_ICU_PACKAGE "Use the pre-built version of the ICU package" ON) option(USE_PREBUILT_MESA_PACKAGE "Use the pre-built version of the Mesa package" ON) + set(USE_PREBUILT_MESA_PACKAGE OFF) endif() option(USE_PREBUILT_QTWEBKIT_PACKAGE "Use the pre-built version of the QtWebKit package" ON) @@ -926,6 +927,7 @@ set(PLUGINS widget/QScintillaWidget widget/WebViewerWidget ) +set(PLUGINS) if(ENABLE_TEST_PLUGINS) list(APPEND PLUGINS From 1492ca57b176a1664463cc08c8a7ac4a8d10835a Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 2 Sep 2019 13:57:22 +1200 Subject: [PATCH 3/5] Revert "Only build the Mesa library." This reverts commit 45060622b2df46b35bffb11a46d7e22055ade35c. --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 159f7e39f6..28de6e4a45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,6 @@ option(ENABLE_TESTS "Enable the tests to be built" OFF) if(NOT WIN32 AND NOT APPLE) option(USE_PREBUILT_ICU_PACKAGE "Use the pre-built version of the ICU package" ON) option(USE_PREBUILT_MESA_PACKAGE "Use the pre-built version of the Mesa package" ON) - set(USE_PREBUILT_MESA_PACKAGE OFF) endif() option(USE_PREBUILT_QTWEBKIT_PACKAGE "Use the pre-built version of the QtWebKit package" ON) @@ -927,7 +926,6 @@ set(PLUGINS widget/QScintillaWidget widget/WebViewerWidget ) -set(PLUGINS) if(ENABLE_TEST_PLUGINS) list(APPEND PLUGINS From 1dbc5bc82b451854061a420a7fd7e4acb8edd2de Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 2 Sep 2019 13:57:52 +1200 Subject: [PATCH 4/5] Mesa: binary for version 19.1.5 (#2149). --- distrib/linux/mesa/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distrib/linux/mesa/CMakeLists.txt b/distrib/linux/mesa/CMakeLists.txt index 460ce6b22b..c88d905223 100644 --- a/distrib/linux/mesa/CMakeLists.txt +++ b/distrib/linux/mesa/CMakeLists.txt @@ -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} 153dd68b58bcfa23c8491ff474260fb80df2b34e + ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 9e4065df67863fd08d7b3285db22d7c59c50eb8e SHA1_FILES ${SHA1_FILES} - SHA1_VALUES ef179cae56b75e100cff778f1020cae9d67c8bd7) + SHA1_VALUES dd9385da7685f84853a97207275cda816f0d2fc0) else() # Build Mesa as an external project From c158c9de75390b79ac34f05a298346ab9d3ce15a Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 2 Sep 2019 14:02:10 +1200 Subject: [PATCH 5/5] Slight updates to our downloads pages (#2149). --- doc/downloads/index.js | 4 +--- doc/downloads/previousSnapshots.js | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/downloads/index.js b/doc/downloads/index.js index b26e250011..5d1674c436 100644 --- a/doc/downloads/index.js +++ b/doc/downloads/index.js @@ -37,9 +37,7 @@ var jsonData = { "versions": [ } ], "changes": [ - { "change": "General: make sure that we have a view before trying to import a file using OpenCOR's URI scheme (see issue #2140)." }, - { "change": "Simulation support: improved the accuracy of algebraic variables that depend on the value of some state variables (see issue #2139)." }, - { "change": "Third-party libraries: upgraded the OpenSSL library to version 1.1.1c (see issue #1801)." } + { "change": "Third-party libraries: upgraded Mesa to version 19.1.5 (see issue #2149)." } ] }, { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1, diff --git a/doc/downloads/previousSnapshots.js b/doc/downloads/previousSnapshots.js index f8876c3cc3..a2b42fb46e 100644 --- a/doc/downloads/previousSnapshots.js +++ b/doc/downloads/previousSnapshots.js @@ -1,4 +1,28 @@ var jsonData = { "versions": [ + { "major": 0, "minor": 0, "patch": 0, "day": 19, "month": 7, "year": 2019, "type": 2, "license": 2, + "platforms": [ + { "name": "Windows", "supported": "Windows 7 and later", + "files": [ + { "extension": ".exe" }, { "extension": ".zip" } + ] + }, + { "name": "Linux", "supported": "Ubuntu 18.04 LTS (Bionic Beaver) and later", + "files": [ + { "extension": ".tar.gz" } + ] + }, + { "name": "macOS", "supported": "macOS 10.12 (Sierra) and later", + "files": [ + { "extension": ".dmg" }, { "extension": ".zip" } + ] + } + ], + "changes": [ + { "change": "General: make sure that we have a view before trying to import a file using OpenCOR's URI scheme (see issue #2140)." }, + { "change": "Simulation support: improved the accuracy of algebraic variables that depend on the value of some state variables (see issue #2139)." }, + { "change": "Third-party libraries: upgraded the OpenSSL library to version 1.1.1c (see issue #1801)." } + ] + }, { "major": 0, "minor": 0, "patch": 0, "day": 27, "month": 6, "year": 2019, "type": 2, "license": 2, "platforms": [ { "name": "Windows", "supported": "Windows 7 and later",