# HG changeset patch # User Chris Cannam # Date 1463052594 -3600 # Node ID abdf03252c8a36c7ee31ecf944835b2df005fcd0 # Parent 8c45dee08a9565d9d95e3d3c47d86db47c546c9a Next version from this branch (if any) will be 2.7 diff -r 8c45dee08a95 -r abdf03252c8a Makefile.in --- a/Makefile.in Thu May 12 12:22:02 2016 +0100 +++ b/Makefile.in Thu May 12 12:29:54 2016 +0100 @@ -78,13 +78,13 @@ INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp INSTALL_BINARIES = $(INSTALL_PREFIX)/bin -INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.6.0 +INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.7.0 INSTALL_SDK_LINK_ABI = libvamp-sdk.so.2 INSTALL_SDK_LINK_DEV = libvamp-sdk.so INSTALL_SDK_STATIC = libvamp-sdk.a INSTALL_SDK_LA = libvamp-sdk.la -INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.so.3.6.0 +INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.so.3.7.0 INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.so.3 INSTALL_HOSTSDK_LINK_DEV = libvamp-hostsdk.so INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a @@ -113,7 +113,7 @@ HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -exported_symbols_list build/vamp-plugin.list - INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.6.0.dylib + INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.7.0.dylib INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.3.dylib # The OS X linker doesn't allow you to request static linkage when @@ -122,7 +122,7 @@ # dynamic, the static library will never be used. That's OK for the # host SDK, but we do want plugins to get static linkage of the plugin # SDK. So install the dynamic version under a different name. - INSTALL_SDK_LIBNAME = libvamp-sdk-dynamic.2.6.0.dylib + INSTALL_SDK_LIBNAME = libvamp-sdk-dynamic.2.7.0.dylib INSTALL_SDK_LINK_ABI = libvamp-sdk-dynamic.2.dylib endif diff -r 8c45dee08a95 -r abdf03252c8a README --- a/README Thu May 12 12:22:02 2016 +0100 +++ b/README Thu May 12 12:29:54 2016 +0100 @@ -9,7 +9,7 @@ Vamp is an API for C and C++ plugins that process sampled audio data to produce descriptive output (measurements or semantic observations). -This is version 2.6 of the Vamp plugin Software Development Kit. +This is version 2.7 of the Vamp plugin Software Development Kit. Plugins and hosts built with this SDK are binary compatible with those built using any version 2.0 or newer of the SDK. diff -r 8c45dee08a95 -r abdf03252c8a build/Doxyfile --- a/build/Doxyfile Thu May 12 12:22:02 2016 +0100 +++ b/build/Doxyfile Thu May 12 12:29:54 2016 +0100 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.6 +PROJECT_NUMBER = 2.7 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -r 8c45dee08a95 -r abdf03252c8a build/libvamp-hostsdk.la.in --- a/build/libvamp-hostsdk.la.in Thu May 12 12:22:02 2016 +0100 +++ b/build/libvamp-hostsdk.la.in Thu May 12 12:29:54 2016 +0100 @@ -8,7 +8,7 @@ old_library='%STATIC%' dependency_libs='' current=3 -age=6 +age=7 revision=0 installed=yes libdir='%LIBS%' diff -r 8c45dee08a95 -r abdf03252c8a build/libvamp-sdk.la.in --- a/build/libvamp-sdk.la.in Thu May 12 12:22:02 2016 +0100 +++ b/build/libvamp-sdk.la.in Thu May 12 12:29:54 2016 +0100 @@ -8,7 +8,7 @@ old_library='%STATIC%' dependency_libs='' current=2 -age=6 +age=7 revision=0 installed=yes libdir='%LIBS%' diff -r 8c45dee08a95 -r abdf03252c8a configure.ac --- a/configure.ac Thu May 12 12:22:02 2016 +0100 +++ b/configure.ac Thu May 12 12:29:54 2016 +0100 @@ -1,5 +1,5 @@ -AC_INIT(vamp-plugin-sdk, 2.6, cannam@all-day-breakfast.com) +AC_INIT(vamp-plugin-sdk, 2.7, cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(vamp/vamp.h) AC_PROG_CXX diff -r 8c45dee08a95 -r abdf03252c8a pkgconfig/vamp-hostsdk.pc.in --- a/pkgconfig/vamp-hostsdk.pc.in Thu May 12 12:22:02 2016 +0100 +++ b/pkgconfig/vamp-hostsdk.pc.in Thu May 12 12:29:54 2016 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-hostsdk -Version: 2.6 +Version: 2.7 Description: Development library for Vamp audio analysis plugin hosts Libs: -L${libdir} -lvamp-hostsdk -ldl Cflags: -I${includedir} diff -r 8c45dee08a95 -r abdf03252c8a pkgconfig/vamp-sdk.pc.in --- a/pkgconfig/vamp-sdk.pc.in Thu May 12 12:22:02 2016 +0100 +++ b/pkgconfig/vamp-sdk.pc.in Thu May 12 12:29:54 2016 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-sdk -Version: 2.6 +Version: 2.7 Description: Development library for Vamp audio analysis plugins Libs: -L${libdir} -lvamp-sdk Cflags: -I${includedir} diff -r 8c45dee08a95 -r abdf03252c8a pkgconfig/vamp.pc.in --- a/pkgconfig/vamp.pc.in Thu May 12 12:22:02 2016 +0100 +++ b/pkgconfig/vamp.pc.in Thu May 12 12:29:54 2016 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp -Version: 2.6 +Version: 2.7 Description: An API for audio analysis and feature extraction plugins Libs: Cflags: -I${includedir} diff -r 8c45dee08a95 -r abdf03252c8a src/vamp-hostsdk/PluginHostAdapter.cpp --- a/src/vamp-hostsdk/PluginHostAdapter.cpp Thu May 12 12:22:02 2016 +0100 +++ b/src/vamp-hostsdk/PluginHostAdapter.cpp Thu May 12 12:29:54 2016 +0100 @@ -37,7 +37,7 @@ #include #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 6 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 7 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8c45dee08a95 -r abdf03252c8a src/vamp-hostsdk/acsymbols.c --- a/src/vamp-hostsdk/acsymbols.c Thu May 12 12:22:02 2016 +0100 +++ b/src/vamp-hostsdk/acsymbols.c Thu May 12 12:29:54 2016 +0100 @@ -1,6 +1,7 @@ /* These stubs are provided so that autoconf can check library * versions using C symbols only */ +extern void libvamphostsdk_v_2_7_present(void) { } extern void libvamphostsdk_v_2_6_present(void) { } extern void libvamphostsdk_v_2_5_present(void) { } extern void libvamphostsdk_v_2_4_present(void) { } diff -r 8c45dee08a95 -r abdf03252c8a src/vamp-sdk/FFT.cpp --- a/src/vamp-sdk/FFT.cpp Thu May 12 12:22:02 2016 +0100 +++ b/src/vamp-sdk/FFT.cpp Thu May 12 12:29:54 2016 +0100 @@ -38,7 +38,7 @@ #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 6 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 7 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8c45dee08a95 -r abdf03252c8a src/vamp-sdk/PluginAdapter.cpp --- a/src/vamp-sdk/PluginAdapter.cpp Thu May 12 12:22:02 2016 +0100 +++ b/src/vamp-sdk/PluginAdapter.cpp Thu May 12 12:29:54 2016 +0100 @@ -39,7 +39,7 @@ #include #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 6 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 7 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8c45dee08a95 -r abdf03252c8a src/vamp-sdk/acsymbols.c --- a/src/vamp-sdk/acsymbols.c Thu May 12 12:22:02 2016 +0100 +++ b/src/vamp-sdk/acsymbols.c Thu May 12 12:29:54 2016 +0100 @@ -1,6 +1,7 @@ /* These stubs are provided so that autoconf can check library * versions using C symbols only */ +extern void libvampsdk_v_2_7_present(void) { } extern void libvampsdk_v_2_6_present(void) { } extern void libvampsdk_v_2_5_present(void) { } extern void libvampsdk_v_2_4_present(void) { } diff -r 8c45dee08a95 -r abdf03252c8a vamp-hostsdk/hostguard.h --- a/vamp-hostsdk/hostguard.h Thu May 12 12:22:02 2016 +0100 +++ b/vamp-hostsdk/hostguard.h Thu May 12 12:29:54 2016 +0100 @@ -43,9 +43,9 @@ #define _VAMP_IN_HOSTSDK -#define VAMP_SDK_VERSION "2.6" +#define VAMP_SDK_VERSION "2.7" #define VAMP_SDK_MAJOR_VERSION 2 -#define VAMP_SDK_MINOR_VERSION 6 +#define VAMP_SDK_MINOR_VERSION 7 #ifdef _VAMP_NO_HOST_NAMESPACE #define _VAMP_SDK_HOSTSPACE_BEGIN(h) diff -r 8c45dee08a95 -r abdf03252c8a vamp-sdk/plugguard.h --- a/vamp-sdk/plugguard.h Thu May 12 12:22:02 2016 +0100 +++ b/vamp-sdk/plugguard.h Thu May 12 12:29:54 2016 +0100 @@ -71,9 +71,9 @@ #define _VAMP_IN_PLUGINSDK 1 -#define VAMP_SDK_VERSION "2.6" +#define VAMP_SDK_VERSION "2.7" #define VAMP_SDK_MAJOR_VERSION 2 -#define VAMP_SDK_MINOR_VERSION 6 +#define VAMP_SDK_MINOR_VERSION 7 #ifdef _VAMP_NO_PLUGIN_NAMESPACE #define _VAMP_SDK_PLUGSPACE_BEGIN(h)