diff --git a/.gitignore b/.gitignore index 20b15b7..72461a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qm-vamp-plugins-1.7.tar.gz +/qm-vamp-plugins-1.7.1.tar.gz diff --git a/qm-vamp-plugins-build.patch b/qm-vamp-plugins-build.patch index d40d9f1..8676118 100644 --- a/qm-vamp-plugins-build.patch +++ b/qm-vamp-plugins-build.patch @@ -1,19 +1,22 @@ -Build flags cleanup, get flags from environment. +Author: František Dvořák +Date: Wed Nov 4 09:30:54 2015 +0100 -diff --git a/build/linux/Makefile.linux b/build/linux/Makefile.linux -index 9760a98..ebde843 100644 ---- a/build/linux/Makefile.linux -+++ b/build/linux/Makefile.linux -@@ -1,9 +1,11 @@ + Build flags cleanup, get flags from environment. + +diff --git a/Makefile b/Makefile +index 627aa60..8150ea5 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,11 @@ ++ATLAS_LIBS ?= -llapack -lcblas -CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -+ATLAS_LIBS ?= -llapack -lcblas -+ +CFLAGS := -DNDEBUG -fno-exceptions -fPIC -ffast-math -ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS $(ATLAS_CFLAGS) $(CFLAGS) + #CFLAGS := -g -Wall CXXFLAGS := $(CFLAGS) --LDFLAGS := -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lblas -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map +-LDFLAGS := -shared -Lbuild/linux/i686 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -llapack -lcblas -lf77blas -latlas -lgfortran -Wl,-Bdynamic -lpthread -Wl,-z,defs -Wl,--version-script=vamp-plugin.map +LDFLAGS := -shared -lqm-dsp -lvamp-sdk -lpthread -Wl,--version-script=vamp-plugin.map $(ATLAS_LIBS) $(LDFLAGS) PLUGIN_EXT := .so diff --git a/qm-vamp-plugins-unbundle.patch b/qm-vamp-plugins-unbundle.patch new file mode 100644 index 0000000..422ffab --- /dev/null +++ b/qm-vamp-plugins-unbundle.patch @@ -0,0 +1,40 @@ +Author: František Dvořák +Date: Wed Nov 4 20:41:09 2015 +0100 + + Unbundle qm-dsp. + +diff --git a/build/general/Makefile.inc b/build/general/Makefile.inc +index 5f2ea84..dc2e24a 100644 +--- a/build/general/Makefile.inc ++++ b/build/general/Makefile.inc +@@ -4,9 +4,9 @@ PLUGIN ?= qm-vamp-plugins$(PLUGIN_EXT) + CXX ?= g++ + CC ?= gcc + +-CFLAGS := $(CFLAGS) -I. -Iqm-dsp +-CXXFLAGS := $(CXXFLAGS) -I. -Iqm-dsp +-LDFLAGS := -Lqm-dsp $(LDFLAGS) ++CFLAGS := $(CFLAGS) -I. ++CXXFLAGS := $(CXXFLAGS) -I. ++LDFLAGS := $(LDFLAGS) + + HEADERS := plugins/AdaptiveSpectrogram.h \ + plugins/BarBeatTrack.h \ +@@ -41,7 +41,7 @@ SOURCES := g2cstubs.c \ + OBJECTS := $(SOURCES:.cpp=.o) + OBJECTS := $(OBJECTS:.c=.o) + +-all: qm-dsp $(PLUGIN) ++all: $(PLUGIN) + + MF := $(wildcard build/*/Makefile$(MAKEFILE_EXT)) + +@@ -50,7 +50,7 @@ qm-dsp: + $(MAKE) -C $@ -f $(MF) + + $(PLUGIN): $(OBJECTS) +- $(CXX) -o $@ $^ $(LDFLAGS) ++ $(CXX) -o $@ $^ $(LDFLAGS) -lqm-dsp -lkiss_fft_double -lkiss_fftr_double + + clean: + $(MAKE) -C qm-dsp -f $(MF) clean diff --git a/qm-vamp-plugins.spec b/qm-vamp-plugins.spec index e799062..b2801eb 100644 --- a/qm-vamp-plugins.spec +++ b/qm-vamp-plugins.spec @@ -1,19 +1,24 @@ Name: qm-vamp-plugins -Version: 1.7 -Release: 5%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Vamp audio feature extraction plugin License: GPLv2+ -URL: http://isophonics.net/QMVampPlugins -Source0: https://code.soundsoftware.ac.uk/attachments/download/109/%{name}-%{version}.tar.gz +# original homepage: http://isophonics.net/QMVampPlugins +URL: http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html +Source0: https://code.soundsoftware.ac.uk/attachments/download/1604/qm-vamp-plugins-1.7.1.tar.gz # build flags cleanup # (part of it not intended for upstream) # http://vamp-plugins.org/forum/index.php/topic,270.0.html Patch0: qm-vamp-plugins-build.patch +# unbundle qm-dsp +# (not intended for upstream) +Patch1: qm-vamp-plugins-unbundle.patch BuildRequires: atlas-devel -BuildRequires: vamp-plugin-sdk-devel +BuildRequires: kiss-fft-static BuildRequires: qm-dsp-static +BuildRequires: vamp-plugin-sdk-devel %description qm-vamp-plugins are vamp audio feature extraction plugins from the Centre for @@ -31,13 +36,18 @@ http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html. %prep %setup -q +# remove atlas binaries +rm -rf build/linux/amd64 build/linux/i686 +cp -p build/linux/Makefile.linux32 Makefile +# remove bundled qm-dsp, also with bundled kiss-fft +rm -rf qm-dsp %patch0 -p1 -ln -s build/linux/Makefile.linux Makefile +%patch1 -p1 %build # atlas libraries -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 21 +%if 0%{?rhel} >= 7 || 0%{?fedora} ATLAS_LIBS="-L%{_libdir}/atlas -ltatlas" %else ATLAS_LIBS="-L%{_libdir}/atlas -llapack -lcblas" @@ -59,19 +69,27 @@ make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_libdir}/vamp -install -p -m 0644 qm-vamp-plugins.cat %{buildroot}%{_libdir}/vamp -install -p -m 0644 qm-vamp-plugins.n3 %{buildroot}%{_libdir}/vamp -install -p -m 0755 qm-vamp-plugins.so %{buildroot}%{_libdir}/vamp +install -p -m 0644 qm-vamp-plugins.cat %{buildroot}%{_libdir}/vamp/ +install -p -m 0644 qm-vamp-plugins.n3 %{buildroot}%{_libdir}/vamp/ +install -p -m 0755 qm-vamp-plugins.so %{buildroot}%{_libdir}/vamp/ %files -%doc COPYING README.txt +%license COPYING +%doc README.txt %{_libdir}/vamp/qm-vamp-plugins.cat %{_libdir}/vamp/qm-vamp-plugins.n3 %{_libdir}/vamp/qm-vamp-plugins.so %changelog +* Tue Nov 15 2016 František Dvořák - 1.7.1-1 +- Update to 1.7.1 (#1261681) +- New homepage +- Unbundled qm-dsp and kiss-fft libraries +- Rebased build patch +- New packaging guidelines (license tag) + * Thu Feb 04 2016 Fedora Release Engineering - 1.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 0235593..cc2daba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9340d0e08d72ae712a2fb9da9f6499c5 qm-vamp-plugins-1.7.tar.gz +6274bc8bff6f2363404a9f945613bf51 qm-vamp-plugins-1.7.1.tar.gz