ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Replace check for LV2 1.17.2 with 1.18.0 

LV2 1.17.2 was a development version at the time.  Now that the release has
been out for a while, it's better to depend on release versions to avoid
confusing people with versions that "don't exist".
This commit is contained in:
David Robillard 2022-08-04 16:34:45 -04:00
parent f2958e7e5e
commit 5904eaae34
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Doxyfile
View File

@ -2066,7 +2066,7 @@ PREDEFINED = \
HAVE_LOCALTIME_R=1 \ HAVE_LOCALTIME_R=1 \
HAVE_LRDF=1 \ HAVE_LRDF=1 \
HAVE_LV2=1 \ HAVE_LV2=1 \
HAVE_LV2_1_17_2=1 \ HAVE_LV2_1_18_0=1 \
HAVE_POSIX_MEMALIGN=1 \ HAVE_POSIX_MEMALIGN=1 \
HAVE_PULSEAUDIO=1 \ HAVE_PULSEAUDIO=1 \
HAVE_READLINE=1 \ HAVE_READLINE=1 \

6
gtk2_ardour/lv2_plugin_ui.cc
View File

@ -139,7 +139,7 @@ LV2PluginUI::set_path_property (int response,
active_parameter_requests.erase (desc.key); active_parameter_requests.erase (desc.key);
} }
#ifdef HAVE_LV2_1_17_2 #ifdef HAVE_LV2_1_18_0
LV2UI_Request_Value_Status LV2UI_Request_Value_Status
LV2PluginUI::request_value(void* handle, LV2PluginUI::request_value(void* handle,
LV2_URID key, LV2_URID key,
@ -336,7 +336,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
features[fi] = features_src[fi]; features[fi] = features_src[fi];
} }
#ifdef HAVE_LV2_1_17_2 #ifdef HAVE_LV2_1_18_0
_lv2ui_request_value.handle = this; _lv2ui_request_value.handle = this;
_lv2ui_request_value.request = LV2PluginUI::request_value; _lv2ui_request_value.request = LV2PluginUI::request_value;
_lv2ui_request_feature.URI = LV2_UI__requestValue; _lv2ui_request_feature.URI = LV2_UI__requestValue;
@ -376,7 +376,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
} }
features[fi] = NULL; features[fi] = NULL;
#ifdef HAVE_LV2_1_17_2 #ifdef HAVE_LV2_1_18_0
assert (fi == features_count + (is_external_ui ? 3 : 2)); assert (fi == features_count + (is_external_ui ? 3 : 2));
#else #else
assert (fi == features_count + (is_external_ui ? 2 : 1)); assert (fi == features_count + (is_external_ui ? 2 : 1));

4
gtk2_ardour/lv2_plugin_ui.h
View File

@ -84,7 +84,7 @@ private:
struct lv2_external_ui_host _external_ui_host; struct lv2_external_ui_host _external_ui_host;
LV2_Feature _external_ui_feature; LV2_Feature _external_ui_feature;
LV2_Feature _external_kxui_feature; LV2_Feature _external_kxui_feature;
#ifdef HAVE_LV2_1_17_2 #ifdef HAVE_LV2_1_18_0
LV2UI_Request_Value _lv2ui_request_value; LV2UI_Request_Value _lv2ui_request_value;
LV2_Feature _lv2ui_request_feature; LV2_Feature _lv2ui_request_feature;
#endif #endif
@ -115,7 +115,7 @@ private:
uint32_t port_index, uint32_t port_index,
bool grabbed); bool grabbed);
#ifdef HAVE_LV2_1_17_2 #ifdef HAVE_LV2_1_18_0
static LV2UI_Request_Value_Status static LV2UI_Request_Value_Status
request_value(void* handle, request_value(void* handle,
LV2_URID key, LV2_URID key,

4
libs/ardour/wscript
View File

@ -321,8 +321,8 @@ def configure(conf):
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
atleast_version='1.16.0', mandatory=True) atleast_version='1.16.0', mandatory=True)
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_17_2', autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_18_0',
atleast_version='1.17.2', mandatory=False) atleast_version='1.18.0', mandatory=False)
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
atleast_version='0.14.0', mandatory=True) atleast_version='0.14.0', mandatory=True)
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',

2
tools/doxy2json/ardourdoc.sh
View File

@ -16,7 +16,7 @@ time ./tools/doxy2json/doxy2json -j 4 \
-D PROGRAM_NAME=\"Ardour\" -D PROGRAM_VERSION=\"6\" -D LOCALEDIR=\"/\" \ -D PROGRAM_NAME=\"Ardour\" -D PROGRAM_VERSION=\"6\" -D LOCALEDIR=\"/\" \
-D ARCH_X86 -D CONFIG_ARCH=\"x86_64\" -D WAF_BUILD -D CANVAS_COMPATIBILITY=1 \ -D ARCH_X86 -D CONFIG_ARCH=\"x86_64\" -D WAF_BUILD -D CANVAS_COMPATIBILITY=1 \
-D HAVE_AUBIO=1 -D HAVE_ALSA=1 -D HAVE_GLIB=1 -D HAVE_LIBS_LUA=1 -D HAVE_XML=1 -D PTFORMAT=1 \ -D HAVE_AUBIO=1 -D HAVE_ALSA=1 -D HAVE_GLIB=1 -D HAVE_LIBS_LUA=1 -D HAVE_XML=1 -D PTFORMAT=1 \
-D HAVE_SAMPLERATE=1 -D HAVE_LV2=1 -D HAVE_LV2_1_17_2=1 -D HAVE_SERD=1 -D HAVE_SORD=1 -D HAVE_SRATOM=1 -D HAVE_LILV=1 -D HAVE_LV2_1_0_0=1 \ -D HAVE_SAMPLERATE=1 -D HAVE_LV2=1 -D HAVE_LV2_1_18_0=1 -D HAVE_SERD=1 -D HAVE_SORD=1 -D HAVE_SRATOM=1 -D HAVE_LILV=1 -D HAVE_LV2_1_0_0=1 \
-D HAVE_SUIL=1 -D LV2_SUPPORT=1 -D LV2_EXTENDED=1 -D HAVE_GTK=1 -D HAVE_LIBS_GTKMM2EXT=1 \ -D HAVE_SUIL=1 -D LV2_SUPPORT=1 -D LV2_EXTENDED=1 -D HAVE_GTK=1 -D HAVE_LIBS_GTKMM2EXT=1 \
-D HAVE_X11=1 -D LXVST_64BIT=1 -D LXVST_SUPPORT=1 -D HAVE_TAGLIB=1 -D HAVE_POSIX_MEMALIGN=1 -D HAVE_VAMPSDK=1 -D HAVE_VAMPHOSTSDK=1 -D HAVE_RUBBERBAND=1 -D ENABLE_NLS=1 \ -D HAVE_X11=1 -D LXVST_64BIT=1 -D LXVST_SUPPORT=1 -D HAVE_TAGLIB=1 -D HAVE_POSIX_MEMALIGN=1 -D HAVE_VAMPSDK=1 -D HAVE_VAMPHOSTSDK=1 -D HAVE_RUBBERBAND=1 -D ENABLE_NLS=1 \
-D HAVE_CURL=1 -D HAVE_LO=1 -D HAVE_LRDF=1 -D _VAMP_NO_PLUGIN_NAMESPACE=1 -D _VAMP_NO_HOST_NAMESPACE=1 \ -D HAVE_CURL=1 -D HAVE_LO=1 -D HAVE_LRDF=1 -D _VAMP_NO_PLUGIN_NAMESPACE=1 -D _VAMP_NO_HOST_NAMESPACE=1 \