Accepting request 70980 from multimedia:libs

update to 2.2.1 and add docs + man pages (forwarded request 70979 from plater)

OBS-URL: https://build.opensuse.org/request/show/70980
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vamp-plugin-sdk?expand=0&rev=7
This commit is contained in:
Sascha Peilicke 2011-05-26 09:53:33 +00:00 committed by Git OBS Bridge
parent 1da568070e
commit b02ef2fe61
7 changed files with 139 additions and 56 deletions

2
baselibs.conf Normal file
View File

@ -0,0 +1,2 @@
libvamp-sdk2
libvamp-hostsdk3

View File

@ -1,10 +0,0 @@
--- 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 <cmath>
+#include <cstdio>
class FixedTempoEstimator::D

View File

@ -1,22 +1,24 @@
--- vamp-plugin-sdk-2.0/Makefile.in.libdir 2008-12-01 06:48:41.000000000 -0500 Index: Makefile.in
+++ vamp-plugin-sdk-2.0/Makefile.in 2008-12-14 17:04:13.000000000 -0500 ===================================================================
@@ -71,8 +71,8 @@ --- Makefile.in.orig 2011-04-05 14:30:52.000000000 +0200
INSTALL_API_HEADERS := $(INSTALL_PREFIX)/include/vamp +++ Makefile.in 2011-05-23 01:14:43.139988531 +0200
INSTALL_SDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-sdk @@ -71,8 +71,8 @@ INSTALL_PREFIX = @prefix@
INSTALL_HOSTSDK_HEADERS := $(INSTALL_PREFIX)/include/vamp-hostsdk INSTALL_API_HEADERS = $(INSTALL_PREFIX)/include/vamp
-INSTALL_SDK_LIBS := $(INSTALL_PREFIX)/lib INSTALL_SDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-sdk
-INSTALL_PLUGINS := $(INSTALL_PREFIX)/lib/vamp INSTALL_HOSTSDK_HEADERS = $(INSTALL_PREFIX)/include/vamp-hostsdk
+INSTALL_SDK_LIBS := @libdir@ -INSTALL_SDK_LIBS = $(INSTALL_PREFIX)/lib
+INSTALL_PLUGINS := $(INSTALL_SDK_LIBS)/vamp -INSTALL_PLUGINS = $(INSTALL_PREFIX)/lib/vamp
INSTALL_BINARIES := $(INSTALL_PREFIX)/bin +INSTALL_SDK_LIBS = @libdir@
+INSTALL_PLUGINS = $(INSTALL_SDK_LIBS)/vamp
INSTALL_BINARIES = $(INSTALL_PREFIX)/bin
INSTALL_SDK_LIBNAME := libvamp-sdk.so.2.0.0 INSTALL_SDK_LIBNAME = libvamp-sdk.so.2.2.0
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@ INSTALL_HOSTSDK_LINK_DEV = libvamp-host
INSTALL_HOSTSDK_STATIC := libvamp-hostsdk.a INSTALL_HOSTSDK_STATIC = libvamp-hostsdk.a
INSTALL_HOSTSDK_LA := libvamp-hostsdk.la INSTALL_HOSTSDK_LA = libvamp-hostsdk.la
-INSTALL_PKGCONFIG := $(INSTALL_PREFIX)/lib/pkgconfig -INSTALL_PKGCONFIG = $(INSTALL_PREFIX)/lib/pkgconfig
+INSTALL_PKGCONFIG := $(INSTALL_SDK_LIBS)/pkgconfig +INSTALL_PKGCONFIG = $(INSTALL_SDK_LIBS)/pkgconfig
# Flags required to tell the compiler to create a dynamically loadable object # Flags required to tell the compiler to create a dynamically loadable object
# #

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec4051658fd3e7dbdd0b568c0faa157f280deb73bd57e2530c43274d9e4a8adc
size 117847

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3b81dd8bdfd86eb60321c18ae378cb12f0811981baf3b6f7a01a9db185c2e20
size 130422

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon May 23 00:07:02 UTC 2011 - davejplater@gmail.com
- Update to version 2.2.1, split libs into libvamp-hostsdk3 and
libvamp-sdk2 sub packages and moved binaries into main package.
- Enabled api doc build and generate man pages with help2man.
- Upstream changes :
*Add ProcessTimestampMethod to PluginInputDomainAdapter,
offering the ability to decide how data buffering and
timestamping works for frequency-domain plugins (whose process
timestamps have to be at the centre of each processing block
rather than the start)
*Make PluginBufferingAdapter take into account any timestamp
shift introduced by a PluginInputDomainAdapter that it wraps.
*Fix crash in PluginAdapter when plugin library getDescriptor
fails on plugin construction.
*Add plugin skeleton files as starting point for new developers.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 7 22:21:50 CEST 2009 - mseben@suse.cz Tue Jul 7 22:21:50 CEST 2009 - mseben@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package vamp-plugin-sdk (Version 2.0) # spec file for package vamp-plugin-sdk
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,41 +19,58 @@
Name: vamp-plugin-sdk Name: vamp-plugin-sdk
Version: 2.0 Version: 2.2.1
Release: 1 Release: 1
Summary: An API for audio analysis and feature extraction plugins Summary: An API for audio analysis and feature extraction plugins
Group: System Environment/Libraries Group: Productivity/Multimedia/Sound/Utilities
License: BSD License: MIT
Url: http://www.vamp-plugins.org/ Url: http://www.vamp-plugins.org/
Source: %{name}-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/vamp/%{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch0: %{name}-2.0-libdir.patch Patch0: %{name}-2.0-libdir.patch
Patch1: %{name}-2.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ libsndfile-devel pkg-config BuildRequires: gcc-c++ libsndfile-devel pkg-config
#Requires: BuildRequires: doxygen graphviz help2man fdupes
%description %description
Vamp is an API for C and C++ plugins that process sampled audio data Vamp is an API for C and C++ plugins that process sampled audio data
to produce descriptive output (measurements or semantic observations). to produce descriptive output (measurements or semantic observations).
%package -n libvamp-hostsdk3
Summary: Library for Vamp audio analysis plugin hosts
Group: System/Libraries
%description -n libvamp-hostsdk3
Vamp is an API for C and C++ plugins that process sampled audio data
to produce descriptive output (measurements or semantic observations).
%package -n libvamp-sdk2
Summary: Library for Vamp audio analysis plugins
Group: System/Libraries
%description -n libvamp-sdk2
Vamp is an API for C and C++ plugins that process sampled audio data
to produce descriptive output (measurements or semantic observations).
%package devel %package devel
License: BSD
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libvamp-hostsdk3 = %{version}-%{release}
Requires: libvamp-sdk2 = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
%description devel %description devel
The %{name}-devel package contains libraries and header files for The vamp-plugin-sdk-devel package contains documentation examples and
developing applications that use %{name}. header files for developing applications that use vamp-plugin-sdk.
%prep %prep
%setup -q %setup -q -n %{name}-v%{version}
%patch0 -p1 -b .libdir %patch0 -b .libdir
%patch1 -p1 -b .gcc44
sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp
sed -i 's|/lib/|/%{_lib}/|g' src/vamp-hostsdk/PluginLoader.cpp sed -i 's|/lib/|/%{_lib}/|g' src/vamp-hostsdk/PluginLoader.cpp
%define buildir %{_builddir}/%{name}-v%{version}
%build %build
%configure %configure
@ -62,11 +79,44 @@ make %{?jobs:-j%jobs}
%install %install
# fix libdir # fix libdir
find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';' find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';'
make install DESTDIR=$RPM_BUILD_ROOT #INSTALL_PREFIX=%{_prefix} LIB=/%{_lib} # The #INSTALL_PREFIX
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' make install DESTDIR=%{buildroot}
#INSTALL_PREFIX=%%{_prefix} LIB=/%%{_lib}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
# Build api html docs
doxygen -u build/Doxyfile
doxygen build/Doxyfile
pushd doc/html
rm ftv2pnode.png && ln -s ftv2plastnode.png ftv2pnode.png
rm ftv2mlastnode.png && ln -s ftv2mnode.png ftv2mlastnode.png
rm ftv2doc.png && ln -s ftv2link.png ftv2doc.png
rm ftv2vertline.png && ln -s ftv2lastnode.png ftv2vertline.png
rm ftv2node.png && ln -s ftv2lastnode.png ftv2node.png
rm ftv2blank.png && ln -s ftv2lastnode.png ftv2blank.png
popd
# Build refman.pdf
#pushd latex && make all
#popd
%if 0%{?suse_version} >= 1140
# Generate man pages with help2man
mkdir -p %{buildroot}%{_mandir}/man1
pushd %{buildroot}%{_mandir}/man1
cp -v %{buildroot}%{_bindir}/* ./
help2man -N --no-discard-stderr \
-o vamp-rdf-template-generator.1 \
./vamp-rdf-template-generator
help2man -N --no-discard-stderr \
-o vamp-simple-host.1 \
./vamp-simple-host
rm vamp-simple-host vamp-rdf-template-generator
popd
%endif
# create Makefile for examples # create Makefile for examples
cd examples cd examples
echo CXXFLAGS=$RPM_OPT_FLAGS -fpic >> Makefile echo CXXFLAGS=%{optflags} -fpic >> Makefile
echo bundle: `ls *.o` >> Makefile echo bundle: `ls *.o` >> Makefile
echo -e "\t"g++ \$\(CXXFLAGS\) -shared -Wl,-Bsymbolic \ echo -e "\t"g++ \$\(CXXFLAGS\) -shared -Wl,-Bsymbolic \
-o vamp-example-plugins.so \ -o vamp-example-plugins.so \
@ -79,24 +129,45 @@ echo -e "\t"-rm *.o *.so >> Makefile
make clean make clean
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%post -p /sbin/ldconfig %post -n libvamp-hostsdk3 -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -n libvamp-hostsdk3 -p /sbin/ldconfig
%post -n libvamp-sdk2 -p /sbin/ldconfig
%postun -n libvamp-sdk2 -p /sbin/ldconfig
%files -n libvamp-hostsdk3
%defattr(-,root,root,-)
%{_libdir}/libvamp-hostsdk.so.3*
%files -n libvamp-sdk2
%defattr(-,root,root,-)
%{_libdir}/libvamp-sdk.so.2*
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING README %doc COPYING README
%exclude %{_libdir}/*.a %{_bindir}/vamp-rdf-template-generator
%{_libdir}/*.so.* %{_bindir}/vamp-simple-host
%if 0%{?suse_version} >= 1140
%{_mandir}/man1/vamp-rdf-template-generator.1.gz
%{_mandir}/man1/vamp-simple-host.1.gz
%endif
%dir %{_libdir}/vamp
%{_libdir}/vamp %{_libdir}/vamp
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc examples %doc rdf/doc doc/html examples
%{_bindir}/vamp-* %dir %{_includedir}/vamp
%{_includedir}/* %dir %{_includedir}/vamp-hostsdk
%dir %{_includedir}/vamp-sdk
%{_includedir}/vamp/*
%{_includedir}/vamp-hostsdk/*
%{_includedir}/vamp-sdk/*
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc