Use modern LV2 includes

26 files changed, 49 insertions, 49 deletions

diff --git a/bindings/test/bindings_test_plugin.c b/bindings/test/bindings_test_plugin.c
index 59b7fd3..bee7f85 100644
--- a/bindings/test/bindings_test_plugin.c
+++ b/bindings/test/bindings_test_plugin.c
@@ -22,7 +22,7 @@
    replacing `http:/` with `lv2` any header in the specification bundle can be
    included, in this case `lv2.h`.
 */
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 /** Include standard C headers */
 #include <math.h>
diff --git a/lilv/lilv.h b/lilv/lilv.h
index 58d00dc..a092178 100644
--- a/lilv/lilv.h
+++ b/lilv/lilv.h
@@ -21,8 +21,8 @@
 #ifndef LILV_LILV_H
 #define LILV_LILV_H
 
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/urid/urid.h"
 
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/src/instance.c b/src/instance.c
index 23d6cae..ac263c7 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -16,8 +16,8 @@
 
 #include "lilv_internal.h"
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "lilv/lilv.h"
+#include "lv2/core/lv2.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/lib.c b/src/lib.c
index 68eff47..06510cb 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -17,7 +17,7 @@
 #include "lilv_internal.h"
 
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 #include "zix/tree.h"
 
 #include <stdint.h>
diff --git a/src/lilv_internal.h b/src/lilv_internal.h
index da38d05..52e0870 100644
--- a/src/lilv_internal.h
+++ b/src/lilv_internal.h
@@ -60,7 +60,7 @@ static inline const char* dlerror(void) { return "Unknown error"; }
 #endif
 
 #ifdef LILV_DYN_MANIFEST
