From a13dcb56aba19932d68f8d6ea45b6067e3150b0c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 01/32] add BuildRequires: gcc-c++,gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- zynaddsubfx.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 0941cec..0d5b789 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -13,6 +13,8 @@ Patch1: zynaddsubfx-buildflags.patch Requires: hicolor-icon-theme Requires: %{name}-common = %{version}-%{release} +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel BuildRequires: cmake BuildRequires: desktop-file-utils From ee4269190f94abeac2d527b9ade5e6a1cf48cf6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:54:06 +0000 Subject: [PATCH 02/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 0d5b789..d9e1a75 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ Group: Applications/Multimedia @@ -164,6 +164,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b80a666b39abb90417354199d975fcbe2f0ddd9c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 03/32] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- zynaddsubfx.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index d9e1a75..ebe6840 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -4,7 +4,6 @@ Version: 3.0.2 Release: 3%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ -Group: Applications/Multimedia URL: http://zynaddsubfx.sourceforge.net Source0: http://download.sf.net/sourceforge/zynaddsubfx/zynaddsubfx-%{version}.tar.bz2 # We cannot build this from source since Fedora's texlive is too old @@ -42,7 +41,6 @@ This package includes the standalone implementation of the synthesizer. %package common Summary: Common files for ZynAddSubFX synthesizers -Group: Applications/Multimedia BuildArch: noarch %description common @@ -56,7 +54,6 @@ synthesizer. %package dssi Summary: Real-time software synthesizer for DSSI -Group: Applications/Multimedia Requires: %{name}-common = %{version}-%{release} Requires: dssi @@ -70,7 +67,6 @@ This package includes the DSSI implementation of the synthesizer. %package lv2 Summary: ${name} LV2 plugins -Group: Applications/Multimedia Requires: %{name}-common = %{version}-%{release} Requires: lv2 @@ -84,7 +80,6 @@ This package includes the LV2 implementation of the synthesizer. %package vst Summary: ${name} VST plugins -Group: Applications/Multimedia Requires: %{name}-common = %{version}-%{release} %description vst From 209dd4fff8a926f692f44741c5f0cd11fa78920d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:16:13 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index ebe6840..05a0c49 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.2 -Release: 3%{?dist} +Release: 4%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -159,6 +159,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 3.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From eaebe5af1ad94910fda3d1b4904dbb719368946e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:06:16 +0000 Subject: [PATCH 05/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 05a0c49..1b94235 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.2 -Release: 4%{?dist} +Release: 5%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -159,6 +159,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a07b35290457cf4c2e3b874e9128e72470568d4f Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Sun, 28 Jul 2019 18:10:43 +0200 Subject: [PATCH 06/32] Update to 3.0.5 --- .gitignore | 1 + sources | 2 +- zynaddsubfx.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3dd3c26..6271f3c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ZynAddSubFX-2.4.1.tar.bz2 /ZynAddSubFX-2.4.3.tar.bz2 /zynaddsubfx-2.4.4.tar.xz /zynaddsubfx-3.0.2.tar.bz2 +/zynaddsubfx-3.0.5.tar.bz2 diff --git a/sources b/sources index aca22e5..26ac081 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zynaddsubfx-3.0.2.tar.bz2) = 96d1df903a6afbaee991221ca30b21a20d97bc6d1cbe5c9fef94f2d1c3fb88e0294c263aec282559885d6e2f5841ad2c80d863af9f58f161791a33a9c0c08f57 +SHA512 (zynaddsubfx-3.0.5.tar.bz2) = 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8 diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 1b94235..e186ea0 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx -Version: 3.0.2 -Release: 5%{?dist} +Version: 3.0.5 +Release: 1%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -113,15 +113,15 @@ pushd %{_target_platform} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} # build external programs -make %{?_smp_mflags} -C ExternalPrograms/Controller -make %{?_smp_mflags} -C ExternalPrograms/Spliter +%make_build -C ExternalPrograms/Controller +%make_build -C ExternalPrograms/Spliter %install -make install DESTDIR=%{buildroot} -C %{_target_platform} +%make_install -C %{_target_platform} mkdir -p %{buildroot}%{_datadir}/%{name} @@ -159,6 +159,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sun Jul 28 2019 Guido Aulisi - 3.0.5-1 +- Update to 3.0.5 + * Sat Jul 27 2019 Fedora Release Engineering - 3.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5c00a72f25c9ef95b427e04d325d1d608c279150 Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Wed, 28 Aug 2019 12:23:42 +0000 Subject: [PATCH 07/32] Build without non-ntk Install bash completion file --- zynaddsubfx-buildflags.patch | 58 +++++++++++++++++++++++++----------- zynaddsubfx.spec | 16 ++++++---- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/zynaddsubfx-buildflags.patch b/zynaddsubfx-buildflags.patch index d099f73..86cdbf4 100644 --- a/zynaddsubfx-buildflags.patch +++ b/zynaddsubfx-buildflags.patch @@ -1,29 +1,64 @@ +diff --git a/ExternalPrograms/Controller/Makefile b/ExternalPrograms/Controller/Makefile +index ff747fad..19fc7065 100644 +--- a/ExternalPrograms/Controller/Makefile ++++ b/ExternalPrograms/Controller/Makefile +@@ -1,5 +1,5 @@ + controller: main.o Controller.o ControllerUI.o +- gcc -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++ ++ gcc $(LDFLAGS) -o controller *.o `fltk-config --ldflags` -lasound -lpthread -lm -lstdc++ + + ControllerUI.h: ControllerUI.fl + fluid -c ControllerUI.fl +@@ -8,13 +8,13 @@ ControllerUI.cxx: ControllerUI.h + echo ControllerUI.cxx + + ControllerUI.o: ControllerUI.cxx ControllerUI.h +- gcc `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o ++ gcc $(CXXFLAGS) `fltk-config --cflags` -c ControllerUI.cxx -o ControllerUI.o + + Controller.o: Controller.C Controller.h +- gcc `fltk-config --cflags` -c Controller.C -o Controller.o ++ gcc $(CXXFLAGS) `fltk-config --cflags` -c Controller.C -o Controller.o + + main.o: main.C Controller.h ControllerUI.h +- gcc `fltk-config --cflags` -c main.C -o main.o ++ gcc $(CXXFLAGS) `fltk-config --cflags` -c main.C -o main.o + + clean: + rm -f *.o controller ControllerUI.cxx ControllerUI.h diff --git a/ExternalPrograms/Spliter/Makefile b/ExternalPrograms/Spliter/Makefile -index c98fc41..49953cf 100644 +index c98fc412..c675f4a4 100644 --- a/ExternalPrograms/Spliter/Makefile +++ b/ExternalPrograms/Spliter/Makefile +@@ -1,5 +1,5 @@ + spliter: main.o Spliter.o SpliterUI.o +- gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++ ++ gcc $(LDFLAGS) -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++ -lpthread + + SpliterUI.h: SpliterUI.fl + fluid -c SpliterUI.fl @@ -8,13 +8,13 @@ SpliterUI.cxx: SpliterUI.h echo SpliterUI.cxx SpliterUI.o: SpliterUI.cxx SpliterUI.h - gcc -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o -+ gcc $(CFLAGS) -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o ++ gcc $(CXXFLAGS) -g `fltk-config --cflags` -c SpliterUI.cxx -o SpliterUI.o Spliter.o: Spliter.C Spliter.h - gcc -g `fltk-config --cflags` -c Spliter.C -o Spliter.o -+ gcc $(CFLAGS) -g `fltk-config --cflags` -c Spliter.C -o Spliter.o ++ gcc $(CXXFLAGS) -g `fltk-config --cflags` -c Spliter.C -o Spliter.o main.o: main.C Spliter.h SpliterUI.h - gcc -g `fltk-config --cflags` -c main.C -o main.o -+ gcc $(CFLAGS) -g `fltk-config --cflags` -c main.C -o main.o ++ gcc $(CXXFLAGS) -g `fltk-config --cflags` -c main.C -o main.o clean: rm -f *.o spliter SpliterUI.cxx SpliterUI.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c2d86f7..245bbbe 100644 +index 08d9eea0..959b852e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -301,12 +301,12 @@ endif() +@@ -323,12 +323,12 @@ endif() if (BuildForDebug) set (CMAKE_BUILD_TYPE "Debug") @@ -38,14 +73,3 @@ index c2d86f7..245bbbe 100644 if (BuildForAMD_X86_64) set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}") -diff --git a/ExternalPrograms/Spliter/Makefile b/ExternalPrograms/Spliter/Makefile -index 49953cf..15a246a 100644 ---- a/ExternalPrograms/Spliter/Makefile -+++ b/ExternalPrograms/Spliter/Makefile -@@ -1,5 +1,5 @@ - spliter: main.o Spliter.o SpliterUI.o -- gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++ -+ gcc -o spliter *.o `fltk-config --ldflags` -lasound -lstdc++ -lpthread - - SpliterUI.h: SpliterUI.fl - fluid -c SpliterUI.fl diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index e186ea0..547ee88 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 1%{?dist} +Release: 2%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -28,7 +28,6 @@ BuildRequires: mxml-devel BuildRequires: portaudio-devel BuildRequires: zlib-devel BuildRequires: liblo-devel -BuildRequires: non-ntk-devel BuildRequires: libXpm-devel %description @@ -106,7 +105,8 @@ done mkdir -p %{_target_platform} pushd %{_target_platform} %cmake \ - -DDefaultOutput=jack -DPluginLibDir=%{_libdir}\ + -DDefaultOutput=jack -DPluginLibDir=%{_libdir} \ + -DBASHCOMP_PKG_PATH=%{buildroot}%{_datadir}/bash-completion/completions \ %ifarch %{ix86} x86_64 -DX86Build=ON \ %endif @@ -119,8 +119,8 @@ popd %make_build -C ExternalPrograms/Controller %make_build -C ExternalPrograms/Spliter - %install +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions %make_install -C %{_target_platform} mkdir -p %{buildroot}%{_datadir}/%{name} @@ -144,9 +144,11 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_bindir}/* %{_datadir}/applications/%{name}*.desktop %{_datadir}/pixmaps/zynaddsubfx.svg +%{_datadir}/bash-completion/completions/%{name} %files common -%doc AUTHORS.txt ChangeLog COPYING +%doc AUTHORS.txt ChangeLog +%license COPYING %{_datadir}/%{name}/ %files dssi @@ -159,6 +161,10 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Wed Aug 28 2019 Guido Aulisi - 3.0.5-2 +- Build without non-ntk +- Install bash completion file + * Sun Jul 28 2019 Guido Aulisi - 3.0.5-1 - Update to 3.0.5 From 69a7dfcd9c7c1442bc2915cadf8d31bb44168d1a Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Sat, 9 Nov 2019 12:44:08 -0500 Subject: [PATCH 08/32] Fix macro syntax which displays incorrect in dnf and other apps Signed-off-by: Rick Elrod --- zynaddsubfx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 547ee88..a7f04c8 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -65,7 +65,7 @@ effects like Reverb, Echo, Chorus, Phaser... This package includes the DSSI implementation of the synthesizer. %package lv2 -Summary: ${name} LV2 plugins +Summary: %{name} LV2 plugins Requires: %{name}-common = %{version}-%{release} Requires: lv2 @@ -78,7 +78,7 @@ effects like Reverb, Echo, Chorus, Phaser... This package includes the LV2 implementation of the synthesizer. %package vst -Summary: ${name} VST plugins +Summary: %{name} VST plugins Requires: %{name}-common = %{version}-%{release} %description vst From c51879569dec2f46a938b4601f30d4163dbfa254 Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Wed, 22 Jan 2020 21:08:56 +0100 Subject: [PATCH 09/32] Rebuilt for new non-ntk --- zynaddsubfx.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index a7f04c8..279fd9c 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,13 +1,13 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net Source0: http://download.sf.net/sourceforge/zynaddsubfx/zynaddsubfx-%{version}.tar.bz2 # We cannot build this from source since Fedora's texlive is too old -Patch1: zynaddsubfx-buildflags.patch +Patch0: zynaddsubfx-buildflags.patch Requires: hicolor-icon-theme Requires: %{name}-common = %{version}-%{release} @@ -21,6 +21,7 @@ BuildRequires: dssi-devel BuildRequires: fftw3-devel BuildRequires: fltk-devel BuildRequires: fltk-fluid +BuildRequires: non-ntk-devel BuildRequires: ImageMagick BuildRequires: jack-audio-connection-kit-devel BuildRequires: lash-devel @@ -90,8 +91,7 @@ effects like Reverb, Echo, Chorus, Phaser... This package includes the VST implementation of the synthesizer. %prep -%setup -q -%patch1 -p1 -b .flags +%autosetup -p 1 # Fix encoding for i in AUTHORS.txt ChangeLog; do @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Wed Jan 22 2020 Guido Aulisi - 3.0.5-3 +- Rebuilt for new non-ntk + * Wed Aug 28 2019 Guido Aulisi - 3.0.5-2 - Build without non-ntk - Install bash completion file From 288cfc5ef80c3551f40f2c3c7a1daa1af84427ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:25:08 +0000 Subject: [PATCH 10/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 279fd9c..3772b99 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 3%{?dist} +Release: 4%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jan 22 2020 Guido Aulisi - 3.0.5-3 - Rebuilt for new non-ntk From 1d7a4f6abf29495067548824270826f79805d9c0 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 19:25:45 +0200 Subject: [PATCH 11/32] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- zynaddsubfx.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 3772b99..a1576a7 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -102,18 +102,15 @@ done %build -mkdir -p %{_target_platform} -pushd %{_target_platform} - %cmake \ - -DDefaultOutput=jack -DPluginLibDir=%{_libdir} \ - -DBASHCOMP_PKG_PATH=%{buildroot}%{_datadir}/bash-completion/completions \ +%cmake \ + -DDefaultOutput=jack -DPluginLibDir=%{_libdir} \ + -DBASHCOMP_PKG_PATH=%{buildroot}%{_datadir}/bash-completion/completions \ %ifarch %{ix86} x86_64 - -DX86Build=ON \ + -DX86Build=ON \ %endif - .. -popd + %{nil} -%make_build -C %{_target_platform} +%cmake_build # build external programs %make_build -C ExternalPrograms/Controller @@ -121,7 +118,7 @@ popd %install mkdir -p %{buildroot}%{_datadir}/bash-completion/completions -%make_install -C %{_target_platform} +%cmake_install mkdir -p %{buildroot}%{_datadir}/%{name} From f5ccdb79485608c43b611d56519e7f89423fdc55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:28:49 +0000 Subject: [PATCH 12/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index a1576a7..effeaac 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 4%{?dist} +Release: 5%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -158,6 +158,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 3.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f8f557e2832979b39d3c1d112637e53df585f289 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:50:32 +0000 Subject: [PATCH 13/32] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index effeaac..324d36b 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 5%{?dist} +Release: 6%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -158,6 +158,10 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.0.5-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 62fc042b1c0b21d7b672e9e3490e69cd9fa6a330 Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Mon, 10 Aug 2020 09:00:02 +0200 Subject: [PATCH 14/32] Fix FTBFS in Fedora rawhide/f33 (#1865663) Disable LTO --- zynaddsubfx.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 324d36b..2f56d01 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,10 @@ +# Disable lto +%define _lto_cflags %{nil} + Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 6%{?dist} +Release: 7%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -158,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Mon Aug 10 2020 Guido Aulisi - 3.0.5-7 +- Fix FTBFS in Fedora rawhide/f33 (#1865663) + * Sat Aug 01 2020 Fedora Release Engineering - 3.0.5-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 69b858444cd66010663cce5cecfbdffe2e95a728 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 31 Aug 2020 12:49:34 -0600 Subject: [PATCH 15/32] - Do not ask for cortex-a9 which conflicts with baseline armv7a - Re-enable LTO --- zynaddsubfx-cortex.patch | 13 +++++++++++++ zynaddsubfx.spec | 11 +++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 zynaddsubfx-cortex.patch diff --git a/zynaddsubfx-cortex.patch b/zynaddsubfx-cortex.patch new file mode 100644 index 0000000..557c07f --- /dev/null +++ b/zynaddsubfx-cortex.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 959b852..232b0bf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -199,7 +199,7 @@ set (BuildOptions_X86_64Core2 + ) + + set (BuildOptions_NEON +- "-march=armv7-a -mfloat-abi=hard -mfpu=neon -mcpu=cortex-a9 -mtune=cortex-a9 -pipe -mvectorize-with-neon-quad -funsafe-loop-optimizations" ++ "-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a9 -pipe -mvectorize-with-neon-quad -funsafe-loop-optimizations" + CACHE STRING "Cortex_a9 compiler options" + ) + set (BuildOptions_SSE diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 2f56d01..b994cd4 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,16 +1,15 @@ -# Disable lto -%define _lto_cflags %{nil} - Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 7%{?dist} +Release: 8%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net Source0: http://download.sf.net/sourceforge/zynaddsubfx/zynaddsubfx-%{version}.tar.bz2 # We cannot build this from source since Fedora's texlive is too old Patch0: zynaddsubfx-buildflags.patch +# Do not ask for cortex-a9 which conflicts with the armv7a baseline +Patch1: zynaddsubfx-cortex.patch Requires: hicolor-icon-theme Requires: %{name}-common = %{version}-%{release} @@ -161,6 +160,10 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Mon Aug 31 2020 Jeff Law - 3.0.5-8 +- Do not ask for cortex-a9 which conflicts with baseline armv7a +- Re-enable LTO + * Mon Aug 10 2020 Guido Aulisi - 3.0.5-7 - Fix FTBFS in Fedora rawhide/f33 (#1865663) From 5f73a546919f7eb5590b4f2efc5fcc7eee43eef8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:56:54 +0000 Subject: [PATCH 16/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- zynaddsubfx.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index b994cd4..b592ca2 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -14,6 +14,7 @@ Patch1: zynaddsubfx-cortex.patch Requires: hicolor-icon-theme Requires: %{name}-common = %{version}-%{release} +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel From 25995c59d5c8f30b4e7a5e7ee24de70953eed0ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:47:07 +0000 Subject: [PATCH 17/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index b592ca2..c38a50f 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 8%{?dist} +Release: 9%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 3.0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 31 2020 Jeff Law - 3.0.5-8 - Do not ask for cortex-a9 which conflicts with baseline armv7a - Re-enable LTO From 8afdf3268f11320f6b01941779e11829eddf1a00 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:41:13 +0100 Subject: [PATCH 18/32] Rebuilt for removed libstdc++ symbol (#1937698) --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index c38a50f..5c2801f 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 9%{?dist} +Release: 10%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Tue Mar 30 2021 Jonathan Wakely - 3.0.5-10 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Thu Jan 28 2021 Fedora Release Engineering - 3.0.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2a4ab89b4c509045e1c42b1df85e1890b412d9e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:24:08 +0000 Subject: [PATCH 19/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 5c2801f..6721d2f 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 10%{?dist} +Release: 11%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 30 2021 Jonathan Wakely - 3.0.5-10 - Rebuilt for removed libstdc++ symbol (#1937698) From 2bcc586e31fefb56d6a636e3138c7be0c962e256 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:58:07 +0000 Subject: [PATCH 20/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 6721d2f..98219c8 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 11%{?dist} +Release: 12%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.0.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.0.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6da71065edec113146b92caaeadebf745413d3cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 14:02:12 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 98219c8..f465443 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.5 -Release: 12%{?dist} +Release: 13%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -161,6 +161,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.0.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.0.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bce8a97c501913335d7f0c9103688b609442f5b1 Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Sat, 3 Dec 2022 14:39:17 +0100 Subject: [PATCH 22/32] Update to 3.0.6 --- .gitignore | 1 + sources | 2 +- zynaddsubfx-buildflags.patch | 8 ++++---- zynaddsubfx-cortex.patch | 6 +++--- zynaddsubfx.spec | 14 +++++++++----- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 6271f3c..a3a1402 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ZynAddSubFX-2.4.1.tar.bz2 /zynaddsubfx-2.4.4.tar.xz /zynaddsubfx-3.0.2.tar.bz2 /zynaddsubfx-3.0.5.tar.bz2 +/zynaddsubfx-3.0.6.tar.bz2 diff --git a/sources b/sources index 26ac081..e1ad471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zynaddsubfx-3.0.5.tar.bz2) = 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8 +SHA512 (zynaddsubfx-3.0.6.tar.bz2) = 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea diff --git a/zynaddsubfx-buildflags.patch b/zynaddsubfx-buildflags.patch index 86cdbf4..7720072 100644 --- a/zynaddsubfx-buildflags.patch +++ b/zynaddsubfx-buildflags.patch @@ -55,10 +55,10 @@ index c98fc412..c675f4a4 100644 clean: rm -f *.o spliter SpliterUI.cxx SpliterUI.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 08d9eea0..959b852e 100644 +index 8348df70..17c1b29d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -323,12 +323,12 @@ endif() +@@ -393,12 +393,12 @@ endif() if (BuildForDebug) set (CMAKE_BUILD_TYPE "Debug") @@ -69,7 +69,7 @@ index 08d9eea0..959b852e 100644 set (CMAKE_BUILD_TYPE "Release") - set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic}) -+ set (CMAKE_CXX_FLAGS_RELEASE "${BuildOptionsBasic} ${CMAKE_CXX_FLAGS}") - ++ set (CMAKE_CXX_FLAGS_RELEASE "${BuildOptionsDebug} ${CMAKE_CXX_FLAGS}") + if (BuildForAMD_X86_64) set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}") diff --git a/zynaddsubfx-cortex.patch b/zynaddsubfx-cortex.patch index 557c07f..0692361 100644 --- a/zynaddsubfx-cortex.patch +++ b/zynaddsubfx-cortex.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 959b852..232b0bf 100644 +index 17c1b29d..0fdca8e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -199,7 +199,7 @@ set (BuildOptions_X86_64Core2 +@@ -247,7 +247,7 @@ set (BuildOptions_X86_64Core2 ) set (BuildOptions_NEON @@ -10,4 +10,4 @@ index 959b852..232b0bf 100644 + "-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a9 -pipe -mvectorize-with-neon-quad -funsafe-loop-optimizations" CACHE STRING "Cortex_a9 compiler options" ) - set (BuildOptions_SSE + diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index f465443..bb43d15 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx -Version: 3.0.5 -Release: 13%{?dist} +Version: 3.0.6 +Release: 1%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -97,7 +97,7 @@ This package includes the VST implementation of the synthesizer. %autosetup -p 1 # Fix encoding -for i in AUTHORS.txt ChangeLog; do +for i in AUTHORS.txt; do iconv -f iso8859-1 -t utf8 $i -o tmpfile touch -r $i tmpfile mv -f tmpfile $i @@ -107,7 +107,7 @@ done %build %cmake \ -DDefaultOutput=jack -DPluginLibDir=%{_libdir} \ - -DBASHCOMP_PKG_PATH=%{buildroot}%{_datadir}/bash-completion/completions \ + -DBASHCOMP_PKG_PATH=%{_datadir}/bash-completion/completions \ %ifarch %{ix86} x86_64 -DX86Build=ON \ %endif @@ -144,10 +144,11 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_bindir}/* %{_datadir}/applications/%{name}*.desktop %{_datadir}/pixmaps/zynaddsubfx.svg +%{_datadir}/pixmaps/zynaddsubfx.png %{_datadir}/bash-completion/completions/%{name} %files common -%doc AUTHORS.txt ChangeLog +%doc AUTHORS.txt %license COPYING %{_datadir}/%{name}/ @@ -161,6 +162,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Dec 03 2022 Guido Aulisi - 3.0.6-1 +- Update to 3.0.6 + * Sat Jul 23 2022 Fedora Release Engineering - 3.0.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a23798354773b12538fa1cfdbf6be38b1056342c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:22:45 +0000 Subject: [PATCH 23/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index bb43d15..a23da5c 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 1%{?dist} +Release: 2%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -162,6 +162,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 03 2022 Guido Aulisi - 3.0.6-1 - Update to 3.0.6 From e6eb0e49df2be04f95c1768d6785e82ff3c82574 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:49:13 +0000 Subject: [PATCH 24/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index a23da5c..b0a4617 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 2%{?dist} +Release: 3%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -162,6 +162,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 50e4f787021122a68c2b97a016e652ec235ecc63 Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Sun, 23 Jul 2023 10:59:35 +0200 Subject: [PATCH 25/32] Fix FTBFS in Fedora rawhide Missing cstdint --- zynaddsubfx-missing-cstdint.patch | 24 ++++++++++++++++++++++++ zynaddsubfx.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 zynaddsubfx-missing-cstdint.patch diff --git a/zynaddsubfx-missing-cstdint.patch b/zynaddsubfx-missing-cstdint.patch new file mode 100644 index 0000000..d75739d --- /dev/null +++ b/zynaddsubfx-missing-cstdint.patch @@ -0,0 +1,24 @@ +diff --git a/src/Misc/Bank.h b/src/Misc/Bank.h +index 5120441a..09768adf 100644 +--- a/src/Misc/Bank.h ++++ b/src/Misc/Bank.h +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include "../globals.h" + #include "Config.h" + +diff --git a/src/Nio/MidiIn.h b/src/Nio/MidiIn.h +index ce0bcfec..e7177716 100644 +--- a/src/Nio/MidiIn.h ++++ b/src/Nio/MidiIn.h +@@ -16,6 +16,7 @@ + #ifndef MIDI_IN_H + #define MIDI_IN_H + ++#include + #include "Engine.h" + + namespace zyn { diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index b0a4617..015d81f 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 3%{?dist} +Release: 4%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -10,6 +10,7 @@ Source0: http://download.sf.net/sourceforge/zynaddsubfx/zynaddsubfx-%{ver Patch0: zynaddsubfx-buildflags.patch # Do not ask for cortex-a9 which conflicts with the armv7a baseline Patch1: zynaddsubfx-cortex.patch +Patch2: %{name}-missing-cstdint.patch Requires: hicolor-icon-theme Requires: %{name}-common = %{version}-%{release} @@ -162,6 +163,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sun Jul 23 2023 Guido Aulisi - 3.0.6-4 +- Fix FTBFS in Fedora rawhide: missing cstdint + * Sat Jul 22 2023 Fedora Release Engineering - 3.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ce37a18d9f9e7a23aa923d1d63cd6c2eab54c914 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:21:11 +0000 Subject: [PATCH 26/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 015d81f..69d6239 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 4%{?dist} +Release: 5%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -163,6 +163,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jul 23 2023 Guido Aulisi - 3.0.6-4 - Fix FTBFS in Fedora rawhide: missing cstdint From 501c5f840d0cc1ad435ef720a94c57f344b4237c Mon Sep 17 00:00:00 2001 From: Guido Aulisi Date: Thu, 11 Jul 2024 10:59:27 +0200 Subject: [PATCH 27/32] Exclude i686 because build system dumps core Bug #2297277 --- zynaddsubfx.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 69d6239..9919dd0 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 5%{?dist} +Release: 6%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -35,6 +35,10 @@ BuildRequires: zlib-devel BuildRequires: liblo-devel BuildRequires: libXpm-devel +# Build dumps core on i686 +# Bug 2297277 +ExcludeArch: i686 + %description ZynAddSubFX is an open source software synthesizer capable of making a countless number of instrument sounds. It is microtonal, and the instruments @@ -163,6 +167,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Thu Jul 11 2024 Guido Aulisi - 3.0.6-6 +- Exclude i686 because build system dumps core #2297277 + * Sat Jan 27 2024 Fedora Release Engineering - 3.0.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c2fe5700726355ce5ce15e03e2eadfd0fa5bae07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:59:29 +0000 Subject: [PATCH 28/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 9919dd0..ef1f985 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 6%{?dist} +Release: 7%{?dist} # Source is a collective work, distributed by License: GPLv2 and GPLv2+ URL: http://zynaddsubfx.sourceforge.net @@ -167,6 +167,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 11 2024 Guido Aulisi - 3.0.6-6 - Exclude i686 because build system dumps core #2297277 From aaf595045b7d952136fbe4407a9320e1c0366c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 10:21:51 +0200 Subject: [PATCH 29/32] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zynaddsubfx.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index ef1f985..287e676 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,9 +1,10 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 7%{?dist} +Release: 8%{?dist} # Source is a collective work, distributed by -License: GPLv2 and GPLv2+ +# Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. +License: GPL-2.0-only AND GPL-2.0-or-later URL: http://zynaddsubfx.sourceforge.net Source0: http://download.sf.net/sourceforge/zynaddsubfx/zynaddsubfx-%{version}.tar.bz2 # We cannot build this from source since Fedora's texlive is too old @@ -167,6 +168,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Wed Aug 07 2024 Miroslav Suchý - 3.0.6-8 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.0.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d10367c652bd3c83f50a8f82b73a18d5a81ba0f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:55:17 +0000 Subject: [PATCH 30/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index 287e676..cda7b08 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 8%{?dist} +Release: 9%{?dist} # Source is a collective work, distributed by # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later @@ -168,6 +168,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 3.0.6-8 - convert license to SPDX From 8268e93c8fa2fe9278771bac565c1749f7c27cf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:22:16 +0000 Subject: [PATCH 31/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zynaddsubfx.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index cda7b08..a62123e 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 9%{?dist} +Release: 10%{?dist} # Source is a collective work, distributed by # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later @@ -168,6 +168,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.0.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e0da53d13f14a9128acbb2493ca202860d02f882 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 11 Nov 2025 14:40:55 +0100 Subject: [PATCH 32/32] Allow to build with CMake 4.0 (rhbz#2381655) --- zynaddsubfx.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zynaddsubfx.spec b/zynaddsubfx.spec index a62123e..6fa00ba 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,7 +1,7 @@ Summary: Real-time software synthesizer Name: zynaddsubfx Version: 3.0.6 -Release: 10%{?dist} +Release: 11%{?dist} # Source is a collective work, distributed by # Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. License: GPL-2.0-only AND GPL-2.0-or-later @@ -111,6 +111,8 @@ done %build +# TODO: Please submit an issue to upstream (rhbz#2381655) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake \ -DDefaultOutput=jack -DPluginLibDir=%{_libdir} \ -DBASHCOMP_PKG_PATH=%{_datadir}/bash-completion/completions \ @@ -168,6 +170,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name} %{_libdir}/vst/*.so %changelog +* Tue Nov 11 2025 Cristian Le - 3.0.6-11 +- Allow to build with CMake 4.0 (rhbz#2381655) + * Fri Jul 25 2025 Fedora Release Engineering - 3.0.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild