From 271b1e91e2b3027488303717b3aef9cf45367e1e Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Mon, 13 Jan 2025 17:18:58 +0100
Subject: [PATCH] Update glfw submodule to latest (#1237)

* Update glfw submodule to latest

Old version was 3.3, released over two years ago
Fixes #1192

* Install libraries required by new GLFW version

* Fixing library names

* Fixing type

* Also add new GLFW required libs to v2 yml

* Also add new libraries to documentation ci step
Weird, but somehow required

* Update linux build docs with new libs required by updated GLFW

* Remove Wayland dependencies and conditionally build Antora

Wayland dependencies were removed from the workflows and build configurations to streamline the installation process. The Antora documentation build is now conditional, preventing unnecessary inclusion when VKB_GENERATE_ANTORA_SITE is not set. This improves build flexibility and reduces extraneous steps.

* Apply required changes to merged CI changes

* Trying to fix CI after merge (again)

* Trying to fix CI after merge (again and again)

---------

Co-authored-by: swinston <steve@holochip.com>
---
 .github/workflows/build.yml | 4 ++--
 .github/workflows/check.yml | 2 +-
 CMakeLists.txt              | 6 ++++--
 antora/CMakeLists.txt       | 1 -
 docs/build.adoc             | 2 +-
 third_party/glfw            | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 710c726b9..fbf129333 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
       - if: ${{ matrix.platform != 'windows' }}
         name: Configure and build
         run: |
-          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON
+          cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON -DGLFW_BUILD_WAYLAND=OFF
           cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
 
   build_v2:
@@ -76,7 +76,7 @@ jobs:
           sudo apt install xorg-dev libglu1-mesa-dev
 
       - name: Configure
-        run: cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON
+        run: cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DGLFW_BUILD_WAYLAND=OFF
 
       - name: "Build Components ${{ matrix.platform }} in ${{ matrix.build_type }}"
         run: cmake --build "build/${{ matrix.platform }}" --target vkb__components --config ${{ matrix.build_type }} ${{ env.PARALLEL }}
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c6f07435c..02fae70b5 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -99,7 +99,7 @@ jobs:
         with:
           submodules: "recursive"
       - run: git config --global --add safe.directory /__w/Vulkan-Samples/Vulkan-Samples
-      - run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -Bbuild/clang
+      - run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DGLFW_BUILD_WAYLAND=OFF -Bbuild/clang
       - run: |
           /usr/bin/run-clang-tidy -j $(($(nproc)/2+1)) -p build/clang -header-filter=framework,samples,app -checks=-*,google-*,-google-runtime-references -quiet ${{ needs.changed-files.outputs.all }}
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 067e5804e..f5cf5a0b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,9 @@ cmake_minimum_required(VERSION 3.16)
 
 project(vulkan_samples)
 
+if(VKB_GENERATE_ANTORA_SITE)
+    add_subdirectory(antora)
+else ()
 # search for Vulkan SDK
 find_package(Vulkan)
 
@@ -104,5 +107,4 @@ endif()
 
 # Add vulkan app (runs all samples)
 add_subdirectory(app)
-
-add_subdirectory(antora)
+endif ()
\ No newline at end of file
diff --git a/antora/CMakeLists.txt b/antora/CMakeLists.txt
index e1441c1c1..8f88721a6 100644
--- a/antora/CMakeLists.txt
+++ b/antora/CMakeLists.txt
@@ -14,7 +14,6 @@ function(gatherAntoraAssets)
             samples
             scripts
             shaders
-            third_party
     )
     set(PAGES_DIR_SEARCH)
     set(IMAGES_DIR_SEARCH)
diff --git a/docs/build.adoc b/docs/build.adoc
index e1a090823..5e6d83810 100644
--- a/docs/build.adoc
+++ b/docs/build.adoc
@@ -226,7 +226,7 @@ build\windows\app\bin\Release\AMD64\vulkan_samples.exe
 * <<3d-models,3D models>>
 
 ----
-sudo apt-get install cmake g++ xorg-dev libglu1-mesa-dev
+sudo apt-get install cmake g++ xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
 ----
 
 === Build with CMake
diff --git a/third_party/glfw b/third_party/glfw
index 8f470597d..21fea0116 160000
--- a/third_party/glfw
+++ b/third_party/glfw
@@ -1 +1 @@
-Subproject commit 8f470597d625ae28758c16b4293dd42d63e8a83a
+Subproject commit 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50