rpms/vamp-plugin-sdk/EL-5 vamp-plugin-sdk-2.0-gcc44.patch, NONE, 1.1 vamp-plugin-sdk-2.1-libdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vamp-plugin-sdk.spec, 1.2, 1.3 vamp-plugin-sdk-1.1b-Makefile.patch, 1.1, NONE vamp-plugin-sdk-1.1b-gcc43.patch, 1.1, NONE
Michel Alexandre Salim
salimma at fedoraproject.org
Sat Jul 3 19:39:01 UTC 2010
Author: salimma
Update of /cvs/pkgs/rpms/vamp-plugin-sdk/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28179
Modified Files:
.cvsignore sources vamp-plugin-sdk.spec
Added Files:
vamp-plugin-sdk-2.0-gcc44.patch
vamp-plugin-sdk-2.1-libdir.patch
Removed Files:
vamp-plugin-sdk-1.1b-Makefile.patch
vamp-plugin-sdk-1.1b-gcc43.patch
Log Message:
Update EL-5 to 2.1
vamp-plugin-sdk-2.0-gcc44.patch:
FixedTempoEstimator.cpp | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE vamp-plugin-sdk-2.0-gcc44.patch ---
--- 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
vamp-plugin-sdk-2.1-libdir.patch:
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE vamp-plugin-sdk-2.1-libdir.patch ---
--- 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
#
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vamp-plugin-sdk/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 31 Jan 2008 14:25:41 -0000 1.2
+++ .cvsignore 3 Jul 2010 19:39:00 -0000 1.3
@@ -1 +1 @@
-vamp-plugin-sdk-1.1b.tar.gz
+vamp-plugin-sdk-2.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vamp-plugin-sdk/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 31 Jan 2008 14:25:41 -0000 1.2
+++ sources 3 Jul 2010 19:39:01 -0000 1.3
@@ -1 +1 @@
-aeda086f10227e6ca473f714ac025807 vamp-plugin-sdk-1.1b.tar.gz
+13252077a73987dae72a9174e529b6b9 vamp-plugin-sdk-2.1.tar.gz
Index: vamp-plugin-sdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vamp-plugin-sdk/EL-5/vamp-plugin-sdk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vamp-plugin-sdk.spec 31 Jan 2008 16:34:54 -0000 1.2
+++ vamp-plugin-sdk.spec 3 Jul 2010 19:39:01 -0000 1.3
@@ -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
%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 <salimma at fedoraproject.org> - 2.1-1
+- Update to 2.1
+- multilib fix: Makefile for examples is now arch-tagged
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 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 <rel-eng at lists.fedoraproject.org> - 2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 8 2009 Michel Salim <salimma at fedoraproject.org> - 2.0-3
+- Fix compilation problem with GCC 4.4
+
+* Tue Dec 30 2008 Michel Salim <salimma at fedoraproject.org> - 2.0-2
+- More libdir fixes (bug #469777)
+
+* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 2.0-1
+- Update to 2.0
+
+* Thu Jul 17 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.3-1
+- Update to 1.3
+
* Thu Jan 31 2008 Michel Salim <michel.sylvan at gmail.com> - 1.1b-4
- Add some #includes, needed due to GCC 4.3's header dependency cleanup
--- vamp-plugin-sdk-1.1b-Makefile.patch DELETED ---
--- vamp-plugin-sdk-1.1b-gcc43.patch DELETED ---
More information about the scm-commits
mailing list