Add LV2 header include compatibility (1/2)
For whatever reason LV2 changes #include header locations in a micro version release and disables backwards compatibly by default.
This commit is contained in:
parent
b9e5621e03
commit
bf4decbfe7
|
@ -17,7 +17,11 @@
|
|||
#ifndef _ardour_lv2_extensions_h_
|
||||
#define _ardour_lv2_extensions_h_
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
@defgroup lv2inlinedisplay Inline-Display
|
||||
|
|
|
@ -27,8 +27,13 @@
|
|||
|
||||
#include <glibmm/threads.h>
|
||||
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#include <lv2/urid/urid.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
|
||||
#endif
|
||||
|
||||
#include "ardour/libardour_visibility.h"
|
||||
|
||||
|
|
|
@ -18,8 +18,13 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/event/event.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/atom/atom.h>
|
||||
#include <lv2/event/event.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/event/event.h>
|
||||
#endif
|
||||
|
||||
#include "lv2_evbuf.h"
|
||||
|
||||
|
|
|
@ -76,23 +76,43 @@
|
|||
|
||||
#include <lilv/lilv.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/log/log.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/port-props/port-props.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/time/time.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/worker/worker.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
|
||||
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
|
||||
#include "lv2/lv2plug.in/ns/extensions/units/units.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/port-groups/port-groups.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/parameters/parameters.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/options/options.h"
|
||||
#ifdef HAVE_LV2_1_18_1
|
||||
#include <lv2/atom/atom.h>
|
||||
#include <lv2/atom/forge.h>
|
||||
#include <lv2/log/log.h>
|
||||
#include <lv2/midi/midi.h>
|
||||
#include <lv2/port-props/port-props.h>
|
||||
#include <lv2/presets/presets.h>
|
||||
#include <lv2/state/state.h>
|
||||
#include <lv2/time/time.h>
|
||||
#include <lv2/worker/worker.h>
|
||||
#include <lv2/resize-port/resize-port.h>
|
||||
#include <lv2/ui/ui.h>
|
||||
#include <lv2/units/units.h>
|
||||
#include <lv2/patch/patch.h>
|
||||
#include <lv2/port-groups/port-groups.h>
|
||||
#include <lv2/parameters/parameters.h>
|
||||
#include <lv2/buf-size/buf-size.h>
|
||||
#include <lv2/options/options.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/log/log.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/port-props/port-props.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/time/time.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/resize-port/resize-port.h>
|
||||
#include <lv2/lv2plug.in/ns/extensions/ui/ui.h>
|
||||
#include <lv2/lv2plug.in/ns/extensions/units/units.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/patch/patch.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/port-groups/port-groups.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/parameters/parameters.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/options/options.h>
|
||||
#endif
|
||||
|
||||
#include "lv2_evbuf.h"
|
||||
|
||||
|
|
|
@ -312,6 +312,8 @@ def configure(conf):
|
|||
atleast_version='1.10.0', mandatory=False)
|
||||
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_17_2',
|
||||
atleast_version='1.17.2', mandatory=False)
|
||||
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_18_6',
|
||||
atleast_version='1.18.6', mandatory=False)
|
||||
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
|
||||
atleast_version='0.14.0', mandatory=True)
|
||||
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
|
||||
|
|
|
@ -28,7 +28,11 @@
|
|||
#include "ardour/lv2_extensions.h"
|
||||
#endif
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#endif
|
||||
|
||||
#define ACOMP_URI "urn:ardour:a-comp"
|
||||
#define ACOMP_STEREO_URI "urn:ardour:a-comp#stereo"
|
||||
|
|
|
@ -21,11 +21,19 @@
|
|||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/time/time.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#include <lv2/atom/atom.h>
|
||||
#include <lv2/time/time.h>
|
||||
#include <lv2/atom/forge.h>
|
||||
#include <lv2/urid/urid.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/time/time.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
|
||||
#endif
|
||||
|
||||
#define ADELAY_URI "urn:ardour:a-delay"
|
||||
|
||||
|
|
|
@ -35,7 +35,11 @@
|
|||
#define isfinite_local isfinite
|
||||
#endif
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#endif
|
||||
|
||||
#ifdef LV2_EXTENDED
|
||||
#include <cairo/cairo.h>
|
||||
|
|
|
@ -29,7 +29,11 @@
|
|||
#include "ardour/lv2_extensions.h"
|
||||
#endif
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/v2core/lv2.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#endif
|
||||
|
||||
#define AEXP_URI "urn:ardour:a-exp"
|
||||
#define AEXP_STEREO_URI "urn:ardour:a-exp#stereo"
|
||||
|
|
|
@ -44,6 +44,18 @@
|
|||
|
||||
#include "fluidsynth.h"
|
||||
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/atom/atom.h>
|
||||
#include <lv2/atom/forge.h>
|
||||
#include <lv2/atom/util.h>
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#include <lv2/log/logger.h>
|
||||
#include <lv2/midi/midi.h>
|
||||
#include <lv2/patch/patch.h>
|
||||
#include <lv2/state/state.h>
|
||||
#include <lv2/urid/urid.h>
|
||||
#include <lv2/worker/worker.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/util.h>
|
||||
|
@ -54,6 +66,7 @@
|
|||
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#endif
|
||||
|
||||
enum {
|
||||
FS_PORT_CONTROL = 0,
|
||||
|
|
|
@ -249,7 +249,11 @@ reverb (b_reverb* r,
|
|||
* LV2 wrapper
|
||||
*/
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
AR_INPUT0 = 0,
|
||||
|
|
|
@ -24,10 +24,17 @@
|
|||
#include <time.h>
|
||||
|
||||
/* LV2 */
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
|
||||
#ifdef HAVE_LV2_1_18_6
|
||||
#include <lv2/lv2core/lv2.h>
|
||||
#include <lv2/atom/atom.h>
|
||||
#include <lv2/urid/urid.h>
|
||||
#include <lv2/midi/midi.h>
|
||||
#else
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
|
||||
#endif
|
||||
|
||||
#define RSY_URI "https://community.ardour.org/node/7596"
|
||||
|
||||
|
|
Loading…
Reference in New Issue