Download raw body.
[update] audio/portmidi 2.0.4 -> 2.0.6
On Mon, Jun 23, 2025 at 07:52:57AM +0200, Raphael Graf wrote:
> Support for sndio and some of the patches have been upstreamed. Otherwise it
> is mainly bug fixes.
>
> I did some manual testing using the test-programs in pm_test and did not find
> any (new) problems.
> All dependent ports still build, and midi output from audacity still works.
>
> Some features are still not implemented for the sndio backend:
> - Delayed output (latency), see XXX in pm_sndio/pmsndio.c
> - Virtual devices
> If anyone has any clues as to how these features could be implemented, I'd be
> very interested!
>
> ok?
Here is a new diff that fixes the version number in CMakeLists.txt. The rest
of the diff stays the same.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/portmidi/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 14 May 2025 05:31:29 -0000 1.8
+++ Makefile 24 Jun 2025 05:11:15 -0000
@@ -2,9 +2,9 @@ COMMENT = library for real time input an
GH_ACCOUNT = PortMidi
GH_PROJECT = portmidi
-GH_TAGNAME = v2.0.4
+GH_TAGNAME = v2.0.6
-SHARED_LIBS = portmidi 1.0
+SHARED_LIBS = portmidi 2.0
EPOCH = 0
@@ -21,9 +21,6 @@ CONFIGURE_ARGS+= -DUSE_SNDIO=ON
NO_TEST = Yes
-FIX_CRLF_FILES = porttime/ptlinux.c
-
-post-extract:
- cp -rf ${FILESDIR}/* ${WRKSRC}/
+FIX_CRLF_FILES = pm_common/pmutil.h
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/portmidi/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 14 May 2025 05:31:29 -0000 1.2
+++ distinfo 24 Jun 2025 05:11:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (portmidi-2.0.4.tar.gz) = ZIk+gjrhRsq9Otf5qanFMydGq+eEfFV7mbJXevqKYHw=
-SIZE (portmidi-2.0.4.tar.gz) = 263225
+SHA256 (portmidi-2.0.6.tar.gz) = gdIrNAUWIc1WyNXvEpCO8qWXZMnN+6ba5Hqr3bcayRQ=
+SIZE (portmidi-2.0.6.tar.gz) = 193068
Index: files/portmidi.pc.in
===================================================================
RCS file: files/portmidi.pc.in
diff -N files/portmidi.pc.in
Index: files/pm_sndio/pmsndio.c
===================================================================
RCS file: files/pm_sndio/pmsndio.c
diff -N files/pm_sndio/pmsndio.c
--- files/pm_sndio/pmsndio.c 14 May 2025 05:31:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,367 +0,0 @@
-/* pmsndio.c -- PortMidi os-dependent code */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sndio.h>
-#include <string.h>
-#include <poll.h>
-#include <errno.h>
-#include <pthread.h>
-#include "portmidi.h"
-#include "pmutil.h"
-#include "pminternal.h"
-#include "porttime.h"
-
-#define NDEVS 9
-#define SYSEX_MAXLEN 1024
-
-#define SYSEX_START 0xf0
-#define SYSEX_END 0xf7
-
-PmDeviceID pm_default_input_device_id = -1;
-PmDeviceID pm_default_output_device_id = -1;
-
-extern pm_fns_node pm_sndio_in_dictionary;
-extern pm_fns_node pm_sndio_out_dictionary;
-
-/* length of voice and common messages (status byte included) */
-unsigned int voice_len[] = { 3, 3, 3, 3, 2, 2, 3 };
-unsigned int common_len[] = { 0, 2, 3, 2, 0, 0, 1, 1 };
-
-struct mio_dev {
- char name[16];
- struct mio_hdl *hdl;
- int mode;
- char errmsg[PM_HOST_ERROR_MSG_LEN];
- pthread_t thread;
-} devs[NDEVS];
-
-static void set_mode(struct mio_dev *, unsigned int);
-
-void pm_init()
-{
- int i, j, k = 0;
- char devices[][16] = {"midithru", "rmidi", "midi", "snd"};
-
- /* default */
- strcpy(devs[0].name, MIO_PORTANY);
- pm_add_device("SNDIO", devs[k].name, TRUE, FALSE, (void *) &devs[k],
- &pm_sndio_in_dictionary);
- pm_add_device("SNDIO", devs[k].name, FALSE, FALSE, (void *) &devs[k],
- &pm_sndio_out_dictionary);
- k++;
-
- for (i = 0; i < 4; i++) {
- for (j = 0; j < 2; j++) {
- sprintf(devs[k].name, "%s/%d", devices[i], j);
- pm_add_device("SNDIO", devs[k].name, TRUE, FALSE, (void *) &devs[k],
- &pm_sndio_in_dictionary);
- pm_add_device("SNDIO", devs[k].name, FALSE, FALSE, (void *) &devs[k],
- &pm_sndio_out_dictionary);
- k++;
- }
- }
-
- // this is set when we return to Pm_Initialize, but we need it
- // now in order to (successfully) call Pm_CountDevices()
- pm_initialized = TRUE;
- pm_default_input_device_id = 0;
- pm_default_output_device_id = 1;
-}
-
-void pm_term(void)
-{
- int i;
- for(i = 0; i < NDEVS; i++) {
- if (devs[i].mode != 0) {
- set_mode(&devs[i], 0);
- if (devs[i].thread) {
- pthread_join(devs[i].thread, NULL);
- devs[i].thread = NULL;
- }
- }
- }
-}
-
-PmDeviceID Pm_GetDefaultInputDeviceID() {
- Pm_Initialize();
- return pm_default_input_device_id;
-}
-
-PmDeviceID Pm_GetDefaultOutputDeviceID() {
- Pm_Initialize();
- return pm_default_output_device_id;
-}
-
-void *pm_alloc(size_t s) { return malloc(s); }
-
-void pm_free(void *ptr) { free(ptr); }
-
-/* midi_message_length -- how many bytes in a message? */
-static int midi_message_length(PmMessage message)
-{
- unsigned char st = message & 0xff;
- if (st >= 0xf8)
- return 1;
- else if (st >= 0xf0)
- return common_len[st & 7];
- else if (st >= 0x80)
- return voice_len[(st >> 4) & 7];
- else
- return 0;
-}
-
-void* input_thread(void *param)
-{
- PmInternal *midi = (PmInternal*)param;
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
- struct pollfd pfd[1];
- nfds_t nfds;
- unsigned char st = 0, c = 0;
- int rc, revents, idx = 0, len = 0;
- size_t todo = 0;
- unsigned char buf[0x200], *p;
- PmEvent pm_ev, pm_ev_rt;
- unsigned char sysex_data[SYSEX_MAXLEN];
-
- while(dev->mode & MIO_IN) {
- if (todo == 0) {
- nfds = mio_pollfd(dev->hdl, pfd, POLLIN);
- rc = poll(pfd, nfds, 100);
- if (rc < 0) {
- if (errno == EINTR)
- continue;
- break;
- }
- revents = mio_revents(dev->hdl, pfd);
- if (!(revents & POLLIN))
- continue;
-
- todo = mio_read(dev->hdl, buf, sizeof(buf));
- if (todo == 0)
- continue;
- p = buf;
- }
- c = *p++;
- todo--;
-
- if (c >= 0xf8) {
- pm_ev_rt.message = c;
- pm_ev_rt.timestamp = Pt_Time();
- pm_read_short(midi, &pm_ev_rt);
- } else if (c == SYSEX_END) {
- if (st == SYSEX_START) {
- sysex_data[idx++] = c;
- pm_read_bytes(midi, sysex_data, idx, Pt_Time());
- }
- st = 0;
- idx = 0;
- } else if (c == SYSEX_START) {
- st = c;
- idx = 0;
- sysex_data[idx++] = c;
- } else if (c >= 0xf0) {
- pm_ev.message = c;
- len = common_len[c & 7];
- st = c;
- idx = 1;
- } else if (c >= 0x80) {
- pm_ev.message = c;
- len = voice_len[(c >> 4) & 7];
- st = c;
- idx = 1;
- } else if (st == SYSEX_START) {
- if (idx == SYSEX_MAXLEN) {
- fprintf(stderr, "the message is too long\n");
- idx = st = 0;
- } else {
- sysex_data[idx++] = c;
- }
- } else if (st) {
- if (idx == 0 && st != SYSEX_START)
- pm_ev.message |= (c << (8 * idx++));
- pm_ev.message |= (c << (8 * idx++));
- if (idx == len) {
- pm_read_short(midi, &pm_ev);
- if (st >= 0xf0)
- st = 0;
- idx = 0;
- }
- }
- }
-
- pthread_exit(NULL);
- return NULL;
-}
-
-static void set_mode(struct mio_dev *dev, unsigned int mode) {
- if (dev->mode != 0)
- mio_close(dev->hdl);
- dev->mode = 0;
- if (mode != 0)
- dev->hdl = mio_open(dev->name, mode, 0);
- if (dev->hdl)
- dev->mode = mode;
-}
-
-static PmError sndio_out_open(PmInternal *midi, void *driverInfo)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- if (dev->mode & MIO_OUT)
- return pmNoError;
-
- set_mode(dev, dev->mode | MIO_OUT);
- if (!(dev->mode & MIO_OUT)) {
- snprintf(dev->errmsg, PM_HOST_ERROR_MSG_LEN,
- "mio_open (output) failed: %s\n", dev->name);
- return pmHostError;
- }
-
- return pmNoError;
-}
-
-static PmError sndio_in_open(PmInternal *midi, void *driverInfo)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- if (dev->mode & MIO_IN)
- return pmNoError;
-
- set_mode(dev, dev->mode | MIO_IN);
- if (!(dev->mode & MIO_IN)) {
- snprintf(dev->errmsg, PM_HOST_ERROR_MSG_LEN,
- "mio_open (input) failed: %s\n", dev->name);
- return pmHostError;
- }
- pthread_attr_t attr;
- pthread_attr_init(&attr);
- pthread_create(&dev->thread, &attr, input_thread, ( void* )midi);
- return pmNoError;
-}
-
-static PmError sndio_out_close(PmInternal *midi)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- if (dev->mode & MIO_OUT)
- set_mode(dev, dev->mode & ~MIO_OUT);
- return pmNoError;
-}
-
-static PmError sndio_in_close(PmInternal *midi)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- if (dev->mode & MIO_IN) {
- set_mode(dev, dev->mode & ~MIO_IN);
- pthread_join(dev->thread, NULL);
- dev->thread = NULL;
- }
- return pmNoError;
-}
-
-static PmError sndio_abort(PmInternal *midi)
-{
- return pmNoError;
-}
-
-static PmTimestamp sndio_synchronize(PmInternal *midi)
-{
- return 0;
-}
-
-static PmError do_write(struct mio_dev *dev, const void *addr, size_t nbytes)
-{
- size_t w = mio_write(dev->hdl, addr, nbytes);
-
- if (w != nbytes) {
- snprintf(dev->errmsg, PM_HOST_ERROR_MSG_LEN,
- "mio_write failed, bytes written:%zu\n", w);
- return pmHostError;
- }
- return pmNoError;
-}
-
-static PmError sndio_write_byte(PmInternal *midi, unsigned char byte,
- PmTimestamp timestamp)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- if (midi->latency > 0) {
- /* XXX the byte should be queued for later playback */
- return do_write(dev, &byte, 1);
- } else {
- return do_write(dev, &byte, 1);
- }
-}
-
-static PmError sndio_write_short(PmInternal *midi, PmEvent *event)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
- int nbytes = midi_message_length(event->message);
-
- if (midi->latency > 0) {
- /* XXX the event should be queued for later playback */
- return do_write(dev, &event->message, nbytes);
- } else {
- return do_write(dev, &event->message, nbytes);
- }
- return pmNoError;
-}
-
-static PmError sndio_write_flush(PmInternal *midi, PmTimestamp timestamp)
-{
- return pmNoError;
-}
-
-PmError sndio_sysex(PmInternal *midi, PmTimestamp timestamp)
-{
- return pmNoError;
-}
-
-static unsigned int sndio_has_host_error(PmInternal *midi)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- return (dev->errmsg[0] != '\0');
-}
-
-static void sndio_get_host_error(PmInternal *midi, char *msg, unsigned int len)
-{
- struct mio_dev *dev = pm_descriptors[midi->device_id].descriptor;
-
- strlcpy(msg, dev->errmsg, len);
- dev->errmsg[0] = '\0';
-}
-
-pm_fns_node pm_sndio_in_dictionary = {
- none_write_short,
- none_sysex,
- none_sysex,
- none_write_byte,
- none_write_short,
- none_write_flush,
- sndio_synchronize,
- sndio_in_open,
- sndio_abort,
- sndio_in_close,
- success_poll,
- sndio_has_host_error,
-};
-
-pm_fns_node pm_sndio_out_dictionary = {
- sndio_write_short,
- sndio_sysex,
- sndio_sysex,
- sndio_write_byte,
- sndio_write_short,
- sndio_write_flush,
- sndio_synchronize,
- sndio_out_open,
- sndio_abort,
- sndio_out_close,
- none_poll,
- sndio_has_host_error,
-};
-
Index: files/pm_sndio/pmsndio.h
===================================================================
RCS file: files/pm_sndio/pmsndio.h
diff -N files/pm_sndio/pmsndio.h
--- files/pm_sndio/pmsndio.h 23 Mar 2019 13:30:08 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-/* pmsndio.h */
-
-extern PmDeviceID pm_default_input_device_id;
-extern PmDeviceID pm_default_output_device_id;
-
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/portmidi/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 14 May 2025 05:31:29 -0000 1.3
+++ patches/patch-CMakeLists_txt 24 Jun 2025 05:11:15 -0000
@@ -1,19 +1,19 @@
--Option USE_SNDIO
+-Fix version number
-Install static lib as well
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -26,6 +26,8 @@ option(PM_USE_STATIC_RUNTIME
- "Use MSVC static runtime. Only applies when BUILD_SHARED_LIBS is OFF"
- ON)
+@@ -12,7 +12,7 @@ cmake_policy(SET CMP0091 NEW) # enables MSVC_RUNTIME_L
+ # Versions are now in the form x.y.z
+ # Changed 1.0 to 2.0 because API is extended with virtual ports:
+ set(SOVERSION "2")
+-set(VERSION "2.0.4")
++set(VERSION "2.0.6")
-+option(USE_SNDIO "Use sndio backend" OFF)
-+
- # MSVCRT_DLL is used to construct the MSVC_RUNTIME_LIBRARY property
- # (see pm_common/CMakeLists.txt and pm_test/CMakeLists.txt)
- if(PM_USE_STATIC_RUNTIME AND NOT BUILD_SHARED_LIBS)
-@@ -117,7 +119,7 @@ if(BUILD_JAVA_NATIVE_INTERFACE)
+ project(portmidi VERSION "${VERSION}"
+ DESCRIPTION "Cross-Platform MIDI IO")
+@@ -112,7 +112,7 @@ if(BUILD_JAVA_NATIVE_INTERFACE)
endif(BUILD_JAVA_NATIVE_INTERFACE)
# Install the libraries and headers (Linux and Mac OS X command line)
Index: patches/patch-pm_common_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/audio/portmidi/patches/patch-pm_common_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-pm_common_CMakeLists_txt
--- patches/patch-pm_common_CMakeLists_txt 14 May 2025 05:31:29 -0000 1.3
+++ patches/patch-pm_common_CMakeLists_txt 24 Jun 2025 05:11:15 -0000
@@ -1,5 +1,4 @@
-Build static library as well
--Use sndio backend
Index: pm_common/CMakeLists.txt
--- pm_common/CMakeLists.txt.orig
@@ -16,27 +15,3 @@ Index: pm_common/CMakeLists.txt
VERSION ${LIBRARY_VERSION}
SOVERSION ${LIBRARY_SOVERSION}
OUTPUT_NAME "${PM_ACTUAL_LIB_NAME}"
-@@ -78,8 +79,22 @@ if(NOT WIN32)
- find_package(Threads REQUIRED)
- endif()
-
-+# Check for sndio
-+include (FindPackageHandleStandardArgs)
-+find_path(SNDIO_INCLUDE_DIRS NAMES sndio.h)
-+find_library(SNDIO_LIBRARY sndio)
-+find_package_handle_standard_args(Sndio
-+ REQUIRED_VARS SNDIO_LIBRARY SNDIO_INCLUDE_DIRS)
-+
- # first include the appropriate system-dependent file:
--if(UNIX AND APPLE)
-+if(SNDIO_FOUND AND USE_SNDIO)
-+ set(PM_LIB_PRIVATE_SRC
-+ ${PMDIR}/porttime/ptlinux.c
-+ ${PMDIR}/pm_sndio/pmsndio.c)
-+ set(PM_NEEDED_LIBS Threads::Threads ${SNDIO_LIBRARY} PARENT_SCOPE)
-+ target_link_libraries(portmidi PRIVATE Threads::Threads ${SNDIO_LIBRARY})
-+ target_include_directories(portmidi PRIVATE ${SNDIO_INCLUDE_DIRS})
-+elseif(UNIX AND APPLE)
- set(Threads::Threads "" PARENT_SCOPE)
- find_library(COREAUDIO_LIBRARY CoreAudio REQUIRED)
- find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
Index: patches/patch-porttime_ptlinux_c
===================================================================
RCS file: patches/patch-porttime_ptlinux_c
diff -N patches/patch-porttime_ptlinux_c
--- patches/patch-porttime_ptlinux_c 14 May 2025 05:31:29 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Upstream commit 3209da8c9865efa3dbc1a2e642350c154df20d2a
-
-Index: porttime/ptlinux.c
---- porttime/ptlinux.c.orig
-+++ porttime/ptlinux.c
-@@ -31,11 +31,15 @@ CHANGE LOG
- #include "porttime.h"
- #include "time.h"
- #include "sys/resource.h"
--#include "sys/timeb.h"
- #include "pthread.h"
-
- #define TRUE 1
- #define FALSE 0
-+
-+#ifndef CLOCK_MONOTONIC_RAW
-+ #define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
-+#endif
-+
-
- static int time_started_flag = FALSE;
- static struct timespec time_offset = {0, 0};
[update] audio/portmidi 2.0.4 -> 2.0.6