From 24a1c9f2d451ac1746e04e3cf1a59f4b72cd6218 Mon Sep 17 00:00:00 2001
From: Hanspeter Portner <dev@open-music-kontrollers.ch>
Date: Tue, 25 Apr 2023 12:45:55 +0200
Subject: [PATCH] Migrate to subprojects

---
 meson.build        | 13 ++++++++-----
 meson_options.txt  |  2 +-
 src/eteroj_io.c    | 11 ++++-------
 src/eteroj_ninja.c |  4 ++--
 src/eteroj_pack.c  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/meson.build b/meson.build
index 85118f8..dc92726 100644
--- a/meson.build
+++ b/meson.build
@@ -8,11 +8,17 @@ project('eteroj.lv2', 'c', default_options : [
 	'b_lto=true',
 	'c_std=gnu11'])
 
+varchunk = subproject('varchunk')
+netatom_lv2 = subproject('netatom.lv2')
+props_lv2 = subproject('props.lv2')
 lv2libdir = get_option('lv2libdir')
 build_tests = get_option('build-tests')
 
 inst_dir = join_paths(lv2libdir, meson.project_name())
 
+varchunk_dep = varchunk.get_variable('varchunk')
+netatom_lv2_dep = netatom_lv2.get_variable('netatom_lv2')
+props_lv2_dep = props_lv2.get_variable('props_lv2')
 source_root = meson.source_root()
 build_root = meson.build_root()
 
@@ -28,13 +34,10 @@ reuse = find_program('reuse', required : false)
 m_dep = cc.find_library('m')
 lv2_dep = dependency('lv2', version : '>=1.16.0')
 
-dsp_deps = [m_dep, lv2_dep]
+dsp_deps = [m_dep, lv2_dep, varchunk_dep, netatom_lv2_dep, props_lv2_dep]
 
-netatom_inc = include_directories('netatom.lv2')
 osc_inc = include_directories('osc.lv2')
-props_inc = include_directories('props.lv2')
-varchunk_inc = include_directories('varchunk')
-inc_dir = [netatom_inc, osc_inc, props_inc, varchunk_inc]
+inc_dir = [osc_inc]
 
 dsp_srcs = [
 	join_paths('src', 'eteroj.c'),
diff --git a/meson_options.txt b/meson_options.txt
index 73bf52b..7a5a654 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,4 +9,4 @@ option('lv2libdir',
 	type : 'string',
 	value : 'lib/lv2')
 
-option('version', type : 'string', value : '0.11.13')
+option('version', type : 'string', value : '0.11.27')
diff --git a/src/eteroj_io.c b/src/eteroj_io.c
index c67b7f7..87d23ef 100644
--- a/src/eteroj_io.c
+++ b/src/eteroj_io.c
@@ -20,12 +20,12 @@
 #include <math.h>
 
 #include <eteroj.lv2/eteroj.h>
-#include <varchunk.h>
+#include <varchunk/varchunk.h>
 #include <osc.lv2/reader.h>
 #include <osc.lv2/writer.h>
 #include <osc.lv2/forge.h>
 #include <osc.lv2/stream.h>
-#include <props.h>
+#include <props.lv2/props.h>
 
 #define BUF_SIZE 0x100000 // 1M
 #define MTU_SIZE 1500
@@ -584,11 +584,8 @@ _handle_enum(plughandle_t *handle, LV2_OSC_Enum ev)
 	{
 		strncpy(handle->state.osc_error, err, STR_LEN-1);
 
-		props_impl_t *impl = _props_impl_get(&handle->props, handle->uris.eteroj_error);
-		if(impl)
-		{
-			_props_impl_set(&handle->props, impl, handle->forge.String, strlen(err), err);
-		}
+		props_update(&handle->props, handle->uris.eteroj_error,
+			handle->forge.String, strlen(err), err);
 
 		handle->status_updated = true;
 	}
diff --git a/src/eteroj_ninja.c b/src/eteroj_ninja.c
index 85c6a05..5ea0019 100644
--- a/src/eteroj_ninja.c
+++ b/src/eteroj_ninja.c
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 
 #include <eteroj.lv2/eteroj.h>
-#include <varchunk.h>
+#include <varchunk/varchunk.h>
 #include <osc.lv2/util.h>
 #include <osc.lv2/forge.h>
-#include <props.h>
+#include <props.lv2/props.h>
 
 #define NETATOM_IMPLEMENTATION
 #include <netatom.lv2/netatom.h>
diff --git a/src/eteroj_pack.c b/src/eteroj_pack.c
index 73a77a2..7cfdd83 100644
--- a/src/eteroj_pack.c
+++ b/src/eteroj_pack.c
@@ -21,7 +21,7 @@
 #include <eteroj.lv2/eteroj.h>
 #include <osc.lv2/util.h>
 #include <osc.lv2/forge.h>
-#include <props.h>
+#include <props.lv2/props.h>
 
 #define MAX_NPROPS 2
 #define MAX_STRLEN 512
-- 
2.38.5