summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2022-01-17 19:40:03 +0000
committerbsiegert <bsiegert@pkgsrc.org>2022-01-17 19:40:03 +0000
commit2f7ebcc61c3ade130980291c0923b0a535ca069a (patch)
treea9051b3939178518a5b18fe6c505e8ff2229561c
parent8bb65df7a2fe45c6f7bee076bf30b80c4e6fb1c8 (diff)
downloadpkgsrc-2f7ebcc61c3ade130980291c0923b0a535ca069a.tar.gz
Pullup ticket #6568 - requested by nia
audio/lmms: NetBSD bugfix Revisions pulled up: - audio/lmms/distinfo 1.16 - audio/lmms/patches/patch-src_core_midi_MidiOss.cpp 1.2 --- Module Name: pkgsrc Committed By: nia Date: Fri Jan 14 10:59:32 UTC 2022 Modified Files: pkgsrc/audio/lmms: distinfo pkgsrc/audio/lmms/patches: patch-src_core_midi_MidiOss.cpp Log Message: lmms: Force unbuffered I/O when reading from a raw OSS MIDI device. Fixes MIDI input on NetBSD.
-rw-r--r--audio/lmms/distinfo4
-rw-r--r--audio/lmms/patches/patch-src_core_midi_MidiOss.cpp13
2 files changed, 14 insertions, 3 deletions
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo
index 540fc19016a..10efc92b0e2 100644
--- a/audio/lmms/distinfo
+++ b/audio/lmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 09:59:11 nia Exp $
+$NetBSD: distinfo,v 1.15.2.1 2022/01/17 19:40:03 bsiegert Exp $
BLAKE2s (lmms_1.2.2.tar.xz) = 332b1a6f78341a5766ccb4cddc9968ab97ba04150741421c89169a367f190acb
SHA512 (lmms_1.2.2.tar.xz) = df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
@@ -6,4 +6,4 @@ Size (lmms_1.2.2.tar.xz) = 22733960 bytes
SHA1 (patch-CMakeLists.txt) = e30599b486c83b734fd8f9afa4cf2bd488eab338
SHA1 (patch-src_CMakeLists.txt) = 92acfc9bc236c1b211bbe9686de818641c01b257
SHA1 (patch-src_core_audio_AudioOss.cpp) = 6bc591b929f26cbfb5f160c3d9b49316bf165e58
-SHA1 (patch-src_core_midi_MidiOss.cpp) = d1bf1a7bf9aaec549f3ac97d300c7bee4d81ff29
+SHA1 (patch-src_core_midi_MidiOss.cpp) = 5baf2619765f8a7372cd47ac0f3fb6a2fb3af618
diff --git a/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp b/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
index fd59b7f4ee6..7b1a9d3659f 100644
--- a/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
+++ b/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
@@ -1,9 +1,20 @@
-$NetBSD: patch-src_core_midi_MidiOss.cpp,v 1.1 2019/10/24 16:36:56 nia Exp $
+$NetBSD: patch-src_core_midi_MidiOss.cpp,v 1.1.18.1 2022/01/17 19:40:03 bsiegert Exp $
Support NetBSD's OSS emulation.
--- src/core/midi/MidiOss.cpp.orig 2018-11-03 01:43:42.000000000 +0000
+++ src/core/midi/MidiOss.cpp
+@@ -39,8 +39,8 @@ MidiOss::MidiOss() :
+ {
+ // only start thread, if opening of MIDI-device is successful,
+ // otherwise isRunning()==false indicates error
+- if( m_midiDev.open( QIODevice::ReadWrite ) ||
+- m_midiDev.open( QIODevice::ReadOnly ) )
++ if( m_midiDev.open( QIODevice::ReadWrite | QIODevice::Unbuffered | QIODevice::ExistingOnly ) ||
++ m_midiDev.open( QIODevice::ReadOnly | QIODevice::Unbuffered | QIODevice::ExistingOnly) )
+ {
+ start( QThread::LowPriority );
+ }
@@ -71,7 +71,11 @@ QString MidiOss::probeDevice()
{
return getenv( "MIDIDEV" );