Mercurial > hg > vamp-plugin-sdk
changeset 332:f9e13bc35b3e
Bump up version to 2.3.1, add C-linkage symbols for library versions so autoconf can check them
| author | Chris Cannam |
|---|---|
| date | Fri, 25 May 2012 10:45:34 +0100 |
| parents | 9648ba9812d6 |
| children | ea5d9dbaeaf7 |
| files | CHANGELOG Makefile.in README build/update-version.sh configure.ac pkgconfig/vamp-hostsdk.pc.in pkgconfig/vamp-sdk.pc.in pkgconfig/vamp.pc.in src/vamp-hostsdk/acsymbols.c src/vamp-sdk/acsymbols.c vamp-sdk/PluginBase.h |
| diffstat | 11 files changed, 48 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Thu May 24 16:38:09 2012 +0100 +++ b/CHANGELOG Fri May 25 10:45:34 2012 +0100 @@ -1,3 +1,8 @@ + +Version 2.3.1, TBA (maintenance release): + + * Fix failure to open plugins from Unicode builds on Windows (thanks + RJ Ryan) Version 2.3, 2011-09-28 (minor feature release):
--- a/Makefile.in Thu May 24 16:38:09 2012 +0100 +++ b/Makefile.in Fri May 25 10:45:34 2012 +0100 @@ -138,7 +138,8 @@ SDK_OBJECTS = \ $(SDKSRCDIR)/PluginAdapter.o \ - $(SDKSRCDIR)/RealTime.o + $(SDKSRCDIR)/RealTime.o \ + $(SDKSRCDIR)/acsymbols.o HOSTSDK_OBJECTS = \ $(HOSTSDKSRCDIR)/PluginHostAdapter.o \ @@ -148,7 +149,8 @@ $(HOSTSDKSRCDIR)/PluginInputDomainAdapter.o \ $(HOSTSDKSRCDIR)/PluginLoader.o \ $(HOSTSDKSRCDIR)/PluginSummarisingAdapter.o \ - $(HOSTSDKSRCDIR)/PluginWrapper.o + $(HOSTSDKSRCDIR)/PluginWrapper.o \ + $(HOSTSDKSRCDIR)/acsymbols.o SDK_STATIC = \ ./libvamp-sdk.a
--- a/README Thu May 24 16:38:09 2012 +0100 +++ b/README Fri May 25 10:45:34 2012 +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.3 of the Vamp plugin Software Development Kit. +This is version 2.3.1 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
--- a/build/update-version.sh Thu May 24 16:38:09 2012 +0100 +++ b/build/update-version.sh Fri May 25 10:45:34 2012 +0100 @@ -3,14 +3,16 @@ usage() { echo "Usage: $0 <version>" echo " e.g. $0 2.2" + echo " e.g. $0 2.2.1" exit 2; } version=$1 [ -n "$version" ] || usage -major=${version%.*} -minor=${version#*.} +major=${version%%.*} # 2.3 -> 2, 2.3.1 -> 2 +minor=${version#*.} # 2.3 -> 3, 2.3.1 -> 3.1 +minor=${minor%.*} # 3 -> 3, 3.1 -> 3 sdkmajor=$major sdkminor=$minor @@ -18,9 +20,13 @@ hostmajor=$(($major+1)) # there has been one API change in a minor release hostminor=$minor +acs="`echo $version | tr '.' '_'`" + echo "Major version = $major, minor version = $minor" echo "SDK current = $sdkmajor, age = $sdkminor" echo "Host SDK current = $hostmajor, age = $hostminor" +echo "Version string = $version" +echo "acsymbols string = $acs" p="perl -i -p -e" @@ -82,4 +88,10 @@ $p 's/(Version:) .*/$1 '$version'/' $pc done -echo "Done, now check with e.g. svn diff -- and don't forget to update CHANGELOG" +$p 's/^$/\nextern void libvampsdk_v_'$acs'_present(void) { }/' \ + src/vamp-sdk/acsymbols.c + +$p 's/^$/\nextern void libvamphostsdk_v_'$acs'_present(void) { }/' \ + src/vamp-hostsdk/acsymbols.c + +echo "Done, now check with e.g. hg diff -- and don't forget to update CHANGELOG"
--- a/configure.ac Thu May 24 16:38:09 2012 +0100 +++ b/configure.ac Fri May 25 10:45:34 2012 +0100 @@ -1,5 +1,5 @@ -AC_INIT(vamp-plugin-sdk, 2.3, cannam@all-day-breakfast.com) +AC_INIT(vamp-plugin-sdk, 2.3.1, cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(vamp/vamp.h) AC_PROG_CXX
--- a/pkgconfig/vamp-hostsdk.pc.in Thu May 24 16:38:09 2012 +0100 +++ b/pkgconfig/vamp-hostsdk.pc.in Fri May 25 10:45:34 2012 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-hostsdk -Version: 2.3 +Version: 2.3.1 Description: Development library for Vamp audio analysis plugin hosts Libs: -L${libdir} -lvamp-hostsdk -ldl Cflags: -I${includedir}
--- a/pkgconfig/vamp-sdk.pc.in Thu May 24 16:38:09 2012 +0100 +++ b/pkgconfig/vamp-sdk.pc.in Fri May 25 10:45:34 2012 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp-sdk -Version: 2.3 +Version: 2.3.1 Description: Development library for Vamp audio analysis plugins Libs: -L${libdir} -lvamp-sdk Cflags: -I${includedir}
--- a/pkgconfig/vamp.pc.in Thu May 24 16:38:09 2012 +0100 +++ b/pkgconfig/vamp.pc.in Fri May 25 10:45:34 2012 +0100 @@ -4,7 +4,7 @@ includedir=${prefix}/include Name: vamp -Version: 2.3 +Version: 2.3.1 Description: An API for audio analysis and feature extraction plugins Libs: Cflags: -I${includedir}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/vamp-hostsdk/acsymbols.c Fri May 25 10:45:34 2012 +0100 @@ -0,0 +1,9 @@ +/* These stubs are provided so that autoconf can check library + * versions using C symbols only */ + +extern void libvamphostsdk_v_2_3_1_present(void) { } +extern void libvamphostsdk_v_2_3_present(void) { } +extern void libvamphostsdk_v_2_2_1_present(void) { } +extern void libvamphostsdk_v_2_2_present(void) { } +extern void libvamphostsdk_v_2_1_present(void) { } +extern void libvamphostsdk_v_2_0_present(void) { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/vamp-sdk/acsymbols.c Fri May 25 10:45:34 2012 +0100 @@ -0,0 +1,9 @@ +/* These stubs are provided so that autoconf can check library + * versions using C symbols only */ + +extern void libvampsdk_v_2_3_1_present(void) { } +extern void libvampsdk_v_2_3_present(void) { } +extern void libvampsdk_v_2_2_1_present(void) { } +extern void libvampsdk_v_2_2_present(void) { } +extern void libvampsdk_v_2_1_present(void) { } +extern void libvampsdk_v_2_0_present(void) { }
--- a/vamp-sdk/PluginBase.h Thu May 24 16:38:09 2012 +0100 +++ b/vamp-sdk/PluginBase.h Fri May 25 10:45:34 2012 +0100 @@ -40,7 +40,7 @@ #include <string> #include <vector> -#define VAMP_SDK_VERSION "2.3" +#define VAMP_SDK_VERSION "2.3.1" #define VAMP_SDK_MAJOR_VERSION 2 #define VAMP_SDK_MINOR_VERSION 3