Install standard headers to simpler include paths

107 files changed, 19 insertions, 249 deletions

diff --git a/lv2/lv2plug.in/ns/ext/atom/atom-test.c b/lv2/atom/atom-test.c
index 72bf4ea..d694e4b 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom-test.c
+++ b/lv2/atom/atom-test.c
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
 
 char**   uris   = NULL;
 uint32_t n_uris = 0;
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.h b/lv2/atom/atom.h
index cb5c067..cb5c067 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom.h
+++ b/lv2/atom/atom.h
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.ttl b/lv2/atom/atom.ttl
index 891cd1f..891cd1f 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom.ttl
+++ b/lv2/atom/atom.ttl
diff --git a/lv2/lv2plug.in/ns/ext/atom/forge.h b/lv2/atom/forge.h
index bcdbf9e..befbb6e 100644
--- a/lv2/lv2plug.in/ns/ext/atom/forge.h
+++ b/lv2/atom/forge.h
@@ -50,9 +50,9 @@
 
 #include <assert.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/util.h"
+#include "lv2/urid/urid.h"
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
 #    define LV2_ATOM_FORGE_DEPRECATED __attribute__((__deprecated__))
diff --git a/lv2/lv2plug.in/ns/ext/atom/lv2-atom.doap.ttl b/lv2/atom/lv2-atom.doap.ttl
index 681ff77..681ff77 100644
--- a/lv2/lv2plug.in/ns/ext/atom/lv2-atom.doap.ttl
+++ b/lv2/atom/lv2-atom.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/atom/manifest.ttl b/lv2/atom/manifest.ttl
index ebdf111..ebdf111 100644
--- a/lv2/lv2plug.in/ns/ext/atom/manifest.ttl
+++ b/lv2/atom/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/atom/util.h b/lv2/atom/util.h
index 5574e9b..cb3dbc8 100644
--- a/lv2/lv2plug.in/ns/ext/atom/util.h
+++ b/lv2/atom/util.h
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.h b/lv2/buf-size/buf-size.h
index 900f8fa..900f8fa 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.h
+++ b/lv2/buf-size/buf-size.h
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.ttl b/lv2/buf-size/buf-size.ttl
index f8a9d60..f8a9d60 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.ttl
+++ b/lv2/buf-size/buf-size.ttl
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/lv2-buf-size.doap.ttl b/lv2/buf-size/lv2-buf-size.doap.ttl
index bc6ffe9..bc6ffe9 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/lv2-buf-size.doap.ttl
+++ b/lv2/buf-size/lv2-buf-size.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/manifest.ttl b/lv2/buf-size/manifest.ttl
index aeccc99..aeccc99 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/manifest.ttl
+++ b/lv2/buf-size/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2.h b/lv2/core/lv2.h
index eaca514..3bfdd02 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2.h
+++ b/lv2/core/lv2.h
@@ -19,7 +19,7 @@
 */
 
 /**
-   @defgroup lv2core LV2 Core
+   @defgroup core LV2 Core
 
    Core LV2 specification, see <http://lv2plug.in/ns/lv2core> for details.
 
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2_util.h b/lv2/core/lv2_util.h
index 561e201..e82d097 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2_util.h
+++ b/lv2/core/lv2_util.h
@@ -20,9 +20,10 @@
    @{
 */
 
+#include <stdarg.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl b/lv2/core/lv2core.doap.ttl
index 2f90f31..2f90f31 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl
+++ b/lv2/core/lv2core.doap.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl b/lv2/core/lv2core.ttl
index dd3e6bd..dd3e6bd 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl
+++ b/lv2/core/lv2core.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/manifest.ttl b/lv2/core/manifest.ttl
index d331434..d331434 100644
--- a/lv2/lv2plug.in/ns/lv2core/manifest.ttl
+++ b/lv2/core/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/meta.ttl b/lv2/core/meta.ttl
index 8a78e64..8ed9595 100644
--- a/lv2/lv2plug.in/ns/lv2core/meta.ttl
+++ b/lv2/core/meta.ttl
@@ -38,7 +38,7 @@ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH R
 		meta:kfoltman ,
 		meta:paniq ;
 	doap:release [
-		doap:revision "1.15.3" ;
+		doap:revision "1.15.4" ;
 		doap:created "2018-09-22" ;
 		dcs:blame <http://drobilla.net/drobilla#me> ;
 		dcs:changeset [
diff --git a/lv2/lv2plug.in/ns/ext/data-access/data-access.h b/lv2/data-access/data-access.h
index 2f4fd28..2f4fd28 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/data-access.h
+++ b/lv2/data-access/data-access.h
diff --git a/lv2/lv2plug.in/ns/ext/data-access/data-access.ttl b/lv2/data-access/data-access.ttl
index 654b714..654b714 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/data-access.ttl
+++ b/lv2/data-access/data-access.ttl
diff --git a/lv2/lv2plug.in/ns/ext/data-access/lv2-data-access.doap.ttl b/lv2/data-access/lv2-data-access.doap.ttl
index d577e63..d577e63 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/lv2-data-access.doap.ttl
+++ b/lv2/data-access/lv2-data-access.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/data-access/manifest.ttl b/lv2/data-access/manifest.ttl
index 85e50fc..85e50fc 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/manifest.ttl
+++ b/lv2/data-access/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h b/lv2/dynmanifest/dynmanifest.h
index 9725ee4..255d063 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h
+++ b/lv2/dynmanifest/dynmanifest.h
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_DYN_MANIFEST_URI    "http://lv2plug.in/ns/ext/dynmanifest"  ///< http://lv2plug.in/ns/ext/dynmanifest
 #define LV2_DYN_MANIFEST_PREFIX LV2_DYN_MANIFEST_URI "#"                ///< http://lv2plug.in/ns/ext/dynmanifest#
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.ttl b/lv2/dynmanifest/dynmanifest.ttl
index 63e0730..63e0730 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.ttl
+++ b/lv2/dynmanifest/dynmanifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl b/lv2/dynmanifest/lv2-dynmanifest.doap.ttl
index 9dd6c81..9dd6c81 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
+++ b/lv2/dynmanifest/lv2-dynmanifest.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/manifest.ttl b/lv2/dynmanifest/manifest.ttl
index 784fb30..784fb30 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/manifest.ttl
+++ b/lv2/dynmanifest/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/event/event-helpers.h b/lv2/event/event-helpers.h
index 5993dc0..6eab3b6 100644
--- a/lv2/lv2plug.in/ns/ext/event/event-helpers.h
+++ b/lv2/event/event-helpers.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
+#include "lv2/event/event.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/event/event.h b/lv2/event/event.h
index 8b850d1..8b850d1 100644
--- a/lv2/lv2plug.in/ns/ext/event/event.h
+++ b/lv2/event/event.h
diff --git a/lv2/lv2plug.in/ns/ext/event/event.ttl b/lv2/event/event.ttl
index 94e429f..94e429f 100644
--- a/lv2/lv2plug.in/ns/ext/event/event.ttl
+++ b/lv2/event/event.ttl
diff --git a/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl b/lv2/event/lv2-event.doap.ttl
index 5051237..5051237 100644
--- a/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl
+++ b/lv2/event/lv2-event.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/event/manifest.ttl b/lv2/event/manifest.ttl
index 0b454e2..0b454e2 100644
--- a/lv2/lv2plug.in/ns/ext/event/manifest.ttl
+++ b/lv2/event/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h b/lv2/instance-access/instance-access.h
index 7e328fd..7e328fd 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h
+++ b/lv2/instance-access/instance-access.h
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.ttl b/lv2/instance-access/instance-access.ttl
index 5656345..5656345 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.ttl
+++ b/lv2/instance-access/instance-access.ttl
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/lv2-instance-access.doap.ttl b/lv2/instance-access/lv2-instance-access.doap.ttl
index 5aa70d8..5aa70d8 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/lv2-instance-access.doap.ttl
+++ b/lv2/instance-access/lv2-instance-access.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/manifest.ttl b/lv2/instance-access/manifest.ttl
index cee5dbf..cee5dbf 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/manifest.ttl
+++ b/lv2/instance-access/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/log/log.h b/lv2/log/log.h
index 10a26cd..11bb35a 100644
--- a/lv2/lv2plug.in/ns/ext/log/log.h
+++ b/lv2/log/log.h
@@ -38,7 +38,7 @@
 
 #include <stdarg.h>
 
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/urid/urid.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/log/log.ttl b/lv2/log/log.ttl
index 60e1d3f..60e1d3f 100644
--- a/lv2/lv2plug.in/ns/ext/log/log.ttl
+++ b/lv2/log/log.ttl
diff --git a/lv2/lv2plug.in/ns/ext/log/logger.h b/lv2/log/logger.h
index 7422dba..0c608a6 100644
--- a/lv2/lv2plug.in/ns/ext/log/logger.h
+++ b/lv2/log/logger.h
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
+#include "lv2/log/log.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/log/lv2-log.doap.ttl b/lv2/log/lv2-log.doap.ttl
index d109809..d109809 100644
--- a/lv2/lv2plug.in/ns/ext/log/lv2-log.doap.ttl
+++ b/lv2/log/lv2-log.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/log/manifest.ttl b/lv2/log/manifest.ttl
index afe7449..afe7449 100644
--- a/lv2/lv2plug.in/ns/ext/log/manifest.ttl
+++ b/lv2/log/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/index.html.in b/lv2/lv2plug.in/ns/index.html.in
deleted file mode 100644
index b30f804..0000000
--- a/lv2/lv2plug.in/ns/index.html.in
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>LV2 Specifications</title>
-    <meta http-equiv="Content-Type"
-          content="application/xhtml+xml;charset=utf-8" />
-    <link rel="stylesheet" type="text/css"
-          href="../aux/style.css" />
-  </head>
-  <body>
-
-    <!-- HEADER -->
-    <div id="topbar">
-      <div id="header">
-        <div id="titlebox">
-          <h1 id="title">LV2 Specifications</h1>
-        </div>
-        <table id="meta">
-          <!--<tr><th>URI</th><td><a href="@URI@">@URI@</a></td></tr>
-              <tr><th>Version</th><td>@REVISION@</td></tr>-->
-          <!--<tr><th>Prefixes</th><td>@PREFIXES@</td></tr>-->
-          <tr><th>Version</th><td>@LV2_VERSION@</td></tr>
-          <tr><th>Date</th><td>@DATE@</td></tr>
-          <tr><th>Discuss</th>
-            <td>
-              <a href="mailto:devel@lists.lv2plug.in">devel@lists.lv2plug.in</a>
-              <a href="http://lists.lv2plug.in/listinfo.cgi/devel-lv2plug.in">(subscribe)</a>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <ul id="contents">
-        <!-- <li><a href="#sec-description">Description</a></li> -->
-        <li><a href="#sec-index">Index</a></li>
-        <li><a href="#sec-history">History</a></li>
-      </ul>
-    </div>
-
-    <!-- DESCRIPTION -->
-    <!-- <h2 class="sec" id="sec-description">Description</h2> -->
-    <div class="content">
-      <p>All official LV2 specifications.</p>
-    </div>
-
-    <!-- INDEX -->
-    <!-- <h2 class="sec" id="sec-index">Index</h2> -->
-    <div class="content">
-      <a id="sec-index"></a>
-      <table class="index" summary="An index of LV2 specifications">
-        <thead>
-          <tr>
-            <th>Specification</th>
-            <th>API</th>
-            <th>Description</th>
-            <th>Version</th>
-            <th>Status</th>
-          </tr>
-        </thead>
-        <tbody>
-@ROWS@
-        </tbody>
-      </table>
-    </div>
-
-    <!-- HISTORY -->
-    <h2 class="sec" id="sec-history">History</h2>
-    <div class="content">
-      @HISTORY@
-    </div>
-
-    <!-- FOOTER -->
-    <div id="footer">
-      <div>
-        This document is available under the
-        <a about="" rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
-          Creative Commons Attribution-ShareAlike License
-        </a>
-      </div>
-	  <div>
-        Valid
-        <a about="" rel="dct:conformsTo" resource="http://www.w3.org/TR/rdfa-syntax"
-           href="http://validator.w3.org/check?uri=referer">
-          XHTML+RDFa
-        </a>
-        and
-        <a about="" rel="dct:conformsTo" resource="http://www.w3.org/TR/CSS2"
-           href="http://jigsaw.w3.org/css-validator/check/referer">
-          CSS
-        </a>
-        generated from <tt>meta.ttl</tt>
-      </div>
-    </div>
-
-  </body>
-</html>
diff --git a/lv2/lv2plug.in/ns/lv2core/README b/lv2/lv2plug.in/ns/lv2core/README
deleted file mode 100644
index f49513f..0000000
--- a/lv2/lv2plug.in/ns/lv2core/README
+++ /dev/null
@@ -1,42 +0,0 @@
-LV2
-===
-
-LV2 gives programmers the ability to write audio processors (or "plugins") in
-C/C++ which can be dynamically loaded into a range of applications (or
-"hosts").
-
-This core specification is deliberately as short and simple as possible, but is
-designed so that extensions can be defined to add more advanced features.
-
-More information about LV2 can be found at <http://lv2plug.in>.
-
-
-Using LV2
----------
-
-Applications that use LV2 plugins should depend on this package.  It includes a
-header, LV2 bundle, and a pkg-config file.  To compile against LV2, build
-scripts should check for the pkg-config package "lv2core", or simply check for
-the header "lv2/lv2plug.in/ns/lv2core/lv2.h".
-
-The appropriate C include for LV2 specifications is based on their URI, e.g.:
-
-    #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-
-Is how code should include the header "lv2.h" in this bundle, which defines the
-specification with URI "http://lv2plug.in/ns/lv2core".  Other specifications
-should follow this convention, e.g. the correct way to include the header
-"foo.h" in the extension "http://example.org/foo" is:
-
-    #include "lv2/example.org/foo/foo.h"
-
-
-Packaging
----------
-
-Please package these components in a single package (i.e. do not split the
-headers, data, and program into separate packages).  This package, in its
-entirety, is a build and run time dependency of any code that uses LV2.
-Distributions are encouraged to include it with package name "lv2core".
-
- -- David Robillard <d@drobilla.net>
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.pc.in b/lv2/lv2plug.in/ns/lv2core/lv2core.pc.in
deleted file mode 100644
index 96e5169..0000000
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: lv2core
-Version: @LV2CORE_VERSION@
-Description: An audio plugin interface specification.
-Libs:
-Cflags: -I${includedir}
diff --git a/lv2/lv2plug.in/ns/lv2core/wscript b/lv2/lv2plug.in/ns/lv2core/wscript
deleted file mode 100644
index c70aa1d..0000000
--- a/lv2/lv2plug.in/ns/lv2core/wscript
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-import os
-
-from waflib.extras import autowaf as autowaf
-import waflib.Options as Options
-import glob
-
-# Version of this package (even if built as a child)
-LV2CORE_VERSION = '12.0'
-
-# Variables for 'waf dist'
-APPNAME = 'lv2core'
-VERSION = LV2CORE_VERSION
-
-# Mandatory variables
-top = '.'
-out = 'build'
-
-def options(opt):
-    opt.load('compiler_c')
-    autowaf.set_options(opt)
-    opt.add_option('--bundle-only', action='store_true', default=False,
-                   dest='bundle_only',
-                   help="Only install bundle (not header or pkg-config file)")
-    opt.add_option('--copy-headers', action='store_true', default=False,
-                   dest='copy_headers',
-                   help='Copy headers instead of linking to bundle')
-
-def configure(conf):
-    if not hasattr(os.path, 'relpath') and not Options.options.copy_headers:
-        conf.fatal(
-            'os.path.relpath missing, get Python 2.6 or use --copy-headers')
-
-    conf.load('compiler_c', cache=True)
-    conf.load('autowaf', cache=True)
-
-    autowaf.display_msg(conf, "LV2 bundle directory", conf.env['LV2DIR'])
-    print('')
-
-def build(bld):
-    # Header "library"
-    bld(export_includes = ['.'],
-        name            = 'liblv2core',
-        target          = 'lv2core')
-
-    # Bundle (data)
-    bld.install_files('${LV2DIR}/lv2core.lv2', bld.path.ant_glob('*.ttl'))
-
-    if not Options.options.bundle_only:
-        # Header
-        bld.install_files('${INCLUDEDIR}', 'lv2.h')
-        bld.install_files('${LV2DIR}/lv2core.lv2', 'lv2.h')
-        bld.install_files('${LV2DIR}/lv2core.lv2', 'lv2_util.h')
-
-        # Pkgconfig file
-        autowaf.build_pc(bld, 'LV2CORE', LV2CORE_VERSION, '', [])
-
-        # URI-like header include
-        include_dir = os.path.join(bld.env['INCLUDEDIR'], 'lv2/lv2plug.in/ns')
-        bundle_dir  = os.path.join(bld.env['LV2DIR'], 'lv2core.lv2')
-        if bld.env['COPY_HEADERS']:
-            bld.install_files(os.path.join(include_dir, 'lv2core'),
-                              bld.path.ant_glob('*.h'))
-        else:
-            bld.symlink_as(os.path.join(include_dir, 'lv2core'),
-                           os.path.relpath(bundle_dir, include_dir))
-
-def news(ctx):
-    path = ctx.path.abspath()
-    autowaf.write_news(APPNAME,
-                       glob.glob(os.path.join(path, '*.ttl')),
-                       os.path.join(path, 'NEWS'))
-
-def pre_dist(ctx):
-    # Write NEWS file in source directory
-    news(ctx)
-
-def post_dist(ctx):
-    # Delete generated NEWS file
-    try:
-        os.remove(os.path.join(ctx.path.abspath(), 'NEWS'))
-    except:
-        pass
diff --git a/lv2/lv2plug.in/ns/ext/midi/lv2-midi.doap.ttl b/lv2/midi/lv2-midi.doap.ttl
index 822e135..822e135 100644
--- a/lv2/lv2plug.in/ns/ext/midi/lv2-midi.doap.ttl
+++ b/lv2/midi/lv2-midi.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/midi/manifest.ttl b/lv2/midi/manifest.ttl
index 754028d..754028d 100644
--- a/lv2/lv2plug.in/ns/ext/midi/manifest.ttl
+++ b/lv2/midi/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/midi/midi.h b/lv2/midi/midi.h
index 79e3a83..79e3a83 100644
--- a/lv2/lv2plug.in/ns/ext/midi/midi.h
+++ b/lv2/midi/midi.h
diff --git a/lv2/lv2plug.in/ns/ext/midi/midi.ttl b/lv2/midi/midi.ttl
index 23e41b3..23e41b3 100644
--- a/lv2/lv2plug.in/ns/ext/midi/midi.ttl
+++ b/lv2/midi/midi.ttl
diff --git a/lv2/lv2plug.in/ns/ext/morph/lv2-morph.doap.ttl b/lv2/morph/lv2-morph.doap.ttl
index 533cf10..533cf10 100644
--- a/lv2/lv2plug.in/ns/ext/morph/lv2-morph.doap.ttl
+++ b/lv2/morph/lv2-morph.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/morph/manifest.ttl b/lv2/morph/manifest.ttl
index 40b0f2b..40b0f2b 100644
--- a/lv2/lv2plug.in/ns/ext/morph/manifest.ttl
+++ b/lv2/morph/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/morph/morph.h b/lv2/morph/morph.h
index 884af74..884af74 100644
--- a/lv2/lv2plug.in/ns/ext/morph/morph.h
+++ b/lv2/morph/morph.h
diff --git a/lv2/lv2plug.in/ns/ext/morph/morph.ttl b/lv2/morph/morph.ttl
index 2a2e9fc..2a2e9fc 100644
--- a/lv2/lv2plug.in/ns/ext/morph/morph.ttl
+++ b/lv2/morph/morph.ttl
diff --git a/lv2/lv2plug.in/ns/ext/options/lv2-options.doap.ttl b/lv2/options/lv2-options.doap.ttl
index d828360..d828360 100644
--- a/lv2/lv2plug.in/ns/ext/options/lv2-options.doap.ttl
+++ b/lv2/options/lv2-options.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/options/manifest.ttl b/lv2/options/manifest.ttl
index c0c3315..c0c3315 100644
--- a/lv2/lv2plug.in/ns/ext/options/manifest.ttl
+++ b/lv2/options/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/options/options.h b/lv2/options/options.h
index 433dd1c..c1dad83 100644
--- a/lv2/lv2plug.in/ns/ext/options/options.h
+++ b/lv2/options/options.h
@@ -28,8 +28,8 @@
 
 #include <stdint.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"
 
 #define LV2_OPTIONS_URI    "http://lv2plug.in/ns/ext/options"  ///< http://lv2plug.in/ns/ext/options
 #define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#"                 ///< http://lv2plug.in/ns/ext/options#
diff --git a/lv2/lv2plug.in/ns/ext/options/options.ttl b/lv2/options/options.ttl
index b0f752c..b0f752c 100644
--- a/lv2/lv2plug.in/ns/ext/options/options.ttl
+++ b/lv2/options/options.ttl
diff --git a/lv2/lv2plug.in/ns/ext/parameters/lv2-parameters.doap.ttl b/lv2/parameters/lv2-parameters.doap.ttl
index 3ff707c..3ff707c 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/lv2-parameters.doap.ttl
+++ b/lv2/parameters/lv2-parameters.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/parameters/manifest.ttl b/lv2/parameters/manifest.ttl
index d2ba8fa..d2ba8fa 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/manifest.ttl
+++ b/lv2/parameters/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/parameters/parameters.h b/lv2/parameters/parameters.h
index f81e78b..f81e78b 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/parameters.h
+++ b/lv2/parameters/parameters.h
diff --git a/lv2/lv2plug.in/ns/ext/parameters/parameters.ttl b/lv2/parameters/parameters.ttl
index f8ad2ab..f8ad2ab 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/parameters.ttl
+++ b/lv2/parameters/parameters.ttl
diff --git a/lv2/lv2plug.in/ns/ext/patch/lv2-patch.doap.ttl b/lv2/patch/lv2-patch.doap.ttl
index 34c091f..34c091f 100644
--- a/lv2/lv2plug.in/ns/ext/patch/lv2-patch.doap.ttl
+++ b/lv2/patch/lv2-patch.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/patch/manifest.ttl b/lv2/patch/manifest.ttl
index 9803a5d..9803a5d 100644
--- a/lv2/lv2plug.in/ns/ext/patch/manifest.ttl
+++ b/lv2/patch/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/patch/patch.h b/lv2/patch/patch.h
index fed6a87..fed6a87 100644
--- a/lv2/lv2plug.in/ns/ext/patch/patch.h
+++ b/lv2/patch/patch.h
diff --git a/lv2/lv2plug.in/ns/ext/patch/patch.ttl b/lv2/patch/patch.ttl
index 71c51a3..71c51a3 100644
--- a/lv2/lv2plug.in/ns/ext/patch/patch.ttl
+++ b/lv2/patch/patch.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/lv2-port-groups.doap.ttl b/lv2/port-groups/lv2-port-groups.doap.ttl
index 90848d2..90848d2 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/lv2-port-groups.doap.ttl
+++ b/lv2/port-groups/lv2-port-groups.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/manifest.ttl b/lv2/port-groups/manifest.ttl
index fa893c6..fa893c6 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/manifest.ttl
+++ b/lv2/port-groups/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h b/lv2/port-groups/port-groups.h
index a1bcd12..a1bcd12 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h
+++ b/lv2/port-groups/port-groups.h
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.ttl b/lv2/port-groups/port-groups.ttl
index 0681e42..0681e42 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.ttl
+++ b/lv2/port-groups/port-groups.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-props/lv2-port-props.doap.ttl b/lv2/port-props/lv2-port-props.doap.ttl
index b199d36..b199d36 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/lv2-port-props.doap.ttl
+++ b/lv2/port-props/lv2-port-props.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-props/manifest.ttl b/lv2/port-props/manifest.ttl
index 27f15c9..27f15c9 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/manifest.ttl
+++ b/lv2/port-props/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-props/port-props.h b/lv2/port-props/port-props.h
index ef2b64d..ef2b64d 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/port-props.h
+++ b/lv2/port-props/port-props.h
diff --git a/lv2/lv2plug.in/ns/ext/port-props/port-props.ttl b/lv2/port-props/port-props.ttl
index f27f51e..f27f51e 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/port-props.ttl
+++ b/lv2/port-props/port-props.ttl
diff --git a/lv2/lv2plug.in/ns/ext/presets/lv2-presets.doap.ttl b/lv2/presets/lv2-presets.doap.ttl
index 5ba8867..5ba8867 100644
--- a/lv2/lv2plug.in/ns/ext/presets/lv2-presets.doap.ttl
+++ b/lv2/presets/lv2-presets.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/presets/manifest.ttl b/lv2/presets/manifest.ttl
index d1fc482..d1fc482 100644
--- a/lv2/lv2plug.in/ns/ext/presets/manifest.ttl
+++ b/lv2/presets/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/presets/presets.h b/lv2/presets/presets.h
index 7c51b1c..7c51b1c 100644
--- a/lv2/lv2plug.in/ns/ext/presets/presets.h
+++ b/lv2/presets/presets.h
diff --git a/lv2/lv2plug.in/ns/ext/presets/presets.ttl b/lv2/presets/presets.ttl
index da7e9bb..da7e9bb 100644
--- a/lv2/lv2plug.in/ns/ext/presets/presets.ttl
+++ b/lv2/presets/presets.ttl
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/lv2-resize-port.doap.ttl b/lv2/resize-port/lv2-resize-port.doap.ttl
index 49ab3cb..49ab3cb 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/lv2-resize-port.doap.ttl
+++ b/lv2/resize-port/lv2-resize-port.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/manifest.ttl b/lv2/resize-port/manifest.ttl
index 21569ae..21569ae 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/manifest.ttl
+++ b/lv2/resize-port/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h b/lv2/resize-port/resize-port.h
index 5eb47f2..5eb47f2 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h
+++ b/lv2/resize-port/resize-port.h
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.ttl b/lv2/resize-port/resize-port.ttl
index 6688f90..6688f90 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.ttl
+++ b/lv2/resize-port/resize-port.ttl
diff --git a/lv2/lv2plug.in/ns/ext/state/lv2-state.doap.ttl b/lv2/state/lv2-state.doap.ttl
index fd87a13..fd87a13 100644
--- a/lv2/lv2plug.in/ns/ext/state/lv2-state.doap.ttl
+++ b/lv2/state/lv2-state.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/state/manifest.ttl b/lv2/state/manifest.ttl
index 2a54874..2a54874 100644
--- a/lv2/lv2plug.in/ns/ext/state/manifest.ttl
+++ b/lv2/state/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/state/state.h b/lv2/state/state.h
index f2a4afa..ffc40d1 100644
--- a/lv2/lv2plug.in/ns/ext/state/state.h
+++ b/lv2/state/state.h
@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_STATE_URI    "http://lv2plug.in/ns/ext/state"  ///< http://lv2plug.in/ns/ext/state
 #define LV2_STATE_PREFIX LV2_STATE_URI "#"                 ///< http://lv2plug.in/ns/ext/state#
diff --git a/lv2/lv2plug.in/ns/ext/state/state.ttl b/lv2/state/state.ttl
index c86fea7..c86fea7 100644
--- a/lv2/lv2plug.in/ns/ext/state/state.ttl
+++ b/lv2/state/state.ttl
diff --git a/lv2/lv2plug.in/ns/ext/time/lv2-time.doap.ttl b/lv2/time/lv2-time.doap.ttl
index c380d46..c380d46 100644
--- a/lv2/lv2plug.in/ns/ext/time/lv2-time.doap.ttl
+++ b/lv2/time/lv2-time.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/time/manifest.ttl b/lv2/time/manifest.ttl
index 3a8bfee..3a8bfee 100644
--- a/lv2/lv2plug.in/ns/ext/time/manifest.ttl
+++ b/lv2/time/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/time/time.h b/lv2/time/time.h
index ec5007c..ec5007c 100644
--- a/lv2/lv2plug.in/ns/ext/time/time.h
+++ b/lv2/time/time.h
diff --git a/lv2/lv2plug.in/ns/ext/time/time.ttl b/lv2/time/time.ttl
index 13137af..13137af 100644
--- a/lv2/lv2plug.in/ns/ext/time/time.ttl
+++ b/lv2/time/time.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/ui/lv2-ui.doap.ttl b/lv2/ui/lv2-ui.doap.ttl
index 8b804b1..8b804b1 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/lv2-ui.doap.ttl
+++ b/lv2/ui/lv2-ui.doap.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/ui/manifest.ttl b/lv2/ui/manifest.ttl
index 384bf2e..384bf2e 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/manifest.ttl
+++ b/lv2/ui/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/ui/ui.h b/lv2/ui/ui.h
index 2c71df0..96fdbac 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/ui.h
+++ b/lv2/ui/ui.h
@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_UI_URI    "http://lv2plug.in/ns/extensions/ui"  ///< http://lv2plug.in/ns/extensions/ui
 #define LV2_UI_PREFIX LV2_UI_URI "#"                        ///< http://lv2plug.in/ns/extensions/ui#
diff --git a/lv2/lv2plug.in/ns/extensions/ui/ui.ttl b/lv2/ui/ui.ttl
index f0444b5..f0444b5 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/ui.ttl
+++ b/lv2/ui/ui.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/units/lv2-units.doap.ttl b/lv2/units/lv2-units.doap.ttl
index e81aa70..e81aa70 100644
--- a/lv2/lv2plug.in/ns/extensions/units/lv2-units.doap.ttl
+++ b/lv2/units/lv2-units.doap.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/units/manifest.ttl b/lv2/units/manifest.ttl
index 641f6a1..641f6a1 100644
--- a/lv2/lv2plug.in/ns/extensions/units/manifest.ttl
+++ b/lv2/units/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/units/units.h b/lv2/units/units.h
index 1debf60..1debf60 100644
--- a/lv2/lv2plug.in/ns/extensions/units/units.h
+++ b/lv2/units/units.h
diff --git a/lv2/lv2plug.in/ns/extensions/units/units.ttl b/lv2/units/units.ttl
index e40bef6..e40bef6 100644
--- a/lv2/lv2plug.in/ns/extensions/units/units.ttl
+++ b/lv2/units/units.ttl
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/lv2-uri-map.doap.ttl b/lv2/uri-map/lv2-uri-map.doap.ttl
index df0feb7..df0feb7 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/lv2-uri-map.doap.ttl
+++ b/lv2/uri-map/lv2-uri-map.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/manifest.ttl b/lv2/uri-map/manifest.ttl
index 87087b6..87087b6 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/manifest.ttl
+++ b/lv2/uri-map/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h b/lv2/uri-map/uri-map.h
index 12d52be..12d52be 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h
+++ b/lv2/uri-map/uri-map.h
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.ttl b/lv2/uri-map/uri-map.ttl
index 7f6b0e7..7f6b0e7 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.ttl
+++ b/lv2/uri-map/uri-map.ttl
diff --git a/lv2/lv2plug.in/ns/ext/urid/lv2-urid.doap.ttl b/lv2/urid/lv2-urid.doap.ttl
index b79545c..b79545c 100644
--- a/lv2/lv2plug.in/ns/ext/urid/lv2-urid.doap.ttl
+++ b/lv2/urid/lv2-urid.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/urid/manifest.ttl b/lv2/urid/manifest.ttl
index 19b5832..19b5832 100644
--- a/lv2/lv2plug.in/ns/ext/urid/manifest.ttl
+++ b/lv2/urid/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/urid/urid.h b/lv2/urid/urid.h
index c9ee2e0..c9ee2e0 100644
--- a/lv2/lv2plug.in/ns/ext/urid/urid.h
+++ b/lv2/urid/urid.h
diff --git a/lv2/lv2plug.in/ns/ext/urid/urid.ttl b/lv2/urid/urid.ttl
index 29b196a..29b196a 100644
--- a/lv2/lv2plug.in/ns/ext/urid/urid.ttl
+++ b/lv2/urid/urid.ttl
diff --git a/lv2/lv2plug.in/ns/ext/worker/lv2-worker.doap.ttl b/lv2/worker/lv2-worker.doap.ttl
index b01159b..b01159b 100644
--- a/lv2/lv2plug.in/ns/ext/worker/lv2-worker.doap.ttl
+++ b/lv2/worker/lv2-worker.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/worker/manifest.ttl b/lv2/worker/manifest.ttl
index 28c2129..28c2129 100644
--- a/lv2/lv2plug.in/ns/ext/worker/manifest.ttl
+++ b/lv2/worker/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/worker/worker.h b/lv2/worker/worker.h
index 66e51de..6926887 100644
--- a/lv2/lv2plug.in/ns/ext/worker/worker.h
+++ b/lv2/worker/worker.h
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_WORKER_URI    "http://lv2plug.in/ns/ext/worker"  ///< http://lv2plug.in/ns/ext/worker
 #define LV2_WORKER_PREFIX LV2_WORKER_URI "#"                 ///< http://lv2plug.in/ns/ext/worker#
diff --git a/lv2/lv2plug.in/ns/ext/worker/worker.ttl b/lv2/worker/worker.ttl
index 6b32742..6b32742 100644
--- a/lv2/lv2plug.in/ns/ext/worker/worker.ttl
+++ b/lv2/worker/worker.ttl