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

---
 types/fx/shadow_data.c  | 2 +-
 types/scene/wlr_scene.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'types')

diff --git a/types/fx/shadow_data.c b/types/fx/shadow_data.c
index fae76cf..a8ad8f9 100644
--- a/types/fx/shadow_data.c
+++ b/types/fx/shadow_data.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 #include "wlr/util/log.h"
 
 struct shadow_data shadow_data_get_default(void) {
diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c
index 8ded6a8..e9f765c 100644
--- a/types/scene/wlr_scene.c
+++ b/types/scene/wlr_scene.c
@@ -1,6 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdlib.h>
+#include <scenefx/types/wlr_scene.h>
 #include <string.h>
 #include <wlr/backend.h>
 #include <wlr/render/gles2.h>
@@ -8,7 +9,6 @@
 #include <wlr/types/wlr_damage_ring.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
@@ -16,7 +16,7 @@
 #include <wlr/render/swapchain.h>
 
 #include "render/pass.h"
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 #include "types/wlr_buffer.h"
 #include "types/wlr_output.h"
 #include "types/wlr_scene.h"
-- 
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

---
 types/meson.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'types')

diff --git a/types/meson.build b/types/meson.build
index 0527b7c..29e9c36 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -1,7 +1,12 @@
 wlr_files += files(
-	'output/wlr_output.c',
 	'scene/wlr_scene.c',
-	'buffer/buffer.c',
 )
 
+if not wlroots_is_sub
+	wlr_files += files([
+		'output/wlr_output.c',
+		'buffer/buffer.c',
+	])
+endif
+
 subdir('fx')
-- 
cgit v1.2.3