diff --git a/.cvsignore b/.cvsignore index 8b391d8..d8522cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vamp-plugin-sdk-1.1b.tar.gz +vamp-plugin-sdk-2.1.tar.gz diff --git a/sources b/sources index 6e6e813..bc1234d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aeda086f10227e6ca473f714ac025807 vamp-plugin-sdk-1.1b.tar.gz +13252077a73987dae72a9174e529b6b9 vamp-plugin-sdk-2.1.tar.gz diff --git a/vamp-plugin-sdk-1.1b-Makefile.patch b/vamp-plugin-sdk-1.1b-Makefile.patch deleted file mode 100644 index f9746cd..0000000 --- a/vamp-plugin-sdk-1.1b-Makefile.patch +++ /dev/null @@ -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" \ diff --git a/vamp-plugin-sdk-1.1b-gcc43.patch b/vamp-plugin-sdk-1.1b-gcc43.patch deleted file mode 100644 index 0036894..0000000 --- a/vamp-plugin-sdk-1.1b-gcc43.patch +++ /dev/null @@ -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 -- - 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 -+#include - #include - #include - #include ---- 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 - #include - --#include -- - namespace Vamp { - - /** diff --git a/vamp-plugin-sdk-2.0-gcc44.patch b/vamp-plugin-sdk-2.0-gcc44.patch new file mode 100644 index 0000000..c737a01 --- /dev/null +++ b/vamp-plugin-sdk-2.0-gcc44.patch @@ -0,0 +1,10 @@ +--- vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp.gcc44 2008-12-01 06:48:41.000000000 -0500 ++++ vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp 2009-02-08 00:31:38.751861057 -0500 +@@ -44,6 +44,7 @@ + using Vamp::RealTime; + + #include ++#include + + + class FixedTempoEstimator::D diff --git a/vamp-plugin-sdk-2.1-libdir.patch b/vamp-plugin-sdk-2.1-libdir.patch new file mode 100644 index 0000000..4c3f4f9 --- /dev/null +++ b/vamp-plugin-sdk-2.1-libdir.patch @@ -0,0 +1,22 @@ +--- vamp-plugin-sdk-2.1/Makefile.in.libdir 2009-09-24 14:05:26.000000000 +0200 ++++ vamp-plugin-sdk-2.1/Makefile.in 2010-06-03 18:18:18.404376697 +0200 +@@ -71,8 +71,8 @@ + INSTALL_API_HEADERS = $(INSTALL_PREFIX)/include/vamp + INSTALL_SDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-sdk + INSTALL_HOSTSDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-hostsdk +-INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/lib +-INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp ++INSTALL_SDK_LIBS = @libdir@ ++INSTALL_PLUGINS = $(INSTALL_SDK_LIBS)/vamp + INSTALL_BINARIES = $(INSTALL_PREFIX)/bin + + INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.1.0 +@@ -87,7 +87,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 + # diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index ef80caf..461ccb8 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,14 +1,16 @@ Name: vamp-plugin-sdk -Version: 1.1b -Release: 4%{?dist} +Version: 2.1 +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 +# https://sourceforge.net/tracker/?func=detail&aid=1884043&group_id=192001&atid=939644 +Patch0: %{name}-2.1-libdir.patch +# https://sourceforge.net/tracker/?func=detail&aid=1884030&group_id=192001&atid=939644 +Patch1: %{name}-2.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsndfile-devel @@ -39,26 +41,29 @@ developing static applications that use %{name}. %prep -%setup -q -n %{name}-v%{version} -%patch0 -p1 -b .mk -%patch1 -p1 -b .gcc43 +%setup -q +%patch0 -p1 -b .libdir +%patch1 -p1 -b .gcc44 +sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp +sed -i 's|/lib/|/%{_lib}/|g' src/vamp-hostsdk/PluginLoader.cpp %build -CXXFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install 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 {} ';' # create Makefile for examples cd examples -echo CXXFLAGS=$RPM_OPT_FLAGS -fpic >> Makefile +echo CXXFLAGS=$RPM_OPT_FLAGS -fpic >> Makefile-%{_arch} echo bundle: `ls *.o` >> Makefile echo -e "\t"g++ \$\(CXXFLAGS\) -shared -Wl,-Bsymbolic \ -o vamp-example-plugins.so \ @@ -71,6 +76,12 @@ echo -e "\t"-rm *.o *.so >> Makefile make clean +%check +# Scan shared libs for unpatched '/lib' strings to prevent issues +# on 64-bit multilib platforms. +[ $(strings ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.?|grep /lib|sed -e 's!/%{_lib}!/__FEDORA-LIB__!g'|grep -c /lib) -eq 0 ] + + %clean rm -rf $RPM_BUILD_ROOT @@ -84,10 +95,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README %{_libdir}/*.so.* +%{_libdir}/vamp %files devel %defattr(-,root,root,-) %doc examples +%{_bindir}/vamp-* %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -98,6 +111,32 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 28 2010 Michel Salim - 2.1-1 +- Update to 2.1 +- multilib fix: Makefile for examples is now arch-tagged + +* Sun Jul 26 2009 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Mar 31 2009 Michael Schwendt - 2.0-5 +- Add another sed libdir fix for PluginLoader.cpp (#469777) + plus a check section to scan for libdir issues + +* Wed Feb 25 2009 Fedora Release Engineering - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Feb 8 2009 Michel Salim - 2.0-3 +- Fix compilation problem with GCC 4.4 + +* Tue Dec 30 2008 Michel Salim - 2.0-2 +- More libdir fixes (bug #469777) + +* Sun Dec 14 2008 Michel Salim - 2.0-1 +- Update to 2.0 + +* Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 +- Update to 1.3 + * Thu Jan 31 2008 Michel Salim - 1.1b-4 - Add some #includes, needed due to GCC 4.3's header dependency cleanup