From c66fe881df7aa79a018efbdfe1ea756f2b741b23 Mon Sep 17 00:00:00 2001
From: Erik Reider <35975961+ErikReider@users.noreply.github.com>
Date: Sat, 6 Jan 2024 19:42:49 +0100
Subject: Added back xkbcommon dep. Fixes tinywl compilation

---
 meson.build | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'meson.build')

diff --git a/meson.build b/meson.build
index 070a07a..2936768 100644
--- a/meson.build
+++ b/meson.build
@@ -126,6 +126,7 @@ drm = dependency('libdrm',
 		'tests=false',
 	],
 )
+xkbcommon = dependency('xkbcommon')
 pixman = dependency('pixman-1',
 	version: '>=0.42.0',
 	fallback: 'pixman',
@@ -139,6 +140,7 @@ wlr_deps = [
 	wlroots,
 	wayland_server,
 	drm,
+	xkbcommon,
 	pixman,
 	math,
 	rt,
-- 
cgit v1.2.3


From 3e6108472c3d578175ea6fb685e1919b3585606f Mon Sep 17 00:00:00 2001
From: Erik Reider <35975961+ErikReider@users.noreply.github.com>
Date: Sat, 6 Jan 2024 21:24:37 +0100
Subject: Moved wlr_scene.h and shadow_data.h into scenefx dir

---
 meson.build | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'meson.build')

diff --git a/meson.build b/meson.build
index 2936768..8288a96 100644
--- a/meson.build
+++ b/meson.build
@@ -152,6 +152,8 @@ subdir('render')
 subdir('types')
 subdir('util')
 
+subdir('include')
+
 scenefx_inc = include_directories('include')
 
 lib_scenefx = library(
-- 
cgit v1.2.3


From cc83f41dbfc12af350c37f46677b82a64df801b8 Mon Sep 17 00:00:00 2001
From: Erik Reider <35975961+ErikReider@users.noreply.github.com>
Date: Sat, 6 Jan 2024 22:53:32 +0100
Subject: Compile wlroots subproject dep staticly

---
 meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'meson.build')

diff --git a/meson.build b/meson.build
index 8288a96..31da09e 100644
--- a/meson.build
+++ b/meson.build
@@ -92,14 +92,14 @@ wayland_server = dependency('wayland-server',
 	default_options: wayland_project_options,
 )
 
-wlroots_options = [ 'examples=false' ]
+wlroots_options = [ 'examples=false', 'default_library=static' ]
 wlroots_version = ['>=0.17.0', '<0.18.0']
-subproject(
+wlroots_is_sub = subproject(
 	'wlroots',
 	default_options: wlroots_options,
 	required: false,
 	version: wlroots_version,
-)
+).found()
 wlroots = dependency('wlroots',
 	version: wlroots_version,
 	default_options: wlroots_options,
-- 
cgit v1.2.3