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:
Robin Gareus 2023-05-06 16:18:24 +02:00
parent b9e5621e03
commit bf4decbfe7
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
12 changed files with 113 additions and 33 deletions

View file

@ -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"

View file

@ -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"

View file

@ -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>

View file

@ -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"

View file

@ -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,

View file

@ -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,

View file

@ -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"