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-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 6721d2f..6fa00ba 100644 --- a/zynaddsubfx.spec +++ b/zynaddsubfx.spec @@ -1,15 +1,17 @@ Summary: Real-time software synthesizer Name: zynaddsubfx -Version: 3.0.5 +Version: 3.0.6 Release: 11%{?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 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} @@ -34,6 +36,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 @@ -97,7 +103,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 @@ -105,9 +111,11 @@ 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=%{buildroot}%{_datadir}/bash-completion/completions \ + -DBASHCOMP_PKG_PATH=%{_datadir}/bash-completion/completions \ %ifarch %{ix86} x86_64 -DX86Build=ON \ %endif @@ -144,10 +152,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 +170,45 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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