diff --git a/a2jmidid-add-riscv64-support.patch b/a2jmidid-add-riscv64-support.patch deleted file mode 100644 index 2b9e2ed..0000000 --- a/a2jmidid-add-riscv64-support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2c3fbef6854743416d95d85b1565dde51668488c Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt -Date: Fri, 1 Oct 2021 16:15:29 +0200 -Subject: [PATCH] sigsegv: enable RISC-V build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Avoid build error - -../sigsegv.c:104:39: error: ‘mcontext_t’ has no member named ‘gregs’; -did you mean ‘__gregs’? - 104 | ucontext->uc_mcontext.gregs[i] - | ^~~~~ - -Signed-off-by: Heinrich Schuchardt ---- - sigsegv.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/sigsegv.c b/sigsegv.c -index fb4456e..6930185 100644 ---- a/sigsegv.c -+++ b/sigsegv.c -@@ -91,7 +91,9 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - a2j_error("info.si_errno = %d", info->si_errno); - a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); - a2j_error("info.si_addr = %p", info->si_addr); --#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) -+#if !defined(__alpha__) && !defined(__ia64__) && \ -+ !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && \ -+ !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv) - for(i = 0; i < NGREG; i++) - a2j_error("reg[%02d] = 0x" REGFORMAT, i, - #if defined(__powerpc__) && !defined(__powerpc64__) -@@ -108,7 +110,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - ucontext->uc_mcontext.gregs[i] - #endif - ); --#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64 */ -+#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64, riscv */ - - #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) - # if defined(SIGSEGV_STACK_IA64) diff --git a/a2jmidid.spec b/a2jmidid.spec index 938ee27..692c49b 100644 --- a/a2jmidid.spec +++ b/a2jmidid.spec @@ -1,27 +1,21 @@ Summary: Daemon for exposing ALSA sequencer applications in JACK MIDI system Name: a2jmidid Version: 9 -Release: 19%{?dist} +Release: 4%{?dist} URL: https://github.com/linuxaudio/a2jmidid Source0: https://github.com/linuxaudio/a2jmidid/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # Backported from upstream Patch0: %{name}-man.patch Patch1: %{name}-portname.patch -Patch2: %{name}-add-riscv64-support.patch # a2jmidi_bridge.c and j2amidi_bridge.c are GPLv2+ # The rest is GPLv2 -# Automatically converted from old format: GPLv2 and GPLv2+ - review is highly recommended. -License: GPL-2.0-only AND GPL-2.0-or-later +License: GPLv2 and GPLv2+ BuildRequires: alsa-lib-devel BuildRequires: dbus-devel BuildRequires: gcc -%if 0%{?fedora} || 0%{?rhel} >= 9 -BuildRequires: pipewire-jack-audio-connection-kit-devel -%else BuildRequires: jack-audio-connection-kit-devel -%endif BuildRequires: meson Requires: dbus Requires: python3 @@ -64,51 +58,6 @@ sed -i 's|^#!/usr/bin/env python3|#!/usr/bin/python3|' a2j_control %{_mandir}/man1/j2a* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 9-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 9-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Mar 27 2025 Davide Cavalca - 9-17 -- Switch to pipewire-jack-audio-connection-kit-devel where available - -* Thu Jan 16 2025 Fedora Release Engineering - 9-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 07 2024 Miroslav Suchý - 9-15 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 9-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 9-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Oct 06 2023 Songsong Zhang - 9-11 -- Add riscv64 patch from https://github.com/jackaudio/a2jmidid/pull/18 - -* Wed Jul 19 2023 Fedora Release Engineering - 9-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 9-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Jan 25 2021 Fedora Release Engineering - 9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Fri Jul 31 2020 Fedora Release Engineering - 9-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild