diff options
| author | trasz <trasz@FreeBSD.org> | 2008-11-09 15:54:26 +0800 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2008-11-09 15:54:26 +0800 |
| commit | 2e8a4ecf15a3962754f7a3e45b7ff2c905bf21c5 (patch) | |
| tree | 2facdfe0cf7145cc15ef51d3c75bd872d5c7a061 /audio | |
| parent | 73985fe24631815687c84bbba182deb736f87474 (diff) | |
| download | freebsd-ports-gnome-2e8a4ecf15a3962754f7a3e45b7ff2c905bf21c5.tar.gz freebsd-ports-gnome-2e8a4ecf15a3962754f7a3e45b7ff2c905bf21c5.tar.zst freebsd-ports-gnome-2e8a4ecf15a3962754f7a3e45b7ff2c905bf21c5.zip | |
Fix build after audio/jack update.
PR: ports/125900
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/dino/Makefile | 7 | ||||
| -rw-r--r-- | audio/dino/files/patch-src-libdinoseq-mididbuffer.cpp | 20 | ||||
| -rw-r--r-- | audio/dino/files/patch-src-libdinoseq-sequencer.cpp | 24 |
3 files changed, 50 insertions, 1 deletions
diff --git a/audio/dino/Makefile b/audio/dino/Makefile index 7afe6a298f30..330b32880f29 100644 --- a/audio/dino/Makefile +++ b/audio/dino/Makefile @@ -7,7 +7,7 @@ PORTNAME= dino PORTVERSION= 0.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= dino @@ -19,6 +19,11 @@ LIB_DEPENDS= glademm-2.4:${PORTSDIR}/devel/libglademm24 \ jack.0:${PORTSDIR}/audio/jack \ lash.2:${PORTSDIR}/audio/lash \ xml++:${PORTSDIR}/textproc/libxml++26 +BUILD_DEPENDS= jackit>=0.109.2:${PORTSDIR}/audio/jack + +# Between 0.109.0 and earlier versions there was an api change in JACK. +# However, the library version number was not changed. The line above +# is supposed to work around that. GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/audio/dino/files/patch-src-libdinoseq-mididbuffer.cpp b/audio/dino/files/patch-src-libdinoseq-mididbuffer.cpp new file mode 100644 index 000000000000..d052388f538a --- /dev/null +++ b/audio/dino/files/patch-src-libdinoseq-mididbuffer.cpp @@ -0,0 +1,20 @@ +--- src/libdinoseq/midibuffer.cpp.orig 2008-07-23 13:26:56.000000000 +0200 ++++ src/libdinoseq/midibuffer.cpp 2008-07-23 13:27:11.000000000 +0200 +@@ -55,7 +55,7 @@ + // XXX optimise this + jack_nframes_t timestamp = jack_nframes_t((beat - m_start_beat) * + 60 / (m_bpm * m_samplerate)); +- return jack_midi_event_reserve(m_buffer, timestamp, data_size, m_nframes); ++ return jack_midi_event_reserve(m_buffer, timestamp, data_size); + } + + +@@ -65,7 +65,7 @@ + jack_nframes_t timestamp = jack_nframes_t((beat - m_start_beat) * + 60 / (m_bpm * m_samplerate)); + return jack_midi_event_write(m_buffer, timestamp, (jack_midi_data_t*)data, +- data_size, m_nframes); ++ data_size); + } + + diff --git a/audio/dino/files/patch-src-libdinoseq-sequencer.cpp b/audio/dino/files/patch-src-libdinoseq-sequencer.cpp new file mode 100644 index 000000000000..7b22c63217d8 --- /dev/null +++ b/audio/dino/files/patch-src-libdinoseq-sequencer.cpp @@ -0,0 +1,24 @@ +--- src/libdinoseq/sequencer.cpp.orig 2008-07-23 13:31:55.000000000 +0200 ++++ src/libdinoseq/sequencer.cpp 2008-07-23 13:33:30.000000000 +0200 +@@ -334,10 +334,10 @@ + jack_port_t* port = m_output_ports[iter->get_id()]; + if (port) { + void* port_buf = jack_port_get_buffer(port, nframes); +- jack_midi_clear_buffer(port_buf, nframes); ++ jack_midi_clear_buffer(port_buf); + unsigned char all_notes_off[] = { 0xB0, 123, 0 }; + if (!m_sent_all_off) +- jack_midi_event_write(port_buf, 0, all_notes_off, 3, nframes); ++ jack_midi_event_write(port_buf, 0, all_notes_off, 3); + } + m_sent_all_off = true; + } +@@ -361,7 +361,7 @@ + jack_port_t* port = m_output_ports[iter->get_id()]; + if (port) { + void* port_buf = jack_port_get_buffer(port, nframes); +- jack_midi_clear_buffer(port_buf, nframes); ++ jack_midi_clear_buffer(port_buf); + MIDIBuffer buffer(port_buf, start, pos.beats_per_minute,pos.frame_rate); + buffer.set_period_size(nframes); + buffer.set_cc_resolution(m_cc_resolution * pos.beats_per_minute / 60); |