From 6e208d4e0f68ab224813789d2550ea3c2aaf29a0 Mon Sep 17 00:00:00 2001
From: Hanspeter Portner <dev@open-music-kontrollers.ch>
Date: Sun, 3 Dec 2023 17:46:49 +0100
Subject: [PATCH] Include osc.lv2 as proper subtree

---
 api/api.c       | 1 -
 api/api_forge.c | 1 +
 meson.build     | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/api.c b/api/api.c
index 7aea940..40b4b7b 100644
--- a/api/api.c
+++ b/api/api.c
@@ -9,7 +9,6 @@
 #include <stdatomic.h>
 #include <unistd.h> // getentropy
 
-#include <osc.lv2/endian.h>
 #include <xpress.lv2/xpress.h>
 
 #include <api_atom.h>
diff --git a/api/api_forge.c b/api/api_forge.c
index cf5ab93..40fe61d 100644
--- a/api/api_forge.c
+++ b/api/api_forge.c
@@ -10,6 +10,7 @@
 #include <api_stash.h>
 
 #include <osc.lv2/forge.h>
+#include <osc.lv2/util.h>
 
 __realtime static void
 _lforge_pop_inlined(lua_State *L, lforge_t *lforge)
diff --git a/meson.build b/meson.build
index c8062b2..af57dc6 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ canvas_lv2 = subproject('canvas.lv2')
 props_lv2 = subproject('props.lv2')
 ser_atom_lv2 = subproject('ser_atom.lv2')
 timely_lv2 = subproject('timely.lv2')
+osc_lv2 = subproject('osc.lv2')
 varchunk = subproject('varchunk')
 
 lv2libdir = get_option('lv2libdir')
@@ -34,6 +35,7 @@ canvas_idisp_lv2_dep = canvas_lv2.get_variable('canvas_idisp_lv2')
 props_lv2_dep = props_lv2.get_variable('props_lv2')
 ser_atom_lv2_dep = ser_atom_lv2.get_variable('ser_atom_lv2')
 timely_lv2_dep = timely_lv2.get_variable('timely_lv2')
+osc_lv2_dep = osc_lv2.get_variable('osc_lv2')
 varchunk_dep = varchunk.get_variable('varchunk')
 
 source_root = meson.source_root()
@@ -48,8 +50,8 @@ m_dep = cc.find_library('m')
 lv2_dep = dependency('lv2', version : '>=1.14.0')
 thread_dep = dependency('threads')
 
-dsp_deps = [m_dep, lv2_dep, thread_dep, varchunk_dep, props_lv2_dep, timely_lv2_dep, canvas_lv2_dep, canvas_idisp_lv2_dep]
-ui_deps = [m_dep, lv2_dep, varchunk_dep, props_lv2_dep, canvas_lv2_dep, ser_atom_lv2_dep, d2tk_dep]
+dsp_deps = [m_dep, lv2_dep, thread_dep, varchunk_dep, props_lv2_dep, timely_lv2_dep, osc_lv2_dep, canvas_lv2_dep, canvas_idisp_lv2_dep]
+ui_deps = [m_dep, lv2_dep, varchunk_dep, props_lv2_dep, osc_lv2_dep, canvas_lv2_dep, ser_atom_lv2_dep, d2tk_dep]
 
 if cc.has_member('LV2UI_Request_Value', 'request',
 		prefix : '#include <lv2/lv2plug.in/ns/extensions/ui/ui.h>')
@@ -84,9 +86,8 @@ lrandom_inc = include_directories(join_paths('ext', 'lrandom'))
 lua_inc = include_directories(join_paths('ext', lua_prefix))
 tlsf_inc = include_directories(join_paths('ext', tlsf_prefix))
 
-osc_inc = include_directories('osc.lv2')
 xpress_inc = include_directories('xpress.lv2')
-inc_dir = [include_inc, api_inc, plugin_inc, laes128_inc, tinyaes_inc, lascii85_inc, lbase64_inc, lcomplex_inc, lmathx_inc, lpeg_inc, lrandom_inc, lua_inc, tlsf_inc, osc_inc, xpress_inc]
+inc_dir = [include_inc, api_inc, plugin_inc, laes128_inc, tinyaes_inc, lascii85_inc, lbase64_inc, lcomplex_inc, lmathx_inc, lpeg_inc, lrandom_inc, lua_inc, tlsf_inc, xpress_inc]
 
 version = get_option('version').split('.')
 add_project_arguments('-DMOONY_VERSION="'
-- 
2.38.5