Pārlūkot izejas kodu

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.
Camilla Löwy 1 gadu atpakaļ
vecāks
revīzija
a1090c867d
4 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 1 0
      CONTRIBUTORS.md
  2. 1 0
      README.md
  3. 3 3
      docs/compile.dox
  4. 1 0
      src/wl_window.c

+ 1 - 0
CONTRIBUTORS.md

@@ -233,6 +233,7 @@ video tutorials.
  - Paul Sultana
  - Paul Sultana
  - Nathan Sweet
  - Nathan Sweet
  - TTK-Bandit
  - TTK-Bandit
+ - Nuno Teixeira
  - Sergey Tikhomirov
  - Sergey Tikhomirov
  - Arthur Tombs
  - Arthur Tombs
  - TronicLabs
  - TronicLabs

+ 1 - 0
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
  - Bugfix: `glfwGetKeyName` emitted `GLFW_INVALID_VALUE` for scancodes with no
    key token (#1785,#2214)
    key token (#1785,#2214)
  - [Wayland] Bugfix: Terminating the library before showing a window could segfault
  - [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)
  - [Linux] Bugfix: `regfree´ was called on invalid data (#2464)
 
 
 
 

+ 3 - 3
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
 sudo dnf install wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules
 @endcode
 @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}
 @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
 @endcode
 
 
 Once you have the required depdendencies, move on to @ref compile_generate.
 Once you have the required depdendencies, move on to @ref compile_generate.

+ 1 - 0
src/wl_window.c

@@ -42,6 +42,7 @@
 #include <poll.h>
 #include <poll.h>
 #include <signal.h>
 #include <signal.h>
 #include <time.h>
 #include <time.h>
+#include <linux/input-event-codes.h>
 
 
 #define GLFW_BORDER_SIZE    4
 #define GLFW_BORDER_SIZE    4
 #define GLFW_CAPTION_HEIGHT 24
 #define GLFW_CAPTION_HEIGHT 24