- Update to 1.3

17 years ago · 4ea15c0c8b
parent 220dea135f
commit 4ea15c0c8b
6 changed files with 54 additions and 116 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-vamp-plugin-sdk-1.1b.tar.gz
+vamp-plugin-sdk-1.3.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-aeda086f10227e6ca473f714ac025807  vamp-plugin-sdk-1.1b.tar.gz
+d0bc2c066776310631a02cd192735da7  vamp-plugin-sdk-1.3.tar.gz
--- a/vamp-plugin-sdk-1.1b-Makefile.patch
+++ b/vamp-plugin-sdk-1.1b-Makefile.patch
@ -1,74 +0,0 @@
--- vamp-plugin-sdk-v1.1b/Makefile.orig	2007-10-19 08:52:34.000000000 -0400
-+++ vamp-plugin-sdk-v1.1b/Makefile	2008-01-28 14:13:24.000000000 -0500
-@@ -28,7 +28,7 @@
- 
- # Compile flags
- #
-CXXFLAGS	:= $(CXXFLAGS) -O2 -Wall -I. -fpic
-+CXXFLAGS	:= $(CXXFLAGS) -I. -fpic
- 
- # ar, ranlib
- #
-@@ -57,11 +57,13 @@
- # editing for non-Linux platforms.  Of course you don't necessarily
- # have to use "make install".
- #
-INSTALL_PREFIX	 	  := /usr
-+PREFIX                    := /usr
-+LIBDIR                    := /lib
-+INSTALL_PREFIX	 	  := $(DESTDIR)$(PREFIX)
- INSTALL_API_HEADERS	  := $(INSTALL_PREFIX)/include/vamp
- INSTALL_SDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk
- INSTALL_HOSTEXT_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk/hostext
-INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)/lib
-+INSTALL_SDK_LIBS	  := $(DESTDIR)$(LIBDIR)
- 
- INSTALL_SDK_LIBNAME	  := libvamp-sdk.so.1.1.0
- INSTALL_SDK_LINK_ABI	  := libvamp-sdk.so.1
-@@ -75,7 +77,7 @@
- INSTALL_HOSTSDK_STATIC    := libvamp-hostsdk.a
- INSTALL_HOSTSDK_LA        := libvamp-hostsdk.la
- 
-INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)/lib/pkgconfig
-+INSTALL_PKGCONFIG	  := $(INSTALL_SDK_LIBS)/pkgconfig
- 
- # Flags required to tell the compiler to create a dynamically loadable object
- #
-@@ -212,14 +214,14 @@
- 		mkdir -p $(INSTALL_HOSTEXT_HEADERS)
- 		mkdir -p $(INSTALL_SDK_LIBS)
- 		mkdir -p $(INSTALL_PKGCONFIG)
-		cp $(API_HEADERS) $(INSTALL_API_HEADERS)
-		cp $(SDK_HEADERS) $(INSTALL_SDK_HEADERS)
-		cp $(HOSTSDK_HEADERS) $(INSTALL_SDK_HEADERS)
-		cp $(HOSTEXT_HEADERS) $(INSTALL_HOSTEXT_HEADERS)
-		cp $(SDK_STATIC) $(INSTALL_SDK_LIBS)
-		cp $(HOSTSDK_STATIC) $(INSTALL_SDK_LIBS)
-		cp $(SDK_DYNAMIC) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME)
-		cp $(HOSTSDK_DYNAMIC) $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME)
-+		cp -p $(API_HEADERS) $(INSTALL_API_HEADERS)
-+		cp -p $(SDK_HEADERS) $(INSTALL_SDK_HEADERS)
-+		cp -p $(HOSTSDK_HEADERS) $(INSTALL_SDK_HEADERS)
-+		cp -p $(HOSTEXT_HEADERS) $(INSTALL_HOSTEXT_HEADERS)
-+		cp -p $(SDK_STATIC) $(INSTALL_SDK_LIBS)
-+		cp -p $(HOSTSDK_STATIC) $(INSTALL_SDK_LIBS)
-+		cp -p $(SDK_DYNAMIC) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME)
-+		cp -p $(HOSTSDK_DYNAMIC) $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME)
- 		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
- 		ln -s $(INSTALL_SDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
- 		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
-@@ -228,11 +230,11 @@
- 		ln -s $(INSTALL_SDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
- 		rm -f $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
- 		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(APIDIR)/vamp.pc.in \
-+		sed "s,%PREFIX%,$(PREFIX)," $(APIDIR)/vamp.pc.in \
- 		> $(INSTALL_PKGCONFIG)/vamp.pc
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(SDKDIR)/vamp-sdk.pc.in \
-+		sed "s,%PREFIX%,$(PREFIX)," $(SDKDIR)/vamp-sdk.pc.in \
- 		> $(INSTALL_PKGCONFIG)/vamp-sdk.pc
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(SDKDIR)/vamp-hostsdk.pc.in \
-+		sed "s,%PREFIX%,$(PREFIX)," $(SDKDIR)/vamp-hostsdk.pc.in \
- 		> $(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
- 		sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \
- 		    -e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \
--- a/vamp-plugin-sdk-1.1b-gcc43.patch
+++ b/vamp-plugin-sdk-1.1b-gcc43.patch
@ -1,33 +0,0 @@
--- vamp-plugin-sdk-v1.1b/vamp-sdk/PluginAdapter.h.gcc43	2007-10-19 08:52:33.000000000 -0400
-+++ vamp-plugin-sdk-v1.1b/vamp-sdk/PluginAdapter.h	2008-01-31 11:26:58.000000000 -0500
-@@ -41,8 +41,6 @@
- 
- #include "Plugin.h"
- 
-#include <map>
-
- namespace Vamp {
- 
- /**
--- vamp-plugin-sdk-v1.1b/vamp-sdk/Plugin.h.gcc43	2007-10-19 08:52:33.000000000 -0400
-+++ vamp-plugin-sdk-v1.1b/vamp-sdk/Plugin.h	2008-01-31 11:20:46.000000000 -0500
-@@ -40,6 +40,8 @@
- #include "PluginBase.h"
- #include "RealTime.h"
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <string>
- #include <vector>
- #include <map>
--- vamp-plugin-sdk-v1.1b/vamp-sdk/PluginHostAdapter.h.gcc43	2007-10-19 08:52:33.000000000 -0400
-+++ vamp-plugin-sdk-v1.1b/vamp-sdk/PluginHostAdapter.h	2008-01-31 11:17:59.000000000 -0500
-@@ -40,8 +40,6 @@
- #include <vamp/vamp.h>
- #include <vamp-sdk/Plugin.h>
- 
-#include <vector>
-
- namespace Vamp {
- 
- /**
--- a/vamp-plugin-sdk-1.3-mk.patch
+++ b/vamp-plugin-sdk-1.3-mk.patch
@ -0,0 +1,44 @@
+--- vamp-plugin-sdk-1.3/Makefile.mk	2008-07-09 06:42:49.000000000 -0400
+++ vamp-plugin-sdk-1.3/Makefile	2008-07-17 18:21:02.000000000 -0400
+@@ -28,7 +28,7 @@
+ 
+ # Compile flags
+ #
+-CXXFLAGS	:= $(CXXFLAGS) -O2 -Wall -I. -fPIC
+CXXFLAGS	:= $(CXXFLAGS) -I. -fPIC
+ 
+ # ar, ranlib
+ #
+@@ -40,8 +40,8 @@
+ # because our plugin exposes only a C API so there are no boundary
+ # compatibility problems.)
+ #
+-#PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a
+-PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a)
+PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a
+#PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a)
+ 
+ # File extension for a dynamically loadable object
+ #
+@@ -58,10 +58,11 @@
+ # have to use "make install".
+ #
+ INSTALL_PREFIX	 	  := /usr/local
+LIB                       := /lib
+ INSTALL_API_HEADERS	  := $(INSTALL_PREFIX)/include/vamp
+ INSTALL_SDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk
+ INSTALL_HOSTEXT_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk/hostext
+-INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)/lib
+INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)$(LIB)
+ 
+ INSTALL_SDK_LIBNAME	  := libvamp-sdk.so.1.1.1
+ INSTALL_SDK_LINK_ABI	  := libvamp-sdk.so.1
+@@ -75,7 +76,7 @@
+ INSTALL_HOSTSDK_STATIC    := libvamp-hostsdk.a
+ INSTALL_HOSTSDK_LA        := libvamp-hostsdk.la
+ 
+-INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)/lib/pkgconfig
+INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)$(LIB)/pkgconfig
+ 
+ # Flags required to tell the compiler to create a dynamically loadable object
+ #
--- a/vamp-plugin-sdk.spec
+++ b/vamp-plugin-sdk.spec
@ -1,14 +1,13 @@
 Name:           vamp-plugin-sdk
-Version:        1.1b
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        An API for audio analysis and feature extraction plugins

 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.vamp-plugins.org/
 Source0:        http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-%{version}.tar.gz
-Patch0:         %{name}-1.1b-Makefile.patch
-Patch1:         %{name}-1.1b-gcc43.patch
+Patch0:         %{name}-1.3-mk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  libsndfile-devel
@ -39,9 +38,8 @@ developing static applications that use %{name}.


 %prep
-%setup -q -n %{name}-v%{version}
+%setup -q
 %patch0 -p1 -b .mk
-%patch1 -p1 -b .gcc43


 %build
@ -52,7 +50,7 @@ CXXFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 # fix libdir
 find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';'
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL_PREFIX=%{_prefix} LIB=/%{_lib}

 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'

@ -98,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Thu Jul 17 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.3-1
+- Update to 1.3
+
 * Thu Jan 31 2008 Michel Salim <michel.sylvan@gmail.com> - 1.1b-4
 - Add some #includes, needed due to GCC 4.3's header dependency cleanup