The package rpms/qm-dsp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qm-dsp.git/commit/?id=52fc4f97926...
https://src.fedoraproject.org/cgit/rpms/qm-dsp.git/commit/?id=53c676ef117...
https://src.fedoraproject.org/cgit/rpms/qm-dsp.git/commit/?id=84036dba19f...
https://src.fedoraproject.org/cgit/rpms/qm-dsp.git/commit/?id=e59ecd9fec8...
https://src.fedoraproject.org/cgit/rpms/qm-dsp.git/commit/?id=01154c25c98....
Change:
-%ifarch aarch64
+%ifarch aarch64
-%ifarch aarch64
+%ifarch x86_64
+%ifarch aarch64
Thanks.
Full change:
============
commit 84036dba19f30cc3205790b7181d612284397c7a
Author: Guido Aulisi <guido.aulisi(a)gmail.com>
Date: Wed Oct 2 14:14:49 2019 +0200
Unretire qm-dsp
diff --git a/qm-dsp.spec b/qm-dsp.spec
index e98527a..15ec027 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -80,26 +80,12 @@ EXTRA_CFLAGS="-msse -msse2 -mfpmath=sse"
# build
CFLAGS="$EXTRA_CFLAGS %{?optflags} -I%{_includedir}/kissfft" \
LDFLAGS="%{?__global_ldflags}" \
-make %{?_smp_mflags}
-
+%make_build
%install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
-
-
-%check
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BOOST_CPPFLAGS="-I%{_includedir}/boost148"
-BOOST_LDFLAGS="-L%{_libdir}/boost148"
-%endif
-# disable valgrind on AArch64
-%ifarch aarch64
-MAKE_ARGS='-f Makefile.novg'
-%endif
-CFLAGS="${BOOST_CPPFLAGS} %{?optflags} -Dkiss_fft_scalar=double" \
-LDFLAGS="${BOOST_LDFLAGS} %{?__global_ldflags} -lkiss_fft_double
-lkiss_fftr_double" \
-make %{?_smp_mflags} -C tests $MAKE_ARGS
+%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
+# Tests are broken
%files devel
%license COPYING
@@ -109,6 +95,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Wed Oct 02 2019 Guido Aulisi <guido.aulisi(a)gmail.com> - 1.7.1-10
+- Unretire qm-dsp
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 53c676ef1172c02469129c67c7f5b22858b7d29e
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Oct 7 14:24:51 2019 +0200
Revert "qm-dsp fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1675833"
This reverts commit 52fc4f97926f26880900f66cbe65a096545f2d12.
Unretirement request:
https://pagure.io/releng/issue/8871
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0420e55
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/qm-dsp-1.7.tar.gz
+/qm-dsp-1.7.1.tar.gz
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 62cf9e5..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-qm-dsp fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1675833
diff --git a/qm-dsp-flags.patch b/qm-dsp-flags.patch
new file mode 100644
index 0000000..b65de31
--- /dev/null
+++ b/qm-dsp-flags.patch
@@ -0,0 +1,21 @@
+Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
+Date: Wed Nov 4 14:11:41 2015 +0100
+
+ Build flags and not using internal lapack headers.
+
+diff --git a/Makefile b/Makefile
+index e501466..7f91722 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,10 @@
+
+-CFLAGS := -DNDEBUG -O3 -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize
-fomit-frame-pointer -DUSE_PTHREADS -I./include
++CFLAGS := -DNDEBUG -fPIC -ffast-math -ftree-vectorize -fomit-frame-pointer
-DUSE_PTHREADS -I./include $(CFLAGS)
+
+ #CFLAGS := -DNDEBUG -g -fPIC -DUSE_PTHREADS -I./include
+
+ CXXFLAGS := $(CFLAGS)
++LDFLAGS := $(LDFLAGS)
+
+ include build/general/Makefile.inc
+
diff --git a/qm-dsp-install.patch b/qm-dsp-install.patch
new file mode 100644
index 0000000..9554089
--- /dev/null
+++ b/qm-dsp-install.patch
@@ -0,0 +1,65 @@
+Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
+Date: Wed Nov 4 20:25:16 2015 +0100
+
+ Update Makefile:
+ * install target: headers, static library
+ * add missing header
+ * kill bundled kissfft
+
+diff --git a/build/general/Makefile.inc b/build/general/Makefile.inc
+index da0644b..b3a7319 100644
+--- a/build/general/Makefile.inc
++++ b/build/general/Makefile.inc
+@@ -4,9 +4,10 @@ CXX ?= g++
+ CC ?= gcc
+ AR ?= ar
+ RANLIB ?= ranlib
++INSTALL ?= install -p
+
+-CFLAGS := $(CFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double
+-CXXFLAGS := $(CXXFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double
++CFLAGS := $(CFLAGS) -I. -Dkiss_fft_scalar=double
++CXXFLAGS := $(CXXFLAGS) -I. -Dkiss_fft_scalar=double
+
+ HEADERS := base/Pitch.h \
+ base/Window.h \
+@@ -47,13 +48,12 @@ HEADERS := base/Pitch.h \
+ maths/MathAliases.h \
+ maths/MathUtilities.h \
+ maths/MedianFilter.h \
++ maths/nan-inf.h \
+ maths/Polyfit.h \
+ maths/pca/pca.h \
+ thread/AsynchronousTask.h \
+ thread/BlockAllocator.h \
+- thread/Thread.h \
+- ext/kissfft/kiss_fft.h \
+- ext/kissfft/tools/kiss_fftr.h
++ thread/Thread.h
+
+ SOURCES := base/Pitch.cpp \
+ base/KaiserWindow.cpp \
+@@ -91,9 +91,7 @@ SOURCES := base/Pitch.cpp \
+ maths/KLDivergence.cpp \
+ maths/MathUtilities.cpp \
+ maths/pca/pca.c \
+- thread/Thread.cpp \
+- ext/kissfft/kiss_fft.c \
+- ext/kissfft/tools/kiss_fftr.c
++ thread/Thread.cpp
+
+ OBJECTS := $(SOURCES:.cpp=.o)
+ OBJECTS := $(OBJECTS:.c=.o)
+@@ -106,6 +104,12 @@ $(LIBRARY): $(OBJECTS)
+ depend:
+ makedepend -fbuild/general/Makefile.inc -Y -- $(CFLAGS) -- $(SOURCES)
+
++install:
++ $(INSTALL) -D -m 0644 $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY)
++ for h in $(HEADERS); do \
++ $(INSTALL) -D -m 0644 $$h $(DESTDIR)$(PREFIX)/include/qm-dsp/$$h; \
++ done
++
+ clean:
+ rm -f $(OBJECTS)
+
diff --git a/qm-dsp.spec b/qm-dsp.spec
new file mode 100644
index 0000000..e98527a
--- /dev/null
+++ b/qm-dsp.spec
@@ -0,0 +1,155 @@
+# debuginfo not supported for static libraries, RB #209316
+%global debug_package %{nil}
+
+Name: qm-dsp
+Version: 1.7.1
+Release: 9%{?dist}
+Summary: Library for DSP and Music Informatics purposes
+
+# some source files with different original licenses, see README.txt
+License: GPLv2+
+# 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/1582/%{name}-%{vers...
+# build flags
+# (not intended for upstream)
+Patch0: qm-dsp-flags.patch
+# install header files
+#
http://vamp-plugins.org/forum/index.php/topic,270.0.html
+Patch1: qm-dsp-install.patch
+
+BuildRequires: gcc-c++
+BuildRequires: atlas-devel
+BuildRequires: imake
+BuildRequires: kiss-fft-static
+BuildRequires: valgrind
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: boost148-devel
+%else
+BuildRequires: boost-devel
+%endif
+
+%description
+%{name} is a C++ library of functions for DSP and Music Informatics purposes
+developed at Queen Mary, University of London. It is used by the QM Vamp
+Plugins (q.v.) among other things.
+
+
+%package devel
+Summary: %{summary}
+Provides: %{name}-static = %{version}-%{release}
+
+%description devel
+%{name} is a C++ library of functions for DSP and Music Informatics purposes
+developed at Queen Mary, University of London. It is used by the QM Vamp
+Plugins (q.v.) among other things.
+
+This package contains header files and static library for development with
+qm-dsp.
+
+
+%prep
+%setup -q
+cp -p build/linux/Makefile.linux32 Makefile
+%patch0 -p1
+%patch1 -p1
+# use specified CFLAGS for tests
+cat >> tests/Makefile <<EOF
+
+%.o: %.cpp
+ \$(CXX) \$(CPPFLAGS) \$(CFLAGS) -c \$<
+EOF
+# unbundle kiss-fft
+rm -rf ext/
+# helper Makefile without valgrind
+sed -e 's/$(VG) //' tests/Makefile > tests/Makefile.novg
+
+
+%build
+# unbundle kiss-fft
+make depend
+
+# extra cflags used in upstream
+%ifarch %{ix86}
+EXTRA_CFLAGS="-msse -mfpmath=sse"
+%endif
+%ifarch x86_64
+EXTRA_CFLAGS="-msse -msse2 -mfpmath=sse"
+%endif
+
+# build
+CFLAGS="$EXTRA_CFLAGS %{?optflags} -I%{_includedir}/kissfft" \
+LDFLAGS="%{?__global_ldflags}" \
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
+
+
+%check
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BOOST_CPPFLAGS="-I%{_includedir}/boost148"
+BOOST_LDFLAGS="-L%{_libdir}/boost148"
+%endif
+# disable valgrind on AArch64
+%ifarch aarch64
+MAKE_ARGS='-f Makefile.novg'
+%endif
+CFLAGS="${BOOST_CPPFLAGS} %{?optflags} -Dkiss_fft_scalar=double" \
+LDFLAGS="${BOOST_LDFLAGS} %{?__global_ldflags} -lkiss_fft_double
-lkiss_fftr_double" \
+make %{?_smp_mflags} -C tests $MAKE_ARGS
+
+
+%files devel
+%license COPYING
+%doc README.txt
+%{_libdir}/libqm-dsp.a
+%{_includedir}/%{name}/
+
+
+%changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 16 2017 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-3
+- Disable valgrind on AArch64
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Nov 14 2016 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-1
+- Update to 1.7.1 (#1279112)
+- New homepage
+- Unbundled new kiss-fft library
+- Removed C++ patch released in upstream
+- Rebased build flags and install patches
+- New packaging guidelines (license tag)
+- Enabled tests
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.7-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Nov 05 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-2
+- Updated patches and added comments
+
+* Sun Aug 3 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..fe867ff
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+9c7a7b15926000e15a9e3c7c06492e58 qm-dsp-1.7.1.tar.gz
commit 52fc4f97926f26880900f66cbe65a096545f2d12
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 16:25:12 2019 +0000
qm-dsp fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1675833
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0420e55..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/qm-dsp-1.7.tar.gz
-/qm-dsp-1.7.1.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..62cf9e5
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+qm-dsp fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1675833
diff --git a/qm-dsp-flags.patch b/qm-dsp-flags.patch
deleted file mode 100644
index b65de31..0000000
--- a/qm-dsp-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
-Date: Wed Nov 4 14:11:41 2015 +0100
-
- Build flags and not using internal lapack headers.
-
-diff --git a/Makefile b/Makefile
-index e501466..7f91722 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,10 @@
-
--CFLAGS := -DNDEBUG -O3 -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize
-fomit-frame-pointer -DUSE_PTHREADS -I./include
-+CFLAGS := -DNDEBUG -fPIC -ffast-math -ftree-vectorize -fomit-frame-pointer
-DUSE_PTHREADS -I./include $(CFLAGS)
-
- #CFLAGS := -DNDEBUG -g -fPIC -DUSE_PTHREADS -I./include
-
- CXXFLAGS := $(CFLAGS)
-+LDFLAGS := $(LDFLAGS)
-
- include build/general/Makefile.inc
-
diff --git a/qm-dsp-install.patch b/qm-dsp-install.patch
deleted file mode 100644
index 9554089..0000000
--- a/qm-dsp-install.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
-Date: Wed Nov 4 20:25:16 2015 +0100
-
- Update Makefile:
- * install target: headers, static library
- * add missing header
- * kill bundled kissfft
-
-diff --git a/build/general/Makefile.inc b/build/general/Makefile.inc
-index da0644b..b3a7319 100644
---- a/build/general/Makefile.inc
-+++ b/build/general/Makefile.inc
-@@ -4,9 +4,10 @@ CXX ?= g++
- CC ?= gcc
- AR ?= ar
- RANLIB ?= ranlib
-+INSTALL ?= install -p
-
--CFLAGS := $(CFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double
--CXXFLAGS := $(CXXFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double
-+CFLAGS := $(CFLAGS) -I. -Dkiss_fft_scalar=double
-+CXXFLAGS := $(CXXFLAGS) -I. -Dkiss_fft_scalar=double
-
- HEADERS := base/Pitch.h \
- base/Window.h \
-@@ -47,13 +48,12 @@ HEADERS := base/Pitch.h \
- maths/MathAliases.h \
- maths/MathUtilities.h \
- maths/MedianFilter.h \
-+ maths/nan-inf.h \
- maths/Polyfit.h \
- maths/pca/pca.h \
- thread/AsynchronousTask.h \
- thread/BlockAllocator.h \
-- thread/Thread.h \
-- ext/kissfft/kiss_fft.h \
-- ext/kissfft/tools/kiss_fftr.h
-+ thread/Thread.h
-
- SOURCES := base/Pitch.cpp \
- base/KaiserWindow.cpp \
-@@ -91,9 +91,7 @@ SOURCES := base/Pitch.cpp \
- maths/KLDivergence.cpp \
- maths/MathUtilities.cpp \
- maths/pca/pca.c \
-- thread/Thread.cpp \
-- ext/kissfft/kiss_fft.c \
-- ext/kissfft/tools/kiss_fftr.c
-+ thread/Thread.cpp
-
- OBJECTS := $(SOURCES:.cpp=.o)
- OBJECTS := $(OBJECTS:.c=.o)
-@@ -106,6 +104,12 @@ $(LIBRARY): $(OBJECTS)
- depend:
- makedepend -fbuild/general/Makefile.inc -Y -- $(CFLAGS) -- $(SOURCES)
-
-+install:
-+ $(INSTALL) -D -m 0644 $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY)
-+ for h in $(HEADERS); do \
-+ $(INSTALL) -D -m 0644 $$h $(DESTDIR)$(PREFIX)/include/qm-dsp/$$h; \
-+ done
-+
- clean:
- rm -f $(OBJECTS)
-
diff --git a/qm-dsp.spec b/qm-dsp.spec
deleted file mode 100644
index e98527a..0000000
--- a/qm-dsp.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# debuginfo not supported for static libraries, RB #209316
-%global debug_package %{nil}
-
-Name: qm-dsp
-Version: 1.7.1
-Release: 9%{?dist}
-Summary: Library for DSP and Music Informatics purposes
-
-# some source files with different original licenses, see README.txt
-License: GPLv2+
-# 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/1582/%{name}-%{vers...
-# build flags
-# (not intended for upstream)
-Patch0: qm-dsp-flags.patch
-# install header files
-#
http://vamp-plugins.org/forum/index.php/topic,270.0.html
-Patch1: qm-dsp-install.patch
-
-BuildRequires: gcc-c++
-BuildRequires: atlas-devel
-BuildRequires: imake
-BuildRequires: kiss-fft-static
-BuildRequires: valgrind
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires: boost148-devel
-%else
-BuildRequires: boost-devel
-%endif
-
-%description
-%{name} is a C++ library of functions for DSP and Music Informatics purposes
-developed at Queen Mary, University of London. It is used by the QM Vamp
-Plugins (q.v.) among other things.
-
-
-%package devel
-Summary: %{summary}
-Provides: %{name}-static = %{version}-%{release}
-
-%description devel
-%{name} is a C++ library of functions for DSP and Music Informatics purposes
-developed at Queen Mary, University of London. It is used by the QM Vamp
-Plugins (q.v.) among other things.
-
-This package contains header files and static library for development with
-qm-dsp.
-
-
-%prep
-%setup -q
-cp -p build/linux/Makefile.linux32 Makefile
-%patch0 -p1
-%patch1 -p1
-# use specified CFLAGS for tests
-cat >> tests/Makefile <<EOF
-
-%.o: %.cpp
- \$(CXX) \$(CPPFLAGS) \$(CFLAGS) -c \$<
-EOF
-# unbundle kiss-fft
-rm -rf ext/
-# helper Makefile without valgrind
-sed -e 's/$(VG) //' tests/Makefile > tests/Makefile.novg
-
-
-%build
-# unbundle kiss-fft
-make depend
-
-# extra cflags used in upstream
-%ifarch %{ix86}
-EXTRA_CFLAGS="-msse -mfpmath=sse"
-%endif
-%ifarch x86_64
-EXTRA_CFLAGS="-msse -msse2 -mfpmath=sse"
-%endif
-
-# build
-CFLAGS="$EXTRA_CFLAGS %{?optflags} -I%{_includedir}/kissfft" \
-LDFLAGS="%{?__global_ldflags}" \
-make %{?_smp_mflags}
-
-
-%install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
-
-
-%check
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BOOST_CPPFLAGS="-I%{_includedir}/boost148"
-BOOST_LDFLAGS="-L%{_libdir}/boost148"
-%endif
-# disable valgrind on AArch64
-%ifarch aarch64
-MAKE_ARGS='-f Makefile.novg'
-%endif
-CFLAGS="${BOOST_CPPFLAGS} %{?optflags} -Dkiss_fft_scalar=double" \
-LDFLAGS="${BOOST_LDFLAGS} %{?__global_ldflags} -lkiss_fft_double
-lkiss_fftr_double" \
-make %{?_smp_mflags} -C tests $MAKE_ARGS
-
-
-%files devel
-%license COPYING
-%doc README.txt
-%{_libdir}/libqm-dsp.a
-%{_includedir}/%{name}/
-
-
-%changelog
-* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-9
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-8
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Feb 16 2017 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-3
-- Disable valgrind on AArch64
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Nov 14 2016 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-1
-- Update to 1.7.1 (#1279112)
-- New homepage
-- Unbundled new kiss-fft library
-- Removed C++ patch released in upstream
-- Rebased build flags and install patches
-- New packaging guidelines (license tag)
-- Enabled tests
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.7-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Nov 05 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-2
-- Updated patches and added comments
-
-* Sun Aug 3 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-1
-- Initial package
diff --git a/sources b/sources
deleted file mode 100644
index fe867ff..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-9c7a7b15926000e15a9e3c7c06492e58 qm-dsp-1.7.1.tar.gz
commit ab08338c50cf3297326a89e54a578ac1e291ee88
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 26 17:38:16 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qm-dsp.spec b/qm-dsp.spec
index c33bfb3..e98527a 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -109,6 +109,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-8
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit dee285071c61da3e7784facb10eb5569f82f3c3b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 10:33:04 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qm-dsp.spec b/qm-dsp.spec
index 55618e2..c33bfb3 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -109,6 +109,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 95ba697d054c039617cf7afa1808ae5f2a95970b
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Thu Jul 19 20:56:42 2018 +0200
add BuildRequires: gcc-c++
Reference:
https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
diff --git a/qm-dsp.spec b/qm-dsp.spec
index 0062920..55618e2 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -18,6 +18,7 @@ Patch0: qm-dsp-flags.patch
#
http://vamp-plugins.org/forum/index.php/topic,270.0.html
Patch1: qm-dsp-install.patch
+BuildRequires: gcc-c++
BuildRequires: atlas-devel
BuildRequires: imake
BuildRequires: kiss-fft-static
commit f5b192b327e10242943c4b8817827c20a7b2390d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 03:01:37 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qm-dsp.spec b/qm-dsp.spec
index bce831b..0062920 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -108,6 +108,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 0a826b6a2cfbc86495e8d3d5b26a7af7d7d0ee28
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 12:13:41 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/qm-dsp.spec b/qm-dsp.spec
index 4061ad8..bce831b 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -108,6 +108,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
commit fbe73d7db9631aa7f8e41975b1d0fb99d287582e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 07:12:42 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/qm-dsp.spec b/qm-dsp.spec
index d06a92b..4061ad8 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -108,6 +108,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit 7fa9df7ad52e565954ed127e8d2809d9bb6e12f3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 12:36:26 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/qm-dsp.spec b/qm-dsp.spec
index ef733aa..d06a92b 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -108,6 +108,9 @@ make %{?_smp_mflags} -C tests $MAKE_ARGS
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Thu Feb 16 2017 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-3
- Disable valgrind on AArch64
commit 01154c25c982bc821b957c9d5c3784d5008d6e23
Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
Date: Thu Feb 16 16:31:43 2017 +0100
Disable valgrind on AArch64
diff --git a/qm-dsp.spec b/qm-dsp.spec
index c8eb2ed..ef733aa 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -60,6 +60,8 @@ cat >> tests/Makefile <<EOF
EOF
# unbundle kiss-fft
rm -rf ext/
+# helper Makefile without valgrind
+sed -e 's/$(VG) //' tests/Makefile > tests/Makefile.novg
%build
@@ -89,9 +91,13 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
BOOST_CPPFLAGS="-I%{_includedir}/boost148"
BOOST_LDFLAGS="-L%{_libdir}/boost148"
%endif
+# disable valgrind on AArch64
+%ifarch aarch64
+MAKE_ARGS='-f Makefile.novg'
+%endif
CFLAGS="${BOOST_CPPFLAGS} %{?optflags} -Dkiss_fft_scalar=double" \
LDFLAGS="${BOOST_LDFLAGS} %{?__global_ldflags} -lkiss_fft_double
-lkiss_fftr_double" \
-make %{?_smp_mflags} -C tests
+make %{?_smp_mflags} -C tests $MAKE_ARGS
%files devel
@@ -102,6 +108,9 @@ make %{?_smp_mflags} -C tests
%changelog
+* Thu Feb 16 2017 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-3
+- Disable valgrind on AArch64
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit be6695c0d0aa10cc37e67777acd494b0ef73a087
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 11:14:06 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/qm-dsp.spec b/qm-dsp.spec
index ae4b7f7..c8eb2ed 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -102,6 +102,9 @@ make %{?_smp_mflags} -C tests
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Mon Nov 14 2016 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-1
- Update to 1.7.1 (#1279112)
- New homepage
commit 18d063004091b131c180bf2096717fe4ff7126a0
Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
Date: Wed Nov 4 20:24:23 2015 +0100
Update to 1.7.1 (#1279112)
* New homepage
* Unbundled new kiss-fft library
* Removed C++ patch released in upstream
* Rebased build flags and install patches
* New packaging guidelines (license tag)
* Enabled tests
diff --git a/.gitignore b/.gitignore
index ceff8bf..0420e55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qm-dsp-1.7.tar.gz
+/qm-dsp-1.7.1.tar.gz
diff --git a/qm-dsp-cxx-build.patch b/qm-dsp-cxx-build.patch
deleted file mode 100644
index 3a80b1b..0000000
--- a/qm-dsp-cxx-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix build with gcc 4.6
-
-diff -r 410f9e18a249 -r 915365c58758 build/linux/Makefile.linux
---- a/build/linux/Makefile.linux Fri Oct 14 09:41:38 2011 +0100
-+++ b/build/linux/Makefile.linux Fri Oct 14 09:48:47 2011 +0100
-@@ -1,5 +1,5 @@
-
--CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
-+CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -I./include
- CXXFLAGS := $(CFLAGS)
-
- include build/general/Makefile.inc
-diff -r 410f9e18a249 -r 915365c58758 dsp/tempotracking/DownBeat.h
---- a/dsp/tempotracking/DownBeat.h Fri Oct 14 09:41:38 2011 +0100
-+++ b/dsp/tempotracking/DownBeat.h Fri Oct 14 09:48:47 2011 +0100
-@@ -17,6 +17,7 @@
- #define DOWNBEAT_H
-
- #include <vector>
-+#include <cstddef>
-
- #include "dsp/rateconversion/Decimator.h"
-
-diff -r 410f9e18a249 -r 915365c58758 dsp/tempotracking/TempoTrackV2.h
---- a/dsp/tempotracking/TempoTrackV2.h Fri Oct 14 09:41:38 2011 +0100
-+++ b/dsp/tempotracking/TempoTrackV2.h Fri Oct 14 09:48:47 2011 +0100
-@@ -18,6 +18,7 @@
- #define TEMPOTRACKV2_H
-
- #include <vector>
-+#include <cstddef>
-
- using std::vector;
-
diff --git a/qm-dsp-flags.patch b/qm-dsp-flags.patch
index abebd1d..b65de31 100644
--- a/qm-dsp-flags.patch
+++ b/qm-dsp-flags.patch
@@ -1,27 +1,21 @@
-Build flags and not using internal lapack headers.
+Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
+Date: Wed Nov 4 14:11:41 2015 +0100
-diff --git a/build/linux/Makefile.linux b/build/linux/Makefile.linux
-index 5f2b331..a60a4ee 100644
---- a/build/linux/Makefile.linux
-+++ b/build/linux/Makefile.linux
-@@ -1,6 +1,7 @@
+ Build flags and not using internal lapack headers.
+
+diff --git a/Makefile b/Makefile
+index e501466..7f91722 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,10 @@
+
+-CFLAGS := -DNDEBUG -O3 -fPIC -ffast-math -msse -mfpmath=sse -ftree-vectorize
-fomit-frame-pointer -DUSE_PTHREADS -I./include
++CFLAGS := -DNDEBUG -fPIC -ffast-math -ftree-vectorize -fomit-frame-pointer
-DUSE_PTHREADS -I./include $(CFLAGS)
+
+ #CFLAGS := -DNDEBUG -g -fPIC -DUSE_PTHREADS -I./include
--CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -I./include
-+CFLAGS := -DNDEBUG -fno-exceptions -fPIC -ffast-math -ftree-vectorize
-fomit-frame-pointer -DUSE_PTHREADS $(CFLAGS)
CXXFLAGS := $(CFLAGS)
+LDFLAGS := $(LDFLAGS)
include build/general/Makefile.inc
-diff --git a/build/linux/Makefile.linux64 b/build/linux/Makefile.linux64
-deleted file mode 100644
-index b5460d4..0000000
---- a/build/linux/Makefile.linux64
-+++ /dev/null
-@@ -1,6 +0,0 @@
--
--CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -Ibuild/linux/amd64
--CXXFLAGS := $(CFLAGS)
--
--include build/general/Makefile.inc
--
diff --git a/qm-dsp-install.patch b/qm-dsp-install.patch
index 495e8be..9554089 100644
--- a/qm-dsp-install.patch
+++ b/qm-dsp-install.patch
@@ -1,28 +1,58 @@
-Install header files and static library, add missing header.
+Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
+Date: Wed Nov 4 20:25:16 2015 +0100
+
+ Update Makefile:
+ * install target: headers, static library
+ * add missing header
+ * kill bundled kissfft
diff --git a/build/general/Makefile.inc b/build/general/Makefile.inc
-index 77d4b65..e887471 100644
+index da0644b..b3a7319 100644
--- a/build/general/Makefile.inc
+++ b/build/general/Makefile.inc
-@@ -4,6 +4,7 @@ CXX ?= g++
+@@ -4,9 +4,10 @@ CXX ?= g++
CC ?= gcc
AR ?= ar
RANLIB ?= ranlib
+INSTALL ?= install -p
- CFLAGS := $(CFLAGS) -I.
- CXXFLAGS := $(CXXFLAGS) -I.
-@@ -42,6 +43,7 @@ HEADERS := base/Pitch.h \
- maths/KLDivergence.h \
+-CFLAGS := $(CFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double
+-CXXFLAGS := $(CXXFLAGS) -I. -Iext/kissfft -Iext/kissfft/tools -Dkiss_fft_scalar=double
++CFLAGS := $(CFLAGS) -I. -Dkiss_fft_scalar=double
++CXXFLAGS := $(CXXFLAGS) -I. -Dkiss_fft_scalar=double
+
+ HEADERS := base/Pitch.h \
+ base/Window.h \
+@@ -47,13 +48,12 @@ HEADERS := base/Pitch.h \
maths/MathAliases.h \
maths/MathUtilities.h \
+ maths/MedianFilter.h \
+ maths/nan-inf.h \
maths/Polyfit.h \
maths/pca/pca.h \
thread/AsynchronousTask.h \
-@@ -89,6 +91,12 @@ $(LIBRARY): $(OBJECTS)
- $(AR) cr $@ $^
- $(RANLIB) $@
+ thread/BlockAllocator.h \
+- thread/Thread.h \
+- ext/kissfft/kiss_fft.h \
+- ext/kissfft/tools/kiss_fftr.h
++ thread/Thread.h
+
+ SOURCES := base/Pitch.cpp \
+ base/KaiserWindow.cpp \
+@@ -91,9 +91,7 @@ SOURCES := base/Pitch.cpp \
+ maths/KLDivergence.cpp \
+ maths/MathUtilities.cpp \
+ maths/pca/pca.c \
+- thread/Thread.cpp \
+- ext/kissfft/kiss_fft.c \
+- ext/kissfft/tools/kiss_fftr.c
++ thread/Thread.cpp
+
+ OBJECTS := $(SOURCES:.cpp=.o)
+ OBJECTS := $(OBJECTS:.c=.o)
+@@ -106,6 +104,12 @@ $(LIBRARY): $(OBJECTS)
+ depend:
+ makedepend -fbuild/general/Makefile.inc -Y -- $(CFLAGS) -- $(SOURCES)
+install:
+ $(INSTALL) -D -m 0644 $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY)
@@ -31,5 +61,5 @@ index 77d4b65..e887471 100644
+ done
+
clean:
- rm $(OBJECTS)
+ rm -f $(OBJECTS)
diff --git a/qm-dsp.spec b/qm-dsp.spec
index e1416f1..ae4b7f7 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -2,25 +2,31 @@
%global debug_package %{nil}
Name: qm-dsp
-Version: 1.7
-Release: 4%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
License: GPLv2+
-URL:
http://isophonics.net/QMVampPlugins
-Source0:
https://code.soundsoftware.ac.uk/attachments/download/103/%{name}-%{versi...
-# C++ build fix
-#
https://code.soundsoftware.ac.uk/projects/qm-dsp/repository/revisions/915...
-Patch0: qm-dsp-cxx-build.patch
+# 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/1582/%{name}-%{vers...
# build flags
# (not intended for upstream)
-Patch1: qm-dsp-flags.patch
+Patch0: qm-dsp-flags.patch
# install header files
#
http://vamp-plugins.org/forum/index.php/topic,270.0.html
-Patch2: qm-dsp-install.patch
+Patch1: qm-dsp-install.patch
BuildRequires: atlas-devel
+BuildRequires: imake
+BuildRequires: kiss-fft-static
+BuildRequires: valgrind
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: boost148-devel
+%else
+BuildRequires: boost-devel
+%endif
%description
%{name} is a C++ library of functions for DSP and Music Informatics purposes
@@ -43,13 +49,23 @@ qm-dsp.
%prep
%setup -q
+cp -p build/linux/Makefile.linux32 Makefile
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-ln -s build/linux/Makefile.linux Makefile
+# use specified CFLAGS for tests
+cat >> tests/Makefile <<EOF
+
+%.o: %.cpp
+ \$(CXX) \$(CPPFLAGS) \$(CFLAGS) -c \$<
+EOF
+# unbundle kiss-fft
+rm -rf ext/
%build
+# unbundle kiss-fft
+make depend
+
# extra cflags used in upstream
%ifarch %{ix86}
EXTRA_CFLAGS="-msse -mfpmath=sse"
@@ -58,7 +74,8 @@ EXTRA_CFLAGS="-msse -mfpmath=sse"
EXTRA_CFLAGS="-msse -msse2 -mfpmath=sse"
%endif
-CFLAGS="$EXTRA_CFLAGS %{?optflags}" \
+# build
+CFLAGS="$EXTRA_CFLAGS %{?optflags} -I%{_includedir}/kissfft" \
LDFLAGS="%{?__global_ldflags}" \
make %{?_smp_mflags}
@@ -67,13 +84,33 @@ make %{?_smp_mflags}
make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
+%check
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BOOST_CPPFLAGS="-I%{_includedir}/boost148"
+BOOST_LDFLAGS="-L%{_libdir}/boost148"
+%endif
+CFLAGS="${BOOST_CPPFLAGS} %{?optflags} -Dkiss_fft_scalar=double" \
+LDFLAGS="${BOOST_LDFLAGS} %{?__global_ldflags} -lkiss_fft_double
-lkiss_fftr_double" \
+make %{?_smp_mflags} -C tests
+
+
%files devel
-%doc COPYING README.txt
+%license COPYING
+%doc README.txt
%{_libdir}/libqm-dsp.a
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
%changelog
+* Mon Nov 14 2016 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7.1-1
+- Update to 1.7.1 (#1279112)
+- New homepage
+- Unbundled new kiss-fft library
+- Removed C++ patch released in upstream
+- Rebased build flags and install patches
+- New packaging guidelines (license tag)
+- Enabled tests
+
* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
@@ -81,7 +118,7 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Nov 05 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-2
-- Update patches and add comments
+- Updated patches and added comments
* Sun Aug 3 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-1
- Initial package
diff --git a/sources b/sources
index 9b505c1..fe867ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d167a1477ab40cc3df965ed338dcd6a5 qm-dsp-1.7.tar.gz
+9c7a7b15926000e15a9e3c7c06492e58 qm-dsp-1.7.1.tar.gz
commit 613cef439994fe7e24c7e042daca69b6aec97d56
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Feb 4 21:39:52 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/qm-dsp.spec b/qm-dsp.spec
index 36666b5..e1416f1 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -74,6 +74,9 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.7-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.7-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit 3493f83e53940be12b6b1e4114392ae628ddc15b
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jun 18 21:42:02 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/qm-dsp.spec b/qm-dsp.spec
index d7e861e..36666b5 100644
--- a/qm-dsp.spec
+++ b/qm-dsp.spec
@@ -3,7 +3,7 @@
Name: qm-dsp
Version: 1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library for DSP and Music Informatics purposes
# some source files with different original licenses, see README.txt
@@ -74,6 +74,9 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
%changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.7-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Wed Nov 05 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-2
- Update patches and add comments
commit e59ecd9fec896f7108ca55229ba5f76584f64455
Author: Frantiek Dvok <valtri(a)civ.zcu.cz>
Date: Wed Nov 5 14:58:22 2014 +0100
Initial import (#1060519).
diff --git a/.gitignore b/.gitignore
index e69de29..ceff8bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/qm-dsp-1.7.tar.gz
diff --git a/qm-dsp-cxx-build.patch b/qm-dsp-cxx-build.patch
new file mode 100644
index 0000000..3a80b1b
--- /dev/null
+++ b/qm-dsp-cxx-build.patch
@@ -0,0 +1,34 @@
+Fix build with gcc 4.6
+
+diff -r 410f9e18a249 -r 915365c58758 build/linux/Makefile.linux
+--- a/build/linux/Makefile.linux Fri Oct 14 09:41:38 2011 +0100
++++ b/build/linux/Makefile.linux Fri Oct 14 09:48:47 2011 +0100
+@@ -1,5 +1,5 @@
+
+-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS
++CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -I./include
+ CXXFLAGS := $(CFLAGS)
+
+ include build/general/Makefile.inc
+diff -r 410f9e18a249 -r 915365c58758 dsp/tempotracking/DownBeat.h
+--- a/dsp/tempotracking/DownBeat.h Fri Oct 14 09:41:38 2011 +0100
++++ b/dsp/tempotracking/DownBeat.h Fri Oct 14 09:48:47 2011 +0100
+@@ -17,6 +17,7 @@
+ #define DOWNBEAT_H
+
+ #include <vector>
++#include <cstddef>
+
+ #include "dsp/rateconversion/Decimator.h"
+
+diff -r 410f9e18a249 -r 915365c58758 dsp/tempotracking/TempoTrackV2.h
+--- a/dsp/tempotracking/TempoTrackV2.h Fri Oct 14 09:41:38 2011 +0100
++++ b/dsp/tempotracking/TempoTrackV2.h Fri Oct 14 09:48:47 2011 +0100
+@@ -18,6 +18,7 @@
+ #define TEMPOTRACKV2_H
+
+ #include <vector>
++#include <cstddef>
+
+ using std::vector;
+
diff --git a/qm-dsp-flags.patch b/qm-dsp-flags.patch
new file mode 100644
index 0000000..abebd1d
--- /dev/null
+++ b/qm-dsp-flags.patch
@@ -0,0 +1,27 @@
+Build flags and not using internal lapack headers.
+
+diff --git a/build/linux/Makefile.linux b/build/linux/Makefile.linux
+index 5f2b331..a60a4ee 100644
+--- a/build/linux/Makefile.linux
++++ b/build/linux/Makefile.linux
+@@ -1,6 +1,7 @@
+
+-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -I./include
++CFLAGS := -DNDEBUG -fno-exceptions -fPIC -ffast-math -ftree-vectorize
-fomit-frame-pointer -DUSE_PTHREADS $(CFLAGS)
+ CXXFLAGS := $(CFLAGS)
++LDFLAGS := $(LDFLAGS)
+
+ include build/general/Makefile.inc
+
+diff --git a/build/linux/Makefile.linux64 b/build/linux/Makefile.linux64
+deleted file mode 100644
+index b5460d4..0000000
+--- a/build/linux/Makefile.linux64
++++ /dev/null
+@@ -1,6 +0,0 @@
+-
+-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -mfpmath=sse
-ftree-vectorize -fomit-frame-pointer -DUSE_PTHREADS -Ibuild/linux/amd64
+-CXXFLAGS := $(CFLAGS)
+-
+-include build/general/Makefile.inc
+-
diff --git a/qm-dsp-install.patch b/qm-dsp-install.patch
new file mode 100644
index 0000000..495e8be
--- /dev/null
+++ b/qm-dsp-install.patch
@@ -0,0 +1,35 @@
+Install header files and static library, add missing header.
+
+diff --git a/build/general/Makefile.inc b/build/general/Makefile.inc
+index 77d4b65..e887471 100644
+--- a/build/general/Makefile.inc
++++ b/build/general/Makefile.inc
+@@ -4,6 +4,7 @@ CXX ?= g++
+ CC ?= gcc
+ AR ?= ar
+ RANLIB ?= ranlib
++INSTALL ?= install -p
+
+ CFLAGS := $(CFLAGS) -I.
+ CXXFLAGS := $(CXXFLAGS) -I.
+@@ -42,6 +43,7 @@ HEADERS := base/Pitch.h \
+ maths/KLDivergence.h \
+ maths/MathAliases.h \
+ maths/MathUtilities.h \
++ maths/nan-inf.h \
+ maths/Polyfit.h \
+ maths/pca/pca.h \
+ thread/AsynchronousTask.h \
+@@ -89,6 +91,12 @@ $(LIBRARY): $(OBJECTS)
+ $(AR) cr $@ $^
+ $(RANLIB) $@
+
++install:
++ $(INSTALL) -D -m 0644 $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY)
++ for h in $(HEADERS); do \
++ $(INSTALL) -D -m 0644 $$h $(DESTDIR)$(PREFIX)/include/qm-dsp/$$h; \
++ done
++
+ clean:
+ rm $(OBJECTS)
+
diff --git a/qm-dsp.spec b/qm-dsp.spec
new file mode 100644
index 0000000..d7e861e
--- /dev/null
+++ b/qm-dsp.spec
@@ -0,0 +1,81 @@
+# debuginfo not supported for static libraries, RB #209316
+%global debug_package %{nil}
+
+Name: qm-dsp
+Version: 1.7
+Release: 2%{?dist}
+Summary: Library for DSP and Music Informatics purposes
+
+# some source files with different original licenses, see README.txt
+License: GPLv2+
+URL:
http://isophonics.net/QMVampPlugins
+Source0:
https://code.soundsoftware.ac.uk/attachments/download/103/%{name}-%{versi...
+# C++ build fix
+#
https://code.soundsoftware.ac.uk/projects/qm-dsp/repository/revisions/915...
+Patch0: qm-dsp-cxx-build.patch
+# build flags
+# (not intended for upstream)
+Patch1: qm-dsp-flags.patch
+# install header files
+#
http://vamp-plugins.org/forum/index.php/topic,270.0.html
+Patch2: qm-dsp-install.patch
+
+BuildRequires: atlas-devel
+
+%description
+%{name} is a C++ library of functions for DSP and Music Informatics purposes
+developed at Queen Mary, University of London. It is used by the QM Vamp
+Plugins (q.v.) among other things.
+
+
+%package devel
+Summary: %{summary}
+Provides: %{name}-static = %{version}-%{release}
+
+%description devel
+%{name} is a C++ library of functions for DSP and Music Informatics purposes
+developed at Queen Mary, University of London. It is used by the QM Vamp
+Plugins (q.v.) among other things.
+
+This package contains header files and static library for development with
+qm-dsp.
+
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+ln -s build/linux/Makefile.linux Makefile
+
+
+%build
+# extra cflags used in upstream
+%ifarch %{ix86}
+EXTRA_CFLAGS="-msse -mfpmath=sse"
+%endif
+%ifarch x86_64
+EXTRA_CFLAGS="-msse -msse2 -mfpmath=sse"
+%endif
+
+CFLAGS="$EXTRA_CFLAGS %{?optflags}" \
+LDFLAGS="%{?__global_ldflags}" \
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
+
+
+%files devel
+%doc COPYING README.txt
+%{_libdir}/libqm-dsp.a
+%{_includedir}/%{name}
+
+
+%changelog
+* Wed Nov 05 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-2
+- Update patches and add comments
+
+* Sun Aug 3 2014 Frantiek Dvok <valtri(a)civ.zcu.cz> - 1.7-1
+- Initial package
diff --git a/sources b/sources
index e69de29..9b505c1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d167a1477ab40cc3df965ed338dcd6a5 qm-dsp-1.7.tar.gz