-#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include "lv2/dynmanifest/dynmanifest.h"
 #endif
 
 /*
diff --git a/src/plugin.c b/src/plugin.c
index effe854..b2648dd 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -24,11 +24,11 @@
 #include "sord/sord.h"
 #include "zix/tree.h"
 
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/ui/ui.h"
 
 #ifdef LILV_DYN_MANIFEST
-#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include "lv2/dynmanifest/dynmanifest.h"
 #    include <dlfcn.h>
 #endif
 
diff --git a/src/port.c b/src/port.c
index ce11e3f..bdcb176 100644
--- a/src/port.c
+++ b/src/port.c
@@ -16,9 +16,9 @@
 
 #include "lilv_internal.h"
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/core/lv2.h"
+#include "lv2/event/event.h"
 
 #include "lilv/lilv.h"
 #include "sord/sord.h"
diff --git a/src/state.c b/src/state.c
index 3841c75..f2b88e7 100644
--- a/src/state.c
+++ b/src/state.c
@@ -22,12 +22,12 @@
 #include "sratom/sratom.h"
 #include "zix/tree.h"
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/core/lv2.h"
+#include "lv2/presets/presets.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/world.c b/src/world.c
index 29c16d0..0bf7cf3 100644
--- a/src/world.c
+++ b/src/world.c
@@ -23,11 +23,11 @@
 #include "zix/common.h"
 #include "zix/tree.h"
 
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/presets/presets.h"
 
 #ifdef LILV_DYN_MANIFEST
-#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"
+#    include "lv2/dynmanifest/dynmanifest.h"
 #    include <dlfcn.h>
 #endif
 
diff --git a/test/bad_syntax.lv2/bad_syntax.c b/test/bad_syntax.lv2/bad_syntax.c
index 5bd7b01..fc4a210 100644
--- a/test/bad_syntax.lv2/bad_syntax.c
+++ b/test/bad_syntax.lv2/bad_syntax.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/failed_instantiation.lv2/failed_instantiation.c b/test/failed_instantiation.lv2/failed_instantiation.c
index fd25ea1..30ae0ca 100644
--- a/test/failed_instantiation.lv2/failed_instantiation.c
+++ b/test/failed_instantiation.lv2/failed_instantiation.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
index 2edbbc6..f664aa4 100644
--- a/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
+++ b/test/failed_lib_descriptor.lv2/failed_lib_descriptor.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdlib.h>
 
diff --git a/test/lib_descriptor.lv2/lib_descriptor.c b/test/lib_descriptor.lv2/lib_descriptor.c
index 8d1da81..29176dc 100644
--- a/test/lib_descriptor.lv2/lib_descriptor.c
+++ b/test/lib_descriptor.lv2/lib_descriptor.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/lilv_test.c b/test/lilv_test.c
index 6e1f63c..8b0c1a9 100644
--- a/test/lilv_test.c
+++ b/test/lilv_test.c
@@ -32,10 +32,10 @@
 #endif
 
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/presets/presets.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 #include "serd/serd.h"
 
 #include <assert.h>
diff --git a/test/missing_descriptor.lv2/missing_descriptor.c b/test/missing_descriptor.lv2/missing_descriptor.c
index 9846f74..518313b 100644
--- a/test/missing_descriptor.lv2/missing_descriptor.c
+++ b/test/missing_descriptor.lv2/missing_descriptor.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 LV2_SYMBOL_EXPORT
 const char* msg = "this is not the thing you're looking for";
diff --git a/test/missing_name.lv2/missing_name.c b/test/missing_name.lv2/missing_name.c
index 9ce9f6c..8945c1f 100644
--- a/test/missing_name.lv2/missing_name.c
+++ b/test/missing_name.lv2/missing_name.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/missing_plugin.lv2/missing_plugin.c b/test/missing_plugin.lv2/missing_plugin.c
index e06ad82..848ab94 100644
--- a/test/missing_plugin.lv2/missing_plugin.c
+++ b/test/missing_plugin.lv2/missing_plugin.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/missing_port.lv2/missing_port.c b/test/missing_port.lv2/missing_port.c
index 52da722..558eeb0 100644
--- a/test/missing_port.lv2/missing_port.c
+++ b/test/missing_port.lv2/missing_port.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/missing_port_name.lv2/missing_port_name.c b/test/missing_port_name.lv2/missing_port_name.c
index b6180de..f48203a 100644
--- a/test/missing_port_name.lv2/missing_port_name.c
+++ b/test/missing_port_name.lv2/missing_port_name.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/new_version.lv2/new_version.c b/test/new_version.lv2/new_version.c
index 09fdfda..2669a83 100644
--- a/test/new_version.lv2/new_version.c
+++ b/test/new_version.lv2/new_version.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/old_version.lv2/old_version.c b/test/old_version.lv2/old_version.c
index 5cd1e03..84d3b2c 100644
--- a/test/old_version.lv2/old_version.c
+++ b/test/old_version.lv2/old_version.c
@@ -15,7 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/test/test.lv2/test.c b/test/test.lv2/test.c
index 77383a5..36be747 100644
--- a/test/test.lv2/test.c
+++ b/test/test.lv2/test.c
@@ -17,10 +17,10 @@
 
 #define _POSIX_C_SOURCE 200809L
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/core/lv2.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
 #ifdef _WIN32
 #    include <io.h>
diff --git a/utils/lv2apply.c b/utils/lv2apply.c
index 38cc5ff..14a5ff0 100644
--- a/utils/lv2apply.c
+++ b/utils/lv2apply.c
@@ -16,7 +16,7 @@
 
 #include "lilv/lilv.h"
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #include <math.h>
 #include <sndfile.h>
diff --git a/utils/lv2bench.c b/utils/lv2bench.c
index dfd100b..698bf71 100644
--- a/utils/lv2bench.c
+++ b/utils/lv2bench.c
@@ -17,9 +17,9 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/atom/atom.h"
+#include "lv2/core/lv2.h"
+#include "lv2/urid/urid.h"
 
 #include "bench.h"
 #include "lilv_config.h"
diff --git a/utils/lv2info.c b/utils/lv2info.c
index d8c3abf..7fed585 100644
--- a/utils/lv2info.c
+++ b/utils/lv2info.c
@@ -17,10 +17,10 @@
 #include "lilv_config.h"
 
 #include "lilv/lilv.h"
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
-#include "lv2/lv2plug.in/ns/ext/port-groups/port-groups.h"
-#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/event/event.h"
+#include "lv2/port-groups/port-groups.h"
+#include "lv2/presets/presets.h"
 
 #include <math.h>
 #include <stdbool.h>
diff --git a/wscript b/wscript
index ddc361e..dbda6cd 100644
--- a/wscript
+++ b/wscript
@@ -84,7 +84,7 @@ def configure(conf):
         conf.fatal('Neither a shared nor a static build requested')
 
     autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
-                      atleast_version='1.14.0', mandatory=True)
+                      atleast_version='1.16.0', mandatory=True)
     autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
                       atleast_version='0.18.0', mandatory=True)
     autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',