Allow to build with CMake 4.0 (rhbz#2381655)

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -4,3 +4,5 @@ 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
+/zynaddsubfx-3.0.6.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (zynaddsubfx-3.0.2.tar.bz2) = 96d1df903a6afbaee991221ca30b21a20d97bc6d1cbe5c9fef94f2d1c3fb88e0294c263aec282559885d6e2f5841ad2c80d863af9f58f161791a33a9c0c08f57
+SHA512 (zynaddsubfx-3.0.6.tar.bz2) = 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea

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 8348df70..17c1b29d 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -301,12 +301,12 @@ endif()
+@@ -393,12 +393,12 @@ endif()
  
  if (BuildForDebug)
  	set (CMAKE_BUILD_TYPE "Debug")
@@ -34,18 +69,7 @@ index c2d86f7..245bbbe 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/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

zynaddsubfx-cortex.patch

@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 17c1b29d..0fdca8e4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -247,7 +247,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"
+ )
+ 

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 <string>
+ #include <vector>
++#include <cstdint>
+ #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 <cstdint>
+ #include "Engine.h"
+ 
+ namespace zyn {

zynaddsubfx.spec

@@ -1,18 +1,24 @@
 Summary:        Real-time software synthesizer
 Name:           zynaddsubfx
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.0.6
+Release:        11%{?dist}
 # Source is a collective work, distributed by
-License:        GPLv2 and GPLv2+
-Group:          Applications/Multimedia
+# 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
-Patch1:         zynaddsubfx-buildflags.patch
+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}
 
+BuildRequires: make
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  alsa-lib-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -20,6 +26,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
@@ -27,9 +34,12 @@ BuildRequires:  mxml-devel
 BuildRequires:  portaudio-devel
 BuildRequires:  zlib-devel
 BuildRequires:  liblo-devel
-BuildRequires:  non-ntk-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
@@ -40,7 +50,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
@@ -54,7 +63,6 @@ synthesizer.
 
 %package dssi
 Summary:        Real-time software synthesizer for DSSI
-Group:          Applications/Multimedia
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       dssi
 
@@ -67,8 +75,7 @@ effects like Reverb, Echo, Chorus, Phaser...
 This package includes the DSSI implementation of the synthesizer.
 
 %package lv2
-Summary:        ${name} LV2 plugins
-Group:          Applications/Multimedia
+Summary:        %{name} LV2 plugins
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       lv2
 
@@ -81,8 +88,7 @@ effects like Reverb, Echo, Chorus, Phaser...
 This package includes the LV2 implementation of the synthesizer.
 
 %package vst
-Summary:        ${name} VST plugins
-Group:          Applications/Multimedia
+Summary:        %{name} VST plugins
 Requires:       %{name}-common = %{version}-%{release}
 
 %description vst
@@ -94,11 +100,10 @@ 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
+for i in AUTHORS.txt; do
    iconv -f iso8859-1 -t utf8 $i -o tmpfile
    touch -r $i tmpfile
    mv -f tmpfile $i
@@ -106,25 +111,25 @@ done
 
 
 %build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-   %cmake \
-      -DDefaultOutput=jack -DPluginLibDir=%{_libdir}\
+# 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 \
 %ifarch %{ix86} x86_64
-      -DX86Build=ON \
+  -DX86Build=ON \
 %endif
-      ..
-popd
+  %{nil}
 
-make %{?_smp_mflags} -C %{_target_platform}
+%cmake_build
 
 # 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}
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
+%cmake_install
 
 mkdir -p %{buildroot}%{_datadir}/%{name}
 
@@ -147,9 +152,12 @@ 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 COPYING
+%doc AUTHORS.txt
+%license COPYING
 %{_datadir}/%{name}/
 
 %files dssi
@@ -162,6 +170,90 @@ install -d -m 0755 %{buildroot}%{_libdir}/%{name}
 %{_libdir}/vst/*.so
 
 %changelog
+* Tue Nov 11 2025 Cristian Le <git@lecris.dev> - 3.0.6-11
+- Allow to build with CMake 4.0 (rhbz#2381655)
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Aug 07 2024 Miroslav Suchý <msuchy@redhat.com> - 3.0.6-8
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jul 11 2024 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.6-6
+- Exclude i686 because build system dumps core #2297277
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jul 23 2023 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.6-4
+- Fix FTBFS in Fedora rawhide: missing cstdint
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 03 2022 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.6-1
+- Update to 3.0.6
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 3.0.5-10
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 31 2020 Jeff Law <law@redhat.com> - 3.0.5-8
+- Do not ask for cortex-a9 which conflicts with baseline armv7a
+- Re-enable LTO
+
+* Mon Aug 10 2020 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.5-7
+- Fix FTBFS in Fedora rawhide/f33 (#1865663)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan 22 2020 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.5-3
+- Rebuilt for new non-ntk
+
+* Wed Aug 28 2019 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.5-2
+- Build without non-ntk
+- Install bash completion file
+
+* Sun Jul 28 2019 Guido Aulisi <guido.aulisi@gmail.com> - 3.0.5-1
+- Update to 3.0.5
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild