From 1c9f859d694529919e94b54f1599567854067988 Mon Sep 17 00:00:00 2001 From: rncbc Date: Sun, 24 Apr 2016 18:59:07 +0100 Subject: [PATCH 1/2] - Swap alsa_midi slave driver port-name suffixes ("out" for capture, "in" for playback). --- drivers/alsa_midi/port.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/alsa_midi/port.c b/drivers/alsa_midi/port.c index 6f1cb04..d217310 100644 --- a/drivers/alsa_midi/port.c +++ b/drivers/alsa_midi/port.c @@ -111,34 +111,36 @@ a2j_port_fill_name (struct a2j_port * port_ptr, int dir, snd_seq_client_info_t * /* entire client name is part of the port name so don't replicate it */ snprintf (port_ptr->name, sizeof(port_ptr->name), - "[%d] %s %s", + "[%d:%d] %s (%s)", snd_seq_client_info_get_client (client_info_ptr), + snd_seq_port_info_get_port (port_info_ptr), port_name, - (dir == A2J_PORT_CAPTURE ? "in" : "out")); + (dir == A2J_PORT_CAPTURE ? "out" : "in")); } else { snprintf (port_ptr->name, sizeof(port_ptr->name), - "%s [%d] %s %s", - client_name, + "[%d:%d] %s %s (%s)", snd_seq_client_info_get_client (client_info_ptr), + snd_seq_port_info_get_port (port_info_ptr), + client_name, port_name, - (dir == A2J_PORT_CAPTURE ? "in" : "out")); + (dir == A2J_PORT_CAPTURE ? "out" : "in")); } } else { if (strstr (port_name, client_name) == port_name) { /* entire client name is part of the port name so don't replicate it */ snprintf (port_ptr->name, sizeof(port_ptr->name), - "%s %s", + "%s (%s)", port_name, - (dir == A2J_PORT_CAPTURE ? "in" : "out")); + (dir == A2J_PORT_CAPTURE ? "out" : "in")); } else { snprintf (port_ptr->name, sizeof(port_ptr->name), - "%s %s %s", + "%s %s (%s)", client_name, snd_seq_port_info_get_name (port_info_ptr), - (dir == A2J_PORT_CAPTURE ? "in" : "out")); + (dir == A2J_PORT_CAPTURE ? "out" : "in")); } } From e85466f0336589efd46cf0e7b3e979895caa58fc Mon Sep 17 00:00:00 2001 From: rncbc Date: Sun, 25 Sep 2016 22:57:53 +0100 Subject: [PATCH 2/2] - Drop override in configure on 64-bit OS'es (no more --libdir=.../lib64). --- configure.ac | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 02bd02c..9f7ff04 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([jack-audio-connection-kit],[0.125.0rc1], +AC_INIT([jack-audio-connection-kit],[0.125.1], [jack-devel@lists.jackaudio.org],[],[http://www.jackaudio.org/]) AC_CONFIG_SRCDIR([jackd/jackd.c]) @@ -196,27 +196,6 @@ AC_SUBST(USE_MD5SUM) AC_DEFINE_UNQUOTED(USE_MD5SUM,"$USE_MD5SUM",[Using md5sum command line if available]) AM_CONDITIONAL(USE_MD5SUM, $USE_MD5SUM) -# -# We need to establish suitable defaults for a 64-bit OS -libnn=lib -case "${host_os}" in - linux*) - case "${host_cpu}" in - x86_64|mips64|ppc64|sparc64|s390x) - libnn=lib64 - ;; - esac - ;; - solaris*) - ## libnn=lib/sparcv9 ## on 64-bit only, but that's compiler-specific - ;; -esac - -## take care not to override the command-line setting -if test "${libdir}" = '${exec_prefix}/lib'; then - libdir='${exec_prefix}/'${libnn} -fi - # system-dependent config.h values test "x$JACK_THREAD_STACK_TOUCH" = "x" && JACK_THREAD_STACK_TOUCH=500000 AC_DEFINE_UNQUOTED(JACK_THREAD_STACK_TOUCH,