CVS commit: [pkgsrc-2021Q4] pkgsrc/audio/lmms

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jan 17 19:40:03 UTC 2022

Modified Files:
        pkgsrc/audio/lmms [pkgsrc-2021Q4]: distinfo
        pkgsrc/audio/lmms/patches [pkgsrc-2021Q4]:
            patch-src_core_midi_MidiOss.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 pkgsrc/audio/lmms/distinfo
cvs rdiff -u -r1.1 -r1.1.18.1 \
    pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/lmms/distinfo
diff -u pkgsrc/audio/lmms/distinfo:1.15 pkgsrc/audio/lmms/distinfo:1.15.2.1
--- pkgsrc/audio/lmms/distinfo:1.15     Tue Oct 26 09:59:11 2021
+++ pkgsrc/audio/lmms/distinfo  Mon Jan 17 19:40:03 2022
@@ -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 byte
 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

Index: pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
diff -u pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp:1.1 pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp:1.1.18.1
--- pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp:1.1       Thu Oct 24 16:36:56 2019
+++ pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp   Mon Jan 17 19:40:03 2022
@@ -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" );