Use precise define names for LV2 version configure checks.

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index bbe94e15c28c440776a58c27459eeb84348a6d15..7a8054ff5c126720fc84d8748355836748eb1b64 100644 (file)
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -67,7 +67,7 @@
 #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/ext/patch/patch.h"
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_2_0
 #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
 #include "lv2/lv2plug.in/ns/ext/options/options.h"
 #endif
@@ -348,13 +348,13 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
        _features[6] = &_log_feature;
 
        unsigned n_features = 7;
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_2_0
        _features[n_features++] = &_def_state_feature;
 #endif
 
        lv2_atom_forge_init(&_impl->forge, _uri_map.urid_map());
 
-#ifdef HAVE_NEW_LV2
+#ifdef HAVE_LV2_1_2_0
        LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int);
        LV2_Options_Option options[] = {
                { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength),

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index f6ed6e649a2b5f1ae63b1c60224be6da77516d12..dd618f9bcd5be93503a57206e6cc8aeaa04ed694 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -265,8 +265,8 @@ def configure(conf):
     if Options.options.lv2:
         autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
                           atleast_version='1.0.0', mandatory=True)
-        autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2',
-                          atleast_version='1.0.15', mandatory=False)
+        autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
+                          atleast_version='1.2.0', 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',

diff --git a/msvc_extra_headers/ardourext/sys/targetsxs.h.input b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
index 29d380f4ad3b31ed46a5aa607ca137c9cb17e380..e508df083dd761af429ce52781d30dd067594ddd 100644 (file)
--- a/msvc_extra_headers/ardourext/sys/targetsxs.h.input
+++ b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
@@ -7,7 +7,7 @@
 #define LV2_SUPPORT   1
 #define HAVE_SUIL     1
 #define HAVE_LV2      1
-#define HAVE_NEW_LV2  1
+#define HAVE_LV2_1_2_0 1
 /* Comment out the above lines to build Mixbus without LV2 support */
 #endif