diff --git a/.gitignore b/.gitignore index 3fb4bc1..693c43c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /Add64-1.2.2.tar.bz2 +/Add64-3.9.0.tar.bz2 +/Add64-3.9.2.tar.bz2 +/Add64-3.9.3.tar.bz2 diff --git a/Add64-gcc7.patch b/Add64-gcc7.patch deleted file mode 100644 index 3705ffc..0000000 --- a/Add64-gcc7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN Add64-1.2.2.org/jackprocessor.cpp Add64-1.2.2/jackprocessor.cpp ---- Add64-1.2.2.org/jackprocessor.cpp 2011-08-07 07:35:20.000000000 -0400 -+++ Add64-1.2.2/jackprocessor.cpp 2017-02-16 23:31:14.464518833 -0500 -@@ -222,7 +222,7 @@ int JackProcessor::jack_callback(jack_nf - } - for (i1 = 0; i1 < 2; i1++) { - p[i1] = (jack_default_audio_sample_t *)(jack_port_get_buffer (jackOut[i1], nframes)); -- for (i2 = 0; i2 < abs(nframes); i2++) { -+ for (i2 = 0; i2 < nframes; i2++) { - p[i1][i2] = 1e-9 * model->buf[i1][i2]; - } - } diff --git a/Add64.spec b/Add64.spec index 2caa878..6abd7b3 100644 --- a/Add64.spec +++ b/Add64.spec @@ -1,34 +1,31 @@ +%global debug_package %{nil} + Summary: An additive synthesizer using JACK Name: Add64 -Version: 1.2.2 -Release: 15%{?dist} +Version: 3.9.3 +Release: 19%{?dist} URL: http://sourceforge.net/projects/add64 Source0: http://downloads.sourceforge.net/project/add64/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop # icon taken from screenshot Source2: add64.png -# gcc7 fix -Patch0: Add64-gcc7.patch -License: GPLv3 -Group: Applications/Multimedia +Source3: Makefile +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only BuildRequires: jack-audio-connection-kit-devel -BuildRequires: qt4-devel +BuildRequires: qt5-qtbase-devel BuildRequires: desktop-file-utils +BuildRequires: make %description Add64 is an additive synthesizer using Qt and the JACK audio connection kit %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .gcc7 -sed -i -e 's|lib64|%{_lib}|' \ - -e 's|$(QT_BASE_DIR)/bin|%{_qt4_libdir}/qt4/bin|' \ - -e 's|-lm|-lm -lstdc++|' \ - -e 's|-O2 -g -Wall|%{optflags}|' Makefile -chmod -x * %build +%{_qt5_libdir}/qt5/bin/qmake -makefile make %{?_smp_mflags} %install @@ -79,20 +76,90 @@ SentUpstream: 2014-09-17 EOF -%post -update-desktop-database &> /dev/null || : - -%postun -update-desktop-database &> /dev/null || : - %files -%doc LICENSE README +%doc LICENSE %{_bindir}/%{name} %{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/add64.png %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.9.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 3.9.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jan 20 2025 Fedora Release Engineering - 3.9.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 3.9.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Jul 29 2024 Miroslav Suchý - 3.9.3-15 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 3.9.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 3.9.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.9.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Fedora Release Engineering - 3.9.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 3.9.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 3.9.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 3.9.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 3.9.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 3.9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 3.9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Erich Eickmeyer - 3.9.3-4 +- Remove jack-audio-connection-kit explicit Requires + +* Thu Oct 08 2020 Erich Eickmeyer - 3.9.3-3 +- Rebuild to call for jack-audio-connection-kit explicitly + as part of experiment for pipewire-jack compatibility + +* Mon Jul 27 2020 Fedora Release Engineering - 3.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Erich Eickmeyer - 3.9.3-1 +- New version 3.9.3 + +* Tue May 05 2020 Erich Eickmeyer - 3.9.2-1 +- New version 3.9.2 + +* Sun Apr 26 2020 Erich Eickmeyer - 3.9.0-1 +- New version 3.9.0 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.2.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..4ac69d9 --- /dev/null +++ b/Makefile @@ -0,0 +1,66 @@ +QT_BASE_DIR=/usr +QT_LIB_DIR=$(QT_BASE_DIR)/lib64 +QT_BIN_DIR=$(QT_BASE_DIR)/bin +QT_INCLUDE_DIR=$(QT_BASE_DIR)/include + +Add64: harmonics.o harmonics.moc.o \ + filter.o filter.moc.o \ + gui.o gui.moc.o \ + multislider.o multislider.moc.o \ + modslider.o modslider.moc.o \ + voicesynth.o voicesynth.moc.o \ + synth.o synth.moc.o \ + voicedata.o \ + model.o jackprocessor.o jackprocessor.moc.o main.o + gcc -g -o Add64 \ + harmonics.o harmonics.moc.o \ + multislider.o multislider.moc.o \ + modslider.o modslider.moc.o \ + filter.o filter.moc.o \ + gui.o gui.moc.o \ + voicesynth.o voicesynth.moc.o \ + synth.o synth.moc.o \ + voicedata.o \ + model.o jackprocessor.o jackprocessor.moc.o main.o \ + -L$(QT_LIB_DIR) \ + -lQtCore -lQtGui -ljack -lm + +CXXFLAGS=-I$(QT_INCLUDE_DIR) -I. -O2 -g -Wall + +filter.o: filter.cpp filter.h model.h +filter.moc.o: filter.moc.cpp filter.h model.h +filter.moc.cpp: filter.h filter.cpp + $(QT_BIN_DIR)/moc filter.h -o filter.moc.cpp +harmonics.o: harmonics.cpp harmonics.h model.h +harmonics.moc.o: harmonics.moc.cpp harmonics.h model.h +harmonics.moc.cpp: harmonics.h harmonics.cpp + $(QT_BIN_DIR)/moc harmonics.h -o harmonics.moc.cpp +multislider.o: multislider.cpp multislider.h modslider.h model.h +multislider.moc.o: multislider.moc.cpp multislider.h modslider.h model.h +multislider.moc.cpp: multislider.h multislider.cpp + $(QT_BIN_DIR)/moc multislider.h -o multislider.moc.cpp +modslider.o: modslider.cpp modslider.h model.h +modslider.moc.o: modslider.moc.cpp modslider.h model.h +modslider.moc.cpp: modslider.h modslider.cpp + $(QT_BIN_DIR)/moc modslider.h -o modslider.moc.cpp +midicontroller.o: midicontroller.cpp midicontroller.h +controlobject.o: controlobject.cpp controlobject.h +gui.o: gui.cpp gui.h harmonics.h synth.h model.h multislider.h modslider.h filter.h jackprocessor.h +gui.moc.o: gui.moc.cpp gui.h harmonics.h synth.h model.h multislider.h modslider.h filter.h jackprocessor.h +gui.moc.cpp: gui.h gui.cpp + $(QT_BIN_DIR)/moc gui.h -o gui.moc.cpp +voicesynth.o: voicesynth.cpp voicesynth.h voicedata.h model.h +voicesynth.moc.o: voicesynth.moc.cpp voicesynth.h voicedata.h model.h +voicesynth.moc.cpp: voicesynth.h voicesynth.cpp voicedata.h + $(QT_BIN_DIR)/moc voicesynth.h -o voicesynth.moc.cpp +synth.o: synth.cpp synth.h model.h +synth.moc.o: synth.moc.cpp synth.h model.h +synth.moc.cpp: synth.h synth.cpp model.h + $(QT_BIN_DIR)/moc synth.h -o synth.moc.cpp +voicedata.o: voicedata.cpp voicedata.h +model.o: model.cpp model.h voicedata.h +jackprocessor.o: jackprocessor.cpp jackprocessor.h model.h +jackprocessor.moc.o: jackprocessor.moc.cpp jackprocessor.h model.h +jackprocessor.moc.cpp: jackprocessor.h jackprocessor.cpp model.h + $(QT_BIN_DIR)/moc jackprocessor.h -o jackprocessor.moc.cpp +main.o: main.cpp gui.h model.h diff --git a/sources b/sources index 1eaaa94..1b35091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9799d5b5ca88b04b194d832c29a78c46 Add64-1.2.2.tar.bz2 +SHA512 (Add64-3.9.3.tar.bz2) = c637ed12b733d8b2f6e705b4ae38d67a4dd5f0ec4c8fd3c58c417dedb6cfeb3c0748159cfbe45655288702d359be4895ef85feb24ac6e54babccaa314ffe1851