Merge pull request #340 from dpaulat/feature/dependency-bump-2024-01

Dependency bump 2024-01

.github/workflows/clang-tidy-comments.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
 
     steps:
       - name: Post Comments

conanfile.py

@@ -12,16 +12,16 @@ class SupercellWxConan(ConanFile):
                   "geographiclib/2.4",
                   "geos/3.13.0",
                   "glew/2.2.0",
-                  "glm/cci.20230113",
+                  "glm/1.0.1",
                   "gtest/1.15.0",
                   "libcurl/8.11.1",
                   "libpng/1.6.45",
-                  "libxml2/2.12.7",
+                  "libxml2/2.13.4",
                   "openssl/3.3.2",
                   "re2/20240702",
                   "spdlog/1.15.0",
-                  "sqlite3/3.47.1",
+                  "sqlite3/3.47.2",
-                  "vulkan-loader/1.3.243.0",
+                  "vulkan-loader/1.3.290.0",
                   "zlib/1.3.1")
     generators = ("CMakeDeps")
     default_options = {"geos/*:shared"     : True,

external/aws-sdk-cpp

@@ -1 +1 @@
-Subproject commit c95e71a9d23bba0c2f6c6a7bc37ae63b7351e8b7
+Subproject commit 8e41fd058ce06a3f7b67d657a7f644f7a38af509

external/maplibre-native

@@ -1 +1 @@
-Subproject commit 3d4ca3fdf07c50db3002b11bff93c81ec380e493
+Subproject commit a77cb6b2d1cde3a5f2c147e25245aa019aacb74b

external/maplibre-native-qt

@@ -1 +1 @@
-Subproject commit 805ccf6204a546e43fed599631ad5d698f68ae86
+Subproject commit 3939a82ab9c2ff8bc2746e58ab9727cd12caef2c

external/stb

@@ -1 +1 @@
-Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7
+Subproject commit 5c205738c191bcb0abc65c4febfa9bd25ff35234

scwx-qt/source/scwx/qt/map/map_provider.cpp

@@ -149,6 +149,9 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
           {.name_ {"Landscape"},
            .url_ {"https://api.maptiler.com/maps/landscape/style.json"},
            .drawBelow_ {"Runway"}},
+          {.name_ {"Ocean"},
+           .url_ {"https://api.maptiler.com/maps/ocean/style.json"},
+           .drawBelow_ {"Landform labels"}},
           {.name_ {"Outdoor"},
            .url_ {"https://api.maptiler.com/maps/outdoor-v2/style.json"},
            .drawBelow_ {"aeroway_runway", "Aeroway"}},
@@ -167,6 +170,9 @@ static const std::unordered_map<MapProvider, MapProviderInfo> mapProviderInfo_ {
            .url_ {"https://api.maptiler.com/maps/ch-swisstopo-lbm-vivid/"
                   "style.json"},
            .drawBelow_ {"pattern_landcover_vineyard", "Vineyard pattern"}},
+          {.name_ {"Toner"},
+           .url_ {"https://api.maptiler.com/maps/toner-v2/style.json"},
+           .drawBelow_ {"Bridge"}},
           {.name_ {"Topo"},
            .url_ {"https://api.maptiler.com/maps/topo-v2/style.json"},
            .drawBelow_ {"aeroway_runway", "Runway"}},

scwx-qt/source/scwx/qt/map/map_widget.cpp

@@ -1573,7 +1573,7 @@ void MapWidget::paintGL()
 
    // Render QMapLibre Map
    p->map_->resize(size());
-   p->map_->setFramebufferObject(defaultFramebufferObject(),
+   p->map_->setOpenGLFramebufferObject(defaultFramebufferObject(),
                                        size() * pixelRatio());
    p->map_->render();