use local patch

4 files changed, 63 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30527e432521..7a93d007a21b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vulkan-caps-viewer-wayland
 	pkgdesc = Vulkan Hardware Capability Viewer
 	pkgver = 3.27
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://vulkan.gpuinfo.org
 	arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = vulkan-caps-viewer-wayland
 	conflicts = vulkan-caps-viewer
 	source = git+https://github.com/SaschaWillems/VulkanCapsViewer.git#commit=0f9fd085cf82c46f8391a5ec5b4986e35c8ded3b
 	source = git+https://github.com/KhronosGroup/Vulkan-Headers.git
-	source = https://github.com/SaschaWillems/VulkanCapsViewer/pull/155.patch
+	source = 155.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = cd6a775c44cacc8549346cb31696822646806f51655a36cf834ef9029d201976
diff --git a/.gitignore b/.gitignore
index 4dab8d6386e3..b5a25924b37c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
+!155.patch
diff --git a/155.patch b/155.patch
new file mode 100644
index 000000000000..6cc4f7e23509
--- /dev/null
+++ b/155.patch
@@ -0,0 +1,58 @@
+From 30be68d825e462e93797ff6d0c55dcd5ad1d7a72 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Mon, 21 Nov 2022 18:42:47 +0100
+Subject: [PATCH 1/2] Fix Wayland build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following build error:
+
+    vulkancapsviewer.cpp: In member function ‘bool VulkanCapsViewer::initVulkan()’:
+    vulkancapsviewer.cpp:765:41: error: ‘wl_display_connect’ was not declared in this scope
+      765 |             surfaceCreateInfo.display = wl_display_connect(NULL);
+          |                                         ^~~~~~~~~~~~~~~~~~
+---
+ vulkancapsviewer.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/vulkancapsviewer.cpp b/vulkancapsviewer.cpp
+index 711b4d3..d8721a9 100644
+--- a/vulkancapsviewer.cpp
++++ b/vulkancapsviewer.cpp
+@@ -60,6 +60,10 @@
+ #include <QX11Info>

+ #endif

+ 

++#ifdef VK_USE_PLATFORM_WAYLAND_KHR

++#include <wayland-client.h>

++#endif

++

+ #ifdef VK_USE_PLATFORM_ANDROID_KHR

+ #include <QtAndroid>

+ #include <QAndroidJniEnvironment>

+
+From 83c234df361f474b704ed740c410f035b33f63a6 Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Mon, 21 Nov 2022 18:41:32 +0100
+Subject: [PATCH 2/2] Fix Wayland build in CI
+
+Wayland wasn't actually enabled: the .pro file checks for uppercase
+"WAYLAND", not lowercase "wayland".
+---
+ .github/workflows/build.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
+index 56da754..de0f909 100644
+--- a/.github/workflows/build.yml
++++ b/.github/workflows/build.yml
+@@ -72,7 +72,7 @@ jobs:
+           echo ${TARGET_PLATFORM}
+           PATH="/opt/qt512/bin:$PATH"
+           CXX="clang++"
+-          qmake DEFINES+=wayland CONFIG+=release PREFIX=/usr
++          qmake DEFINES+=WAYLAND CONFIG+=release PREFIX=/usr
+           make INSTALL_ROOT=appdir install ; find appdir/
+           wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+           chmod a+x linuxdeployqt-continuous-x86_64.AppImage
diff --git a/PKGBUILD b/PKGBUILD
index 41b3ca4968aa..908cb1fbec6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Eric Engestrom <aur [at] engestrom [dot] ch>
 pkgname=vulkan-caps-viewer-wayland
 pkgver=3.27
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Vulkan Hardware Capability Viewer"
 arch=('x86_64' 'aarch64')
@@ -15,7 +15,7 @@ conflicts=("${pkgname%-*}")
 _commit=0f9fd085cf82c46f8391a5ec5b4986e35c8ded3b  # tags/3.27^0
 source=("git+https://github.com/SaschaWillems/VulkanCapsViewer.git#commit=$_commit"
         'git+https://github.com/KhronosGroup/Vulkan-Headers.git'
-        'https://github.com/SaschaWillems/VulkanCapsViewer/pull/155.patch')
+        '155.patch')
 sha256sums=('SKIP'
             'SKIP'
             'cd6a775c44cacc8549346cb31696822646806f51655a36cf834ef9029d201976')