diff --git a/.gitignore b/.gitignore index 2a3979a..8b391d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/vamp-plugin-sdk-2.9.0.tar.gz -/vamp-plugin-sdk-2.10.tar.gz +vamp-plugin-sdk-1.1b.tar.gz diff --git a/README.packit b/README.packit deleted file mode 100644 index d2b528d..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.97.1.post1.dev6+gc8c0314a. diff --git a/changelog b/changelog deleted file mode 100644 index fec6a1f..0000000 --- a/changelog +++ /dev/null @@ -1,141 +0,0 @@ -* Sat Jan 27 2024 Fedora Release Engineering - 2.9.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2.9.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 2.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.9.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 2.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Feb 2 2020 Michel Alexandre Salim - 2.9.0-1 -- Update to 2.9.0 - -* Fri Jan 31 2020 Fedora Release Engineering - 2.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 1 2019 Michel Alexandre Salim - 2.8.0-1 -- Update to 2.8.0 - -* Sun Feb 03 2019 Fedora Release Engineering - 2.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Oct 17 2018 Michel Alexandre Salim - 2.7.1-1 -- Update to 2.7.1 - -* Sat Jul 14 2018 Fedora Release Engineering - 2.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 2.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 27 2015 Nils Philippsen - 2.5-6 -- Rebuild for gcc 5.1.0 C++ ABI change - -* Wed Apr 1 2015 Orion Poplawski - 2.5-5 -- Rebuild for gcc 5.0.0 C++ ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 18 2013 Michel Salim - 2.5-1 -- Update to 2.5 - -* Fri Feb 15 2013 Fedora Release Engineering - 2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Sep 9 2012 Michel Salim - 2.4-1 -- Update to 2.4 - -* Sun Jul 22 2012 Fedora Release Engineering - 2.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for c++ ABI breakage - -* Sat Jan 14 2012 Fedora Release Engineering - 2.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Jul 14 2011 Michel Salim - 2.2.1-1 -- Update to 2.2.1 - -* Mon Feb 07 2011 Fedora Release Engineering - 2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri May 28 2010 Michel Salim - 2.1-1 -- Update to 2.1 -- multilib fix: Makefile for examples is now arch-tagged - -* Sun Jul 26 2009 Fedora Release Engineering - 2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 31 2009 Michael Schwendt - 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 - 2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Feb 8 2009 Michel Salim - 2.0-3 -- Fix compilation problem with GCC 4.4 - -* Tue Dec 30 2008 Michel Salim - 2.0-2 -- More libdir fixes (bug #469777) - -* Sun Dec 14 2008 Michel Salim - 2.0-1 -- Update to 2.0 - -* Thu Jul 17 2008 Michel Alexandre Salim - 1.3-1 -- Update to 1.3 - -* Thu Jan 31 2008 Michel Salim - 1.1b-4 -- Add some #includes, needed due to GCC 4.3's header dependency cleanup - -* Mon Jan 28 2008 Michel Salim - 1.1b-3 -- Add examples to -devel subpackage -- Fix .pc files -- Preserve timestamps when installing - -* Sun Jan 27 2008 Michel Salim - 1.1b-2 -- Add missing build requirement on libsndfile-devel - -* Wed Jan 16 2008 Michel Salim - 1.1b-1 -- Initial Fedora package diff --git a/packit.yaml b/packit.yaml deleted file mode 100644 index 0d62d21..0000000 --- a/packit.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -upstream_project_url: https://github.com/vamp-plugins/vamp-plugin-sdk -upstream_tag_template: vamp-plugin-sdk-v{version} -copy_upstream_release_description: false - -jobs: -- job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide diff --git a/sources b/sources index f14d8c6..6e6e813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vamp-plugin-sdk-2.10.tar.gz) = 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0 +aeda086f10227e6ca473f714ac025807 vamp-plugin-sdk-1.1b.tar.gz diff --git a/vamp-plugin-sdk-1.1b-Makefile.patch b/vamp-plugin-sdk-1.1b-Makefile.patch new file mode 100644 index 0000000..f9746cd --- /dev/null +++ b/vamp-plugin-sdk-1.1b-Makefile.patch @@ -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" \ diff --git a/vamp-plugin-sdk-1.1b-gcc43.patch b/vamp-plugin-sdk-1.1b-gcc43.patch new file mode 100644 index 0000000..0036894 --- /dev/null +++ b/vamp-plugin-sdk-1.1b-gcc43.patch @@ -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 +- + 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 ++#include + #include + #include + #include +--- 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 + #include + +-#include +- + namespace Vamp { + + /** diff --git a/vamp-plugin-sdk-libdir.diff b/vamp-plugin-sdk-libdir.diff deleted file mode 100644 index e13de77..0000000 --- a/vamp-plugin-sdk-libdir.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -74,8 +74,8 @@ INSTALL_PREFIX = @prefix@ - 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.10.0 -@@ -90,7 +90,7 @@ INSTALL_HOSTSDK_LINK_DEV = libvamp-host - 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 - # diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec index 930101e..ef80caf 100644 --- a/vamp-plugin-sdk.spec +++ b/vamp-plugin-sdk.spec @@ -1,23 +1,18 @@ Name: vamp-plugin-sdk -Version: 2.10 -Release: %autorelease +Version: 1.1b +Release: 4%{?dist} Summary: An API for audio analysis and feature extraction plugins -%global hostsdk_soname_version 3 -%global sdk_soname_version 2 +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) -%global gittag %{name}-v%{version} - -# KissFFT code in src/vamp-sdk/ext is BSD-3-Clause -# Automatically converted from old format: MIT AND BSD-3-Clause - review is highly recommended. -License: MIT AND BSD-3-Clause -URL: https://vamp-plugins.org/ -Source: https://github.com/vamp-plugins/vamp-plugin-sdk/archive/%{gittag}/%{name}-%{version}.tar.gz -Patch: %{name}-libdir.diff - -BuildRequires: make -BuildRequires: gcc-c++ BuildRequires: libsndfile-devel +#Requires: %description Vamp is an API for C and C++ plugins that process sampled audio data @@ -25,7 +20,8 @@ to produce descriptive output (measurements or semantic observations). %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel @@ -34,6 +30,7 @@ developing applications that use %{name}. %package static Summary: Static libraries for %{name} +Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static @@ -42,26 +39,26 @@ developing static applications that use %{name}. %prep -%autosetup -p1 -n %{name}-%{gittag} -sed -i 's|/lib/vamp|/%{_lib}/vamp|g' src/vamp-hostsdk/PluginHostAdapter.cpp -sed -i 's|/lib/|/%{_lib}/|g' src/vamp-hostsdk/PluginLoader.cpp +%setup -q -n %{name}-v%{version} +%patch0 -p1 -b .mk +%patch1 -p1 -b .gcc43 %build -%configure -%make_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 +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-%{_arch} +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 \ @@ -74,31 +71,43 @@ 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 + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files -%license COPYING -%doc README -%{_libdir}/libvamp-hostsdk.so.%{hostsdk_soname_version} -%{_libdir}/libvamp-hostsdk.so.%{hostsdk_soname_version}.* -%{_libdir}/libvamp-sdk.so.%{sdk_soname_version} -%{_libdir}/libvamp-sdk.so.%{sdk_soname_version}.* -%{_libdir}/vamp +%defattr(-,root,root,-) +%doc COPYING README +%{_libdir}/*.so.* %files devel +%defattr(-,root,root,-) %doc examples -%{_bindir}/vamp-* %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %files static +%defattr(-,root,root,-) %{_libdir}/*.a %changelog -%autochangelog +* Thu Jan 31 2008 Michel Salim - 1.1b-4 +- Add some #includes, needed due to GCC 4.3's header dependency cleanup + +* Mon Jan 28 2008 Michel Salim - 1.1b-3 +- Add examples to -devel subpackage +- Fix .pc files +- Preserve timestamps when installing + +* Sun Jan 27 2008 Michel Salim - 1.1b-2 +- Add missing build requirement on libsndfile-devel + +* Wed Jan 16 2008 Michel Salim - 1.1b-1 +- Initial Fedora package