From 8ea502b9e27cbf90fad5c848a8191049a44e0b3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:49:33 +0000 Subject: [PATCH 01/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index d5ddd52..15e0154 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2020.06.29 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -59,6 +59,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2020.06.29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2020.06.29-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 575ed1a82e37a63c4e9468a103dd2a79b4acf7e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:20:16 +0000 Subject: [PATCH 02/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 15e0154..ed64af4 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2020.06.29 -Release: 6%{?dist} +Release: 7%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -59,6 +59,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2020.06.29-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2020.06.29-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 353b34406e8f87f405ac7b920e10dfcdfb006f5c Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Tue, 6 Dec 2022 06:29:26 +0000 Subject: [PATCH 03/18] Update to new upstream version 2022.12.05, also fixes C99 compatibility issues. --- abcMIDI.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index ed64af4..2dbfac1 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,12 +1,13 @@ Name: abcMIDI -Version: 2020.06.29 -Release: 7%{?dist} +Version: 2022.12.05 +Release: 8%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia License: GPLv2+ URL: https://ifdo.ca/~seymour/runabc/top.html Source0: https://ifdo.ca/~seymour/runabc/%{name}-%{version}.zip + BuildRequires: gcc dos2unix BuildRequires: make @@ -59,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Tue Dec 06 2022 Peter Fordham - 2022.12.05-8 +- New upstream release, fixes C99 issues + * Wed Jul 20 2022 Fedora Release Engineering - 2020.06.29-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 8f23b1b..415b730 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abcMIDI-2020.06.29.zip) = a53acf12a4360a4ae7e5b0c96084fc7e151e2c7640486824524520e73b12d51cf0c3345aca8d39331e886fb50023db2912575c772dd376db6dd976e3393be55f +SHA512 (abcMIDI-2022.12.05.zip) = 59dc2672629f1e532418eaa187f5d2edfc2691b56c3db64ba032e994c0cda2e1ebaf33d550ebe1b19e205502ad6be5dc21370241ea6efcd4a3c746163dd1e141 From f268b6f5dd2d7364f78f44cdf817b8378b9a41e5 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Tue, 13 Dec 2022 22:11:39 -0500 Subject: [PATCH 04/18] New upstream release --- abcMIDI.spec | 7 +++++-- sources | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 2dbfac1..727bdb7 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI -Version: 2022.12.05 -Release: 8%{?dist} +Version: 2022.12.09 +Release: 1%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -60,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Tue Dec 13 2022 Stuart Gathman - 2022.12.09-1 +- New upstream release, removes compiled binaries :-{ + * Tue Dec 06 2022 Peter Fordham - 2022.12.05-8 - New upstream release, fixes C99 issues diff --git a/sources b/sources index 415b730..2fd8b09 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (abcMIDI-2022.12.05.zip) = 59dc2672629f1e532418eaa187f5d2edfc2691b56c3db64ba032e994c0cda2e1ebaf33d550ebe1b19e205502ad6be5dc21370241ea6efcd4a3c746163dd1e141 +SHA512 (abcMIDI-2022.12.09.zip) = 5eae6a2a9e5331a071627eba3687522f0682b7f7a587a05805fc812181101672ddc6337a3e20ac9d1968aebe3c0834f1d81061544a001cf43247dd903f57388f From f7b77faf8f964a3d767aa7602d51811c5248302a Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Tue, 13 Dec 2022 22:30:57 -0500 Subject: [PATCH 05/18] Remove bad source archive from sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 2fd8b09..fc50539 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (abcMIDI-2022.12.05.zip) = 59dc2672629f1e532418eaa187f5d2edfc2691b56c3db64ba032e994c0cda2e1ebaf33d550ebe1b19e205502ad6be5dc21370241ea6efcd4a3c746163dd1e141 SHA512 (abcMIDI-2022.12.09.zip) = 5eae6a2a9e5331a071627eba3687522f0682b7f7a587a05805fc812181101672ddc6337a3e20ac9d1968aebe3c0834f1d81061544a001cf43247dd903f57388f From 8f1792de6615b8ee3fe9c70e9b2eb1eb0e08005c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:17:55 +0000 Subject: [PATCH 06/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 727bdb7..c232a40 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2022.12.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -60,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2022.12.09-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 13 2022 Stuart Gathman - 2022.12.09-1 - New upstream release, removes compiled binaries :-{ From 089867589e6b1efe4f58c896d51a87785eb8fd70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:47:47 +0000 Subject: [PATCH 07/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index c232a40..b1ff855 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2022.12.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -60,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2022.12.09-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2022.12.09-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f1a24329463514d93dc291e39c9a4290d918283e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 11:59:14 +0000 Subject: [PATCH 08/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index b1ff855..685d638 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2022.12.09 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -60,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2022.12.09-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2022.12.09-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c507991172a0404ecfecc59515c4ee56b631cbe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:32:43 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 685d638..573c652 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2022.12.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -60,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2022.12.09-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2022.12.09-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7acbdea0ee75cd757e4100c7b57d1ac7219ad64e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:29:12 +0000 Subject: [PATCH 10/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 573c652..b1e810a 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2022.12.09 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -60,6 +60,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2022.12.09-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2022.12.09-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b591b0da61e8b3076baa36183ff4596b8c14315a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 22:51:41 +0200 Subject: [PATCH 11/18] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- abcMIDI.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index b1e810a..3d3a772 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,10 +1,11 @@ Name: abcMIDI Version: 2022.12.09 -Release: 6%{?dist} +Release: 7%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://ifdo.ca/~seymour/runabc/top.html Source0: https://ifdo.ca/~seymour/runabc/%{name}-%{version}.zip @@ -60,6 +61,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Thu Jul 25 2024 Miroslav Suchý - 2022.12.09-7 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2022.12.09-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From bfc7677b6606cba70e977368c2b8f34c09feabcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:27:06 +0000 Subject: [PATCH 12/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 3d3a772..af9fd00 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2022.12.09 -Release: 7%{?dist} +Release: 8%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -61,6 +61,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2022.12.09-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 2022.12.09-7 - convert license to SPDX From 88b497a580494868561fa37c379e4e4f3d4414c0 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Wed, 23 Apr 2025 21:28:13 -0400 Subject: [PATCH 13/18] New upstream release Fix compile errors --- abcMIDI.spec | 20 +++++++++++++------- sources | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index af9fd00..bcfcc33 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,13 +1,13 @@ Name: abcMIDI -Version: 2022.12.09 -Release: 8%{?dist} +Version: 2025.02.16 +Release: 1%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://ifdo.ca/~seymour/runabc/top.html -Source0: https://ifdo.ca/~seymour/runabc/%{name}-%{version}.zip +Source0: https://github.com/sshlien/abcmidi/archive/refs/tags/%{version}.tar.gz +Patch0: abcMIDI-gnu23.patch BuildRequires: gcc dos2unix BuildRequires: make @@ -25,14 +25,16 @@ A mirror github repo is at https://github.com/sdgathman/abcmidi %prep -%setup -q -n abcmidi -find . -type f | xargs dos2unix +%setup -q -n abcmidi-%{version} +#find . -type f | xargs dos2unix +%patch -P 0 -p 1 -b .gnu23 # make license easier to find in files mv doc/gpl.txt doc/LICENSE %build %configure -%{make_build} +sed -i Makefile -e 's/^CC = gcc/CC = gcc --std=gnu17/' +%{make_build} %install mkdir -p %{buildroot}%{_bindir} @@ -61,6 +63,10 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Apr 23 2025 Stuart Gathman - 2025.02.16-1 +- New upstream release +- fix compile errors + * Thu Jan 16 2025 Fedora Release Engineering - 2022.12.09-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index fc50539..6ed6938 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abcMIDI-2022.12.09.zip) = 5eae6a2a9e5331a071627eba3687522f0682b7f7a587a05805fc812181101672ddc6337a3e20ac9d1968aebe3c0834f1d81061544a001cf43247dd903f57388f +SHA512 (2025.02.16.tar.gz) = 47e6620b9ab8101b7f9b9d22ef550af932f47d349ad90e08fc4e0ca844aafd98785b4e1913bca3115c53b0d1f08a7a1792c2af55ac82fe8983b2e58109fd564d From c068bfa40835a752a222648c7b4e576dcf2d8cda Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Wed, 23 Apr 2025 21:30:03 -0400 Subject: [PATCH 14/18] Forgot patch --- .gitignore | 1 + abcMIDI-gnu23.patch | 221 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 abcMIDI-gnu23.patch diff --git a/.gitignore b/.gitignore index 9497259..cc4d19e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ abcMIDI-*.zip +*.tar.gz diff --git a/abcMIDI-gnu23.patch b/abcMIDI-gnu23.patch new file mode 100644 index 0000000..239a7d9 --- /dev/null +++ b/abcMIDI-gnu23.patch @@ -0,0 +1,221 @@ +diff -up ./genmidi.h.gnu23 ./genmidi.h +--- ./genmidi.h.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./genmidi.h 2025-04-23 21:21:39.558432536 -0400 +@@ -23,6 +23,7 @@ extern void midi_noteoff(); + extern void progress_sequence(); + #endif + ++int parse_stress_params (char *input); + + /* introduced 2010-02-01 (feb 01) [SS] */ + struct trackstruct {enum {NOTES, WORDS, NOTEWORDS, GCHORDS, DRUMS, DRONE} tracktype; +diff -up ./Makefile.gnu23 ./Makefile +--- ./Makefile.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./Makefile 2025-04-23 21:21:39.558774383 -0400 +@@ -33,7 +33,7 @@ + + VERSION = @VERSION@ + +-CC = gcc ++CC = gcc --std=gnu17 + INSTALL = /usr/bin/install -c + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_PROGRAM = ${INSTALL} +diff -up ./midicopy.c.gnu23 ./midicopy.c +--- ./midicopy.c.gnu23 2025-04-23 21:22:18.174069818 -0400 ++++ ./midicopy.c 2025-04-23 21:22:29.021627006 -0400 +@@ -53,7 +53,6 @@ + + + #define VERSION "1.40 August 11 2024 midicopy" +-#include "midicopy.h" + #define NULLFUNC 0 + #define NULL 0 + +@@ -63,6 +62,7 @@ + + #include + #include ++#include "midicopy.h" + + + /* Functions to be called while processing the MIDI file. */ +diff -up ./midicopy.h.gnu23 ./midicopy.h +--- ./midicopy.h.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./midicopy.h 2025-04-23 21:21:39.559005865 -0400 +@@ -1,7 +1,8 @@ + /* definitions for MIDI file writing code */ + float mf_ticks2sec(); + long mf_sec2ticks(); +-void mfwrite(); ++/* FIXME: also defined in midifile.h */ ++void mfwrite(int format,int ntracks,int division,FILE *fp); + void mfread(); + + /* MIDI status commands most significant bit is 1 */ +diff -up ./midifile.c.gnu23 ./midifile.c +--- ./midifile.c.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./midifile.c 2025-04-23 21:21:39.559270736 -0400 +@@ -80,11 +80,11 @@ void (*Mf_error)() = NULLFUNC; + void (*Mf_header)() = NULLFUNC; + void (*Mf_trackstart)() = NULLFUNC; + void (*Mf_trackend)() = NULLFUNC; +-void (*Mf_noteon)() = NULLFUNC; +-void (*Mf_noteoff)() = NULLFUNC; +-void (*Mf_pressure)() = NULLFUNC; +-void (*Mf_parameter)() = NULLFUNC; +-void (*Mf_pitchbend)() = NULLFUNC; ++void (*Mf_noteon)(int,int,int) = NULLFUNC; ++void (*Mf_noteoff)(int,int,int) = NULLFUNC; ++void (*Mf_pressure)(int,int,int) = NULLFUNC; ++void (*Mf_parameter)(int,int,int) = NULLFUNC; ++void (*Mf_pitchbend)(int,int,int) = NULLFUNC; + void (*Mf_program)() = NULLFUNC; + void (*Mf_chanpressure)() = NULLFUNC; + void (*Mf_sysex)() = NULLFUNC; +@@ -101,7 +101,7 @@ void (*Mf_text)() = NULLFUNC; + + /* Functions to implement in order to write a MIDI file */ + int (*Mf_putc)() = NULLFUNC; +-long (*Mf_writetrack)() = NULLFUNC; ++long (*Mf_writetrack)(int) = NULLFUNC; + int (*Mf_writetempotrack)() = NULLFUNC; + + int Mf_nomerge = 0; /* 1 => continue'ed system exclusives are */ +@@ -128,7 +128,7 @@ static void readheader(); + static void badbyte(); + static void metaevent(); + static void sysex(); +-static void chanmessage(); ++static void chanmessage(int,int,int); + static void msginit(); + static void msgadd(); + static void biggermsg(); +@@ -580,8 +580,7 @@ read16bit() + } + + /* static */ +-void mferror(s) +- char *s; ++void mferror(char *s) + { + if ( Mf_error ) { + (*Mf_error)(s); +diff -up ./midifile.h.gnu23 ./midifile.h +--- ./midifile.h.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./midifile.h 2025-04-23 21:21:39.559575903 -0400 +@@ -28,16 +28,16 @@ extern int Mf_nomerge; + + /* definitions for MIDI file writing code */ + extern int (*Mf_putc)(); +-extern long (*Mf_writetrack)(); ++extern long (*Mf_writetrack)(int); + extern int (*Mf_writetempotrack)(); + float mf_ticks2sec(); + long mf_sec2ticks(); +-void mfwrite(); ++void mfwrite(int format,int ntracks,int division,FILE *fp); + void mfread(); + int mf_write_meta_event(); + int mf_write_midi_event(); + void mf_write_tempo(); +-void mferror(); ++void mferror(char *s); + + /* MIDI status commands most significant bit is 1 */ + #define note_off 0x80 +diff -up ./parseabc.h.gnu23 ./parseabc.h +--- ./parseabc.h.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./parseabc.h 2025-04-23 21:21:39.559857281 -0400 +@@ -171,11 +171,11 @@ extern void event_acciaccatura(); + extern void event_start_extended_overlay(); + extern void event_stop_extended_overlay(); + extern void event_split_voice(); +-extern void event_temperament(); ++extern void event_temperament(char *line); + extern void print_voicecodes(void); + extern void init_abbreviations(); + extern void free_abbreviations(); +-extern void parsefile(); ++extern void parsefile(char *name); + extern int parsetune(); + #else + extern void event_init(); +@@ -239,6 +239,7 @@ extern void event_split_voice(); + extern void print_voicecodes(); + extern void init_abbreviations(); + extern void free_abbreviations(); +-extern void parsefile(); ++extern void parsefile(char *name); + extern int parsetune(); + #endif ++extern int readaln (char out[], char **in, int limit); +diff -up ./store.c.gnu23 ./store.c +--- ./store.c.gnu23 2025-02-16 20:30:44.000000000 -0500 ++++ ./store.c 2025-04-23 21:21:39.560510000 -0400 +@@ -157,9 +157,6 @@ void dotie() + void fix_enclosed_note_lengths() + int patchup_chordtie() + void tiefix() +-void applygrace() +-void applygrace_orig() +-void applygrace_new() + void dograce() + void zerobar() + void event_bar() +@@ -503,7 +500,7 @@ static void addfeature(int f,int p,int n + static void replacefeature(int f, int p, int n, int d, int loc); + void insertfeature(int f, int p, int n, int d, int loc); + static void textfeature(int type, char *s); +-extern long writetrack(); ++extern long writetrack(int); + void init_drum_map(); + static void fix_enclosed_note_lengths(int from, int end); + static int patchup_chordtie(int chordstart,int chordend); +@@ -511,7 +508,6 @@ static void copymap(struct voicecontext* + void init_stresspat(); + void beat_modifier(int); + void readstressfile (char * filename); +-int parse_stress_params(); + void calculate_stress_parameters(); + extern int inbody; /* from parseabc.c [SS] 2009-12-18 */ + extern int lineposition; /* from parseabc.c [SS] 2011-07-18 */ +@@ -1884,7 +1880,7 @@ j = 1; + k = 0; + while (j > 0) { + skipspace(&p); +- j = readaln(&name,&p,31); ++ j = readaln(name,&p,31); + if (j < 1) break; + for (i=0; i3) printf("tiefix finished\ + static void applygrace_orig(int); + static void applygrace_new(int); + +-static void applygrace(place) +-int place; ++static void applygrace(int place) + { + if (gfact_method) applygrace_orig(place); + else applygrace_new(place); +@@ -5146,8 +5141,7 @@ removefeatures(start,end); + } /* [SS] 2021-01-24 */ + + +-static void applygrace_orig(place) +-int place; ++static void applygrace_orig(int place) + /* assign lengths to grace notes before generating MIDI */ + /* This version adjusts the length of the grace notes + * based on the length of the following note, the +@@ -5257,8 +5251,7 @@ int place; + }; + } + +-static void applygrace_new(place) +-int place; ++static void applygrace_new(int place) + /* assign lengths to grace notes before generating MIDI */ + /* In this version each grace note has a predetermined + * length, eg, (1/64 th note) and the total length of From 306730f0678e90afa14b5b1c57c9d95835095eeb Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Wed, 23 Apr 2025 22:03:09 -0400 Subject: [PATCH 15/18] Add package name to source tarball --- abcMIDI.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index bcfcc33..17de983 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -6,7 +6,7 @@ Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia License: GPL-2.0-or-later URL: https://ifdo.ca/~seymour/runabc/top.html -Source0: https://github.com/sshlien/abcmidi/archive/refs/tags/%{version}.tar.gz +Source0: https://github.com/sshlien/abcmidi/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: abcMIDI-gnu23.patch BuildRequires: gcc dos2unix diff --git a/sources b/sources index 6ed6938..66cb2c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2025.02.16.tar.gz) = 47e6620b9ab8101b7f9b9d22ef550af932f47d349ad90e08fc4e0ca844aafd98785b4e1913bca3115c53b0d1f08a7a1792c2af55ac82fe8983b2e58109fd564d +SHA512 (abcMIDI-2025.02.16.tar.gz) = 47e6620b9ab8101b7f9b9d22ef550af932f47d349ad90e08fc4e0ca844aafd98785b4e1913bca3115c53b0d1f08a7a1792c2af55ac82fe8983b2e58109fd564d From dbba7ea6e06fb39d2f5ee2d4db7cd6101b151376 Mon Sep 17 00:00:00 2001 From: "Stuart D. Gathman" Date: Thu, 24 Apr 2025 10:46:12 -0400 Subject: [PATCH 16/18] Include new midistats util --- abcMIDI.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 17de983..cf51d29 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2025.02.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -42,16 +42,19 @@ install -p -m 755 abc2midi %{buildroot}%{_bindir} install -p -m 755 abcmatch %{buildroot}%{_bindir} install -p -m 755 midi2abc %{buildroot}%{_bindir} install -p -m 755 midicopy %{buildroot}%{_bindir} +install -p -m 755 midistats %{buildroot}%{_bindir} install -p -m 755 abc2abc %{buildroot}%{_bindir} install -p -m 755 mftext %{buildroot}%{_bindir} install -p -m 755 yaps %{buildroot}%{_bindir} + mkdir -p %{buildroot}%{_mandir}/man1 install -p -m 644 doc/abc2abc.1 %{buildroot}%{_mandir}/man1 install -p -m 644 doc/abc2midi.1 %{buildroot}%{_mandir}/man1 install -p -m 644 doc/mftext.1 %{buildroot}%{_mandir}/man1 install -p -m 644 doc/midi2abc.1 %{buildroot}%{_mandir}/man1 install -p -m 644 doc/midicopy.1 %{buildroot}%{_mandir}/man1 +install -p -m 644 doc/midistats.1 %{buildroot}%{_mandir}/man1 install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 @@ -63,6 +66,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Thu Apr 24 2025 Stuart Gathman - 2025.02.16-2 +- Include new midistats binary from upstream release + * Wed Apr 23 2025 Stuart Gathman - 2025.02.16-1 - New upstream release - fix compile errors From d36de4ce97683554470c813d56494303f67f219c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:33 +0000 Subject: [PATCH 17/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index cf51d29..1c6d025 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2025.02.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -66,6 +66,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2025.02.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Apr 24 2025 Stuart Gathman - 2025.02.16-2 - Include new midistats binary from upstream release From 157ace47703a8cc040faff09480440408e808cd1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:22:53 +0000 Subject: [PATCH 18/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- abcMIDI.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcMIDI.spec b/abcMIDI.spec index 1c6d025..ca93f58 100644 --- a/abcMIDI.spec +++ b/abcMIDI.spec @@ -1,6 +1,6 @@ Name: abcMIDI Version: 2025.02.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ABC to/from MIDI conversion utilities Group: Applications/Multimedia @@ -66,6 +66,9 @@ install -p -m 644 doc/yaps.1 %{buildroot}%{_mandir}/man1 %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2025.02.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2025.02.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild