From a1090c867d66326e2316fdeae68bb58bbe6a1feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Wed, 24 Jan 2024 16:54:52 +0100 Subject: [PATCH] Wayland: Fix compilation on FreeBSD The list of compile-time dependencies on FreeBSD lacked evdev-proto. Unlike on Linux, the input-event-codes.h header file was not implicitly included on FreeBSD. Fixes #2445 This was adapted to 3.3-stable from 51920ede6827962ca2fbcad38d1beed1165400af. --- CONTRIBUTORS.md | 1 + README.md | 1 + docs/compile.dox | 6 +++--- src/wl_window.c | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 367ab358..9ba21abd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -233,6 +233,7 @@ video tutorials. - Paul Sultana - Nathan Sweet - TTK-Bandit + - Nuno Teixeira - Sergey Tikhomirov - Arthur Tombs - TronicLabs diff --git a/README.md b/README.md index 092445f6..e1f3d476 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,7 @@ information on what to include when reporting a bug. - Bugfix: `glfwGetKeyName` emitted `GLFW_INVALID_VALUE` for scancodes with no key token (#1785,#2214) - [Wayland] Bugfix: Terminating the library before showing a window could segfault + - [Wayland] Bugfix: Compilation failed on FreeBSD (#2445) - [Linux] Bugfix: `regfree´ was called on invalid data (#2464) diff --git a/docs/compile.dox b/docs/compile.dox index 99d5a68e..9bcf14c3 100644 --- a/docs/compile.dox +++ b/docs/compile.dox @@ -97,11 +97,11 @@ On Fedora and derivatives like Red Hat you will need the `wayland-devel`, sudo dnf install wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules @endcode -On FreeBSD you will need the `wayland`, `libxkbcommon`, `wayland-protocols` and -`kf5-extra-cmake-modules` packages. +On FreeBSD you will need the `wayland`, `libxkbcommon`, `wayland-protocols`, +`evdev-proto` and `kf5-extra-cmake-modules` packages. @code{.sh} -pkg install wayland libxkbcommon wayland-protocols kf5-extra-cmake-modules +pkg install wayland libxkbcommon wayland-protocols evdev-proto kf5-extra-cmake-modules @endcode Once you have the required depdendencies, move on to @ref compile_generate. diff --git a/src/wl_window.c b/src/wl_window.c index 4e51e186..caa5188d 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -42,6 +42,7 @@ #include #include #include +#include #define GLFW_BORDER_SIZE 4 #define GLFW_CAPTION_HEIGHT 24