Compare commits

...
Sign in to create a new pull request.

5 commits

7 changed files with 222 additions and 21 deletions

View file

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
vamp-plugin-sdk-1.1b.tar.gz

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: vamp-plugin-sdk
# $Id$
NAME := vamp-plugin-sdk
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View file

@ -0,0 +1 @@
aeda086f10227e6ca473f714ac025807 vamp-plugin-sdk-1.1b.tar.gz

View file

@ -0,0 +1,74 @@
--- 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" \

View file

@ -0,0 +1,33 @@
--- 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 {
/**

113
vamp-plugin-sdk.spec Normal file
View file

@ -0,0 +1,113 @@
Name: vamp-plugin-sdk
Version: 1.1b
Release: 4%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libsndfile-devel
#Requires:
%description
Vamp is an API for C and C++ plugins that process sampled audio data
to produce descriptive output (measurements or semantic observations).
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package static
Summary: Static libraries for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
The %{name}-static package contains library files for
developing static applications that use %{name}.
%prep
%setup -q -n %{name}-v%{version}
%patch0 -p1 -b .mk
%patch1 -p1 -b .gcc43
%build
CXXFLAGS=$RPM_OPT_FLAGS 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}
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# create Makefile for examples
cd examples
echo CXXFLAGS=$RPM_OPT_FLAGS -fpic >> Makefile
echo bundle: `ls *.o` >> Makefile
echo -e "\t"g++ \$\(CXXFLAGS\) -shared -Wl,-Bsymbolic \
-o vamp-example-plugins.so \
*.o \$\(pkg-config --libs vamp-sdk\) >> Makefile
echo `ls *.cpp`: >> Makefile
echo -e "\t"g++ \$\(CXXFLAGS\) -c $*.cpp >> Makefile
echo clean: >> Makefile
echo -e "\t"-rm *.o *.so >> Makefile
# clean directory up so we can package the sources
make clean
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING README
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%doc examples
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files static
%defattr(-,root,root,-)
%{_libdir}/*.a
%changelog
* 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
* Mon Jan 28 2008 Michel Salim <michel.sylvan@gmail.com> - 1.1b-3
- Add examples to -devel subpackage
- Fix .pc files
- Preserve timestamps when installing
* Sun Jan 27 2008 Michel Salim <michel.sylvan@gmail.com> - 1.1b-2
- Add missing build requirement on libsndfile-devel
* Wed Jan 16 2008 Michel Salim <michel.sylvan@gmail.com> - 1.1b-1
- Initial Fedora package