# HG changeset patch # User Chris Cannam # Date 1364462171 0 # Node ID dc40fff9f20b91955e69d64b3fc52d8bda59d7f6 # Parent 8037a36dcf9ecc4e92c42639d2e9d6607f181c3b Bump version to 2.5 diff -r 8037a36dcf9e -r dc40fff9f20b Makefile.in --- a/Makefile.in Wed Mar 27 16:50:19 2013 +0000 +++ b/Makefile.in Thu Mar 28 09:16:11 2013 +0000 @@ -77,13 +77,13 @@ INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp INSTALL_BINARIES = $(INSTALL_PREFIX)/bin -INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.4.0 +INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.5.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.4.0 +INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.so.3.5.0 INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.so.3 INSTALL_HOSTSDK_LINK_DEV = libvamp-hostsdk.so INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a diff -r 8037a36dcf9e -r dc40fff9f20b README --- a/README Wed Mar 27 16:50:19 2013 +0000 +++ b/README Thu Mar 28 09:16:11 2013 +0000 @@ -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.4 of the Vamp plugin Software Development Kit. +This is version 2.5 of the Vamp plugin Software Development Kit. Plugins and hosts built with this SDK are binary compatible with those built using version 1.0 of the SDK, with certain restrictions. See diff -r 8037a36dcf9e -r dc40fff9f20b build/Doxyfile --- a/build/Doxyfile Wed Mar 27 16:50:19 2013 +0000 +++ b/build/Doxyfile Thu Mar 28 09:16:11 2013 +0000 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.4 +PROJECT_NUMBER = 2.5 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -r 8037a36dcf9e -r dc40fff9f20b build/libvamp-hostsdk.la.in --- a/build/libvamp-hostsdk.la.in Wed Mar 27 16:50:19 2013 +0000 +++ b/build/libvamp-hostsdk.la.in Thu Mar 28 09:16:11 2013 +0000 @@ -3,7 +3,7 @@ old_library='%STATIC%' dependency_libs='' current=3 -age=4 +age=5 revision=0 installed=yes libdir='%LIBS%' diff -r 8037a36dcf9e -r dc40fff9f20b build/libvamp-sdk.la.in --- a/build/libvamp-sdk.la.in Wed Mar 27 16:50:19 2013 +0000 +++ b/build/libvamp-sdk.la.in Thu Mar 28 09:16:11 2013 +0000 @@ -3,7 +3,7 @@ old_library='%STATIC%' dependency_libs='' current=2 -age=4 +age=5 revision=0 installed=yes libdir='%LIBS%' diff -r 8037a36dcf9e -r dc40fff9f20b configure.ac --- a/configure.ac Wed Mar 27 16:50:19 2013 +0000 +++ b/configure.ac Thu Mar 28 09:16:11 2013 +0000 @@ -1,5 +1,5 @@ -AC_INIT(vamp-plugin-sdk, 2.4, cannam@all-day-breakfast.com) +AC_INIT(vamp-plugin-sdk, 2.5, cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(vamp/vamp.h) AC_PROG_CXX diff -r 8037a36dcf9e -r dc40fff9f20b pkgconfig/vamp-hostsdk.pc.in --- a/pkgconfig/vamp-hostsdk.pc.in Wed Mar 27 16:50:19 2013 +0000 +++ b/pkgconfig/vamp-hostsdk.pc.in Thu Mar 28 09:16:11 2013 +0000 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-hostsdk -Version: 2.4 +Version: 2.5 Description: Development library for Vamp audio analysis plugin hosts Libs: -L${libdir} -lvamp-hostsdk -ldl Cflags: -I${includedir} diff -r 8037a36dcf9e -r dc40fff9f20b pkgconfig/vamp-sdk.pc.in --- a/pkgconfig/vamp-sdk.pc.in Wed Mar 27 16:50:19 2013 +0000 +++ b/pkgconfig/vamp-sdk.pc.in Thu Mar 28 09:16:11 2013 +0000 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-sdk -Version: 2.4 +Version: 2.5 Description: Development library for Vamp audio analysis plugins Libs: -L${libdir} -lvamp-sdk Cflags: -I${includedir} diff -r 8037a36dcf9e -r dc40fff9f20b pkgconfig/vamp.pc.in --- a/pkgconfig/vamp.pc.in Wed Mar 27 16:50:19 2013 +0000 +++ b/pkgconfig/vamp.pc.in Thu Mar 28 09:16:11 2013 +0000 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp -Version: 2.4 +Version: 2.5 Description: An API for audio analysis and feature extraction plugins Libs: Cflags: -I${includedir} diff -r 8037a36dcf9e -r dc40fff9f20b src/vamp-hostsdk/PluginHostAdapter.cpp --- a/src/vamp-hostsdk/PluginHostAdapter.cpp Wed Mar 27 16:50:19 2013 +0000 +++ b/src/vamp-hostsdk/PluginHostAdapter.cpp Thu Mar 28 09:16:11 2013 +0000 @@ -37,7 +37,7 @@ #include #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 4 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 5 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8037a36dcf9e -r dc40fff9f20b src/vamp-hostsdk/acsymbols.c --- a/src/vamp-hostsdk/acsymbols.c Wed Mar 27 16:50:19 2013 +0000 +++ b/src/vamp-hostsdk/acsymbols.c Thu Mar 28 09:16:11 2013 +0000 @@ -1,6 +1,7 @@ /* These stubs are provided so that autoconf can check library * versions using C symbols only */ +extern void libvamphostsdk_v_2_5_present(void) { } extern void libvamphostsdk_v_2_4_present(void) { } extern void libvamphostsdk_v_2_3_1_present(void) { } extern void libvamphostsdk_v_2_3_present(void) { } diff -r 8037a36dcf9e -r dc40fff9f20b src/vamp-sdk/FFT.cpp --- a/src/vamp-sdk/FFT.cpp Wed Mar 27 16:50:19 2013 +0000 +++ b/src/vamp-sdk/FFT.cpp Thu Mar 28 09:16:11 2013 +0000 @@ -38,7 +38,7 @@ #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 4 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 5 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8037a36dcf9e -r dc40fff9f20b src/vamp-sdk/PluginAdapter.cpp --- a/src/vamp-sdk/PluginAdapter.cpp Wed Mar 27 16:50:19 2013 +0000 +++ b/src/vamp-sdk/PluginAdapter.cpp Thu Mar 28 09:16:11 2013 +0000 @@ -39,7 +39,7 @@ #include #include -#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 4 ) +#if ( VAMP_SDK_MAJOR_VERSION != 2 || VAMP_SDK_MINOR_VERSION != 5 ) #error Unexpected version of Vamp SDK header included #endif diff -r 8037a36dcf9e -r dc40fff9f20b src/vamp-sdk/acsymbols.c --- a/src/vamp-sdk/acsymbols.c Wed Mar 27 16:50:19 2013 +0000 +++ b/src/vamp-sdk/acsymbols.c Thu Mar 28 09:16:11 2013 +0000 @@ -1,6 +1,7 @@ /* These stubs are provided so that autoconf can check library * versions using C symbols only */ +extern void libvampsdk_v_2_5_present(void) { } extern void libvampsdk_v_2_4_present(void) { } extern void libvampsdk_v_2_3_1_present(void) { } extern void libvampsdk_v_2_3_present(void) { } diff -r 8037a36dcf9e -r dc40fff9f20b vamp-hostsdk/hostguard.h --- a/vamp-hostsdk/hostguard.h Wed Mar 27 16:50:19 2013 +0000 +++ b/vamp-hostsdk/hostguard.h Thu Mar 28 09:16:11 2013 +0000 @@ -43,9 +43,9 @@ #define _VAMP_IN_HOSTSDK -#define VAMP_SDK_VERSION "2.4" +#define VAMP_SDK_VERSION "2.5" #define VAMP_SDK_MAJOR_VERSION 2 -#define VAMP_SDK_MINOR_VERSION 4 +#define VAMP_SDK_MINOR_VERSION 5 #ifdef _VAMP_NO_HOST_NAMESPACE #define _VAMP_SDK_HOSTSPACE_BEGIN(h) diff -r 8037a36dcf9e -r dc40fff9f20b vamp-sdk/plugguard.h --- a/vamp-sdk/plugguard.h Wed Mar 27 16:50:19 2013 +0000 +++ b/vamp-sdk/plugguard.h Thu Mar 28 09:16:11 2013 +0000 @@ -71,9 +71,9 @@ #define _VAMP_IN_PLUGINSDK 1 -#define VAMP_SDK_VERSION "2.4" +#define VAMP_SDK_VERSION "2.5" #define VAMP_SDK_MAJOR_VERSION 2 -#define VAMP_SDK_MINOR_VERSION 4 +#define VAMP_SDK_MINOR_VERSION 5 #ifdef _VAMP_NO_PLUGIN_NAMESPACE #define _VAMP_SDK_PLUGSPACE_BEGIN(h)