Bug#1051821: a2jmidid: diff for NMU version 9-3.1
Package: a2jmidid
Version: 9-3
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for a2jmidid (versioned as 9-3.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru a2jmidid-9/debian/changelog a2jmidid-9/debian/changelog
--- a2jmidid-9/debian/changelog 2023-02-13 14:15:41.000000000 +0100
+++ a2jmidid-9/debian/changelog 2024-10-26 18:04:34.000000000 +0200
@@ -1,3 +1,16 @@
+a2jmidid (9-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ zhangdandan <zhangdandan@loongson.cn> ]
+ * Enable building for LoongArch (Closes: #1051821)
+
+ [ Erich Eickmeyer ]
+ * Patch: add port id to port name to avoid collision (LP: #2058799)
+ - (Closes: #1067662)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 26 Oct 2024 18:04:34 +0200
+
a2jmidid (9-3) unstable; urgency=medium
* Team upload.
diff -Nru a2jmidid-9/debian/patches/0002_add_port_id_to_port_name_to_avoid_collisions.patch a2jmidid-9/debian/patches/0002_add_port_id_to_port_name_to_avoid_collisions.patch
--- a2jmidid-9/debian/patches/0002_add_port_id_to_port_name_to_avoid_collisions.patch 1970-01-01 01:00:00.000000000 +0100
+++ a2jmidid-9/debian/patches/0002_add_port_id_to_port_name_to_avoid_collisions.patch 2024-10-26 18:04:11.000000000 +0200
@@ -0,0 +1,32 @@
+From 19e38c9e3c15025b4b1984ddecdbe81679df77ee Mon Sep 17 00:00:00 2001
+From: Roman Sommer <roman.sommer@fau.de>
+Date: Fri, 6 Oct 2017 01:04:02 +0200
+Subject: [PATCH] add port id to port name to avoid collisions
+
+This patch changes the pattern how jack port names are derived from alsa
+port names when using unique port names. It adds the port id after the
+':' to make sure port names are really unique, even when the alsa ports
+are not (or too long).
+This fixes problems with the ploytec gm5 which has up to 5 in/out ports
+and quite long client/port names.
+---
+ port.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/port.c b/port.c
+index 3a7c41e..523fae2 100644
+--- a/port.c
++++ b/port.c
+@@ -116,10 +116,11 @@ a2j_port_fill_name(
+ ret = snprintf(
+ port_ptr->name,
+ g_max_jack_port_name_size,
+- "%s [%d] (%s): %s",
++ "%s [%d] (%s): [%d] %s",
+ snd_seq_client_info_get_name(client_info_ptr),
+ snd_seq_client_info_get_client(client_info_ptr),
+ type == A2J_PORT_CAPTURE ? "capture": "playback",
++ snd_seq_port_info_get_port(port_info_ptr),
+ snd_seq_port_info_get_name(port_info_ptr));
+ }
+ else
diff -Nru a2jmidid-9/debian/patches/a2jmidid-add-support-for-loongarch.patch a2jmidid-9/debian/patches/a2jmidid-add-support-for-loongarch.patch
--- a2jmidid-9/debian/patches/a2jmidid-add-support-for-loongarch.patch 1970-01-01 01:00:00.000000000 +0100
+++ a2jmidid-9/debian/patches/a2jmidid-add-support-for-loongarch.patch 2024-10-26 18:04:34.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Add support for loongarch
+Last-Update: 2023-09-13
+Forwarded: https://github.com/jackaudio/a2jmidid/pull/29
+
+--- a2jmidid-9.orig/sigsegv.c
++++ a2jmidid-9/sigsegv.c
+@@ -93,7 +93,7 @@ static void signal_segv(int signum, sigi
+ 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__) && !defined(__riscv)
++ !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv) && !defined(__loongarch__)
+ for(i = 0; i < NGREG; i++)
+ a2j_error("reg[%02d] = 0x" REGFORMAT, i,
+ #if defined(__powerpc__) && !defined(__powerpc64__)
+@@ -106,7 +106,7 @@ static void signal_segv(int signum, sigi
+ ucontext->uc_mcontext.gregs[i]
+ #endif
+ );
+-#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64, riscv */
++#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64, riscv, loongarch */
+
+ #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
+ # if defined(SIGSEGV_STACK_IA64)
diff -Nru a2jmidid-9/debian/patches/series a2jmidid-9/debian/patches/series
--- a2jmidid-9/debian/patches/series 2023-02-13 14:15:24.000000000 +0100
+++ a2jmidid-9/debian/patches/series 2024-10-26 18:04:34.000000000 +0200
@@ -1 +1,3 @@
0001-sigsegv-enable-RISC-V-build.patch
+0002_add_port_id_to_port_name_to_avoid_collisions.patch
+a2jmidid-add-support-for-loongarch.patch
Reply to: