From beaff2f5cb54cbad4ad072ff124553f08bc6444d Mon Sep 17 00:00:00 2001
From: Riteo <riteo@posteo.net>
Date: Mon, 23 Jan 2023 20:37:19 +0100
Subject: [PATCH] Move xkbcommon dynamic loading code into generic linuxbsd
 folder

Since Wayland uses it too, it only makes sense to have it in the parent
directory of both.
---
 platform/linuxbsd/SCsub                                     | 1 +
 platform/linuxbsd/x11/SCsub                                 | 1 -
 platform/linuxbsd/x11/display_server_x11.h                  | 3 ++-
 platform/linuxbsd/{x11/dynwrappers => }/xkbcommon-so_wrap.c | 0
 platform/linuxbsd/{x11/dynwrappers => }/xkbcommon-so_wrap.h | 0
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename platform/linuxbsd/{x11/dynwrappers => }/xkbcommon-so_wrap.c (100%)
 rename platform/linuxbsd/{x11/dynwrappers => }/xkbcommon-so_wrap.h (100%)

diff --git a/platform/linuxbsd/SCsub b/platform/linuxbsd/SCsub
index fcd739cdc97..3c5dc78c608 100644
--- a/platform/linuxbsd/SCsub
+++ b/platform/linuxbsd/SCsub
@@ -11,6 +11,7 @@ common_linuxbsd = [
     "joypad_linux.cpp",
     "freedesktop_portal_desktop.cpp",
     "freedesktop_screensaver.cpp",
+    "xkbcommon-so_wrap.c",
 ]
 
 if env["x11"]:
diff --git a/platform/linuxbsd/x11/SCsub b/platform/linuxbsd/x11/SCsub
index d869ce9ecc3..8b2e2aabe48 100644
--- a/platform/linuxbsd/x11/SCsub
+++ b/platform/linuxbsd/x11/SCsub
@@ -9,7 +9,6 @@ source_files = [
     "dynwrappers/xcursor-so_wrap.c",
     "dynwrappers/xinerama-so_wrap.c",
     "dynwrappers/xinput2-so_wrap.c",
-    "dynwrappers/xkbcommon-so_wrap.c",
     "dynwrappers/xrandr-so_wrap.c",
     "dynwrappers/xrender-so_wrap.c",
     "dynwrappers/xext-so_wrap.c",
diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h
index 290e3d6a5e1..bfb97ae44ce 100644
--- a/platform/linuxbsd/x11/display_server_x11.h
+++ b/platform/linuxbsd/x11/display_server_x11.h
@@ -75,10 +75,11 @@
 #include "dynwrappers/xext-so_wrap.h"
 #include "dynwrappers/xinerama-so_wrap.h"
 #include "dynwrappers/xinput2-so_wrap.h"
-#include "dynwrappers/xkbcommon-so_wrap.h"
 #include "dynwrappers/xrandr-so_wrap.h"
 #include "dynwrappers/xrender-so_wrap.h"
 
+#include "../xkbcommon-so_wrap.h"
+
 typedef struct _xrr_monitor_info {
 	Atom name;
 	Bool primary = false;
diff --git a/platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.c b/platform/linuxbsd/xkbcommon-so_wrap.c
similarity index 100%
rename from platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.c
rename to platform/linuxbsd/xkbcommon-so_wrap.c
diff --git a/platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.h b/platform/linuxbsd/xkbcommon-so_wrap.h
similarity index 100%
rename from platform/linuxbsd/x11/dynwrappers/xkbcommon-so_wrap.h
rename to platform/linuxbsd/xkbcommon-so_wrap.h