lmms: Update to 1.2.1

pkgsrc changes:

- Fixed initial midi settings on NetBSD (use /dev/rmidi0 instead of /dev/midi)
- Enable only "native" audio outputs by default
- Disable some no longer used dependencies

New changes in 1.2.1: (2019-10-21)

    General improvements
        Respect OS' case sensitivity when checking for existing files (#4768)
        Remove MIDI connections from factory .mmpz files (#5163)
        Show FreeBSD in the build version info (732448c)
    UI improvements
        Make splash screen text white (#5149)
        Show Beat/Bassline Editor on clicking track labels of B/B tracks (#5060)
        Enable dark title bar on macOS (df79f8c)
    Bug Fixes
        Fix building RemoteVstPlugin with Wine >= 4.14 (#5210)
        Fix stuck keys when dragging on the piano view (#5127)
        Fix crash on unmarking octave semitones (#5184)
        Fix invalid MIDI Program Change decoding (#5154)
        Rubberband fix for selecting a large area in the song editor (#5003)
        VeSTige: show icon on 'Turn off all notes' button (#5237)
        RemoteVstPlugin: fix crashes when failed to open a file (#5235)
        Organic: fix glitch at the beginning of a note (#5252)
        Fix broken audio sample exporting on high sampling rate (#5226)
    Localization
        Better French translations in the menu item file (#4711)
        Fix too long translations to fix the UI misalignment (#5185)

4 files changed, 66 insertions, 35 deletions

diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 14acdb8d9ca..ce1d4cf5bbc 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,33 +1,38 @@
-# $NetBSD: Makefile,v 1.55 2019/09/18 14:17:05 ryoon Exp $
-#
-
-VERSION=		1.2.0
-PKGNAME=		lmms-${VERSION}
-PKGREVISION=		2
-DISTNAME=		lmms_${VERSION}
-EXTRACT_SUFX=		.tar.xz
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_GITHUB:=LMMS/}
-GITHUB_RELEASE=		v${VERSION}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://lmms.io/
-COMMENT=		Cross-platform music production software
-LICENSE=		gnu-gpl-v2
-
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-USE_LANGUAGES=		c c++03
-USE_TOOLS+=		gmake perl pkg-config
-USE_CMAKE=		yes
-
-WRKSRC=		${WRKDIR}/lmms-${VERSION}
+# $NetBSD: Makefile,v 1.56 2019/10/24 16:36:56 nia Exp $
 
+DISTNAME=	lmms_1.2.1
+PKGNAME=	${DISTNAME:S/_/-/1}
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_GITHUB:=LMMS/}
+GITHUB_PROJECT=	lmms
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://lmms.io/
+COMMENT=	Cross-platform music production software
+LICENSE=	gnu-gpl-v2
+
+TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES=	c c++03
+
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OSS_TYPE} != "none"
+LDFLAGS+=	${LIBOSSAUDIO}
+.endif
+
+CMAKE_ARGS+=	-Wno-dev
 CMAKE_ARGS+=	-DWANT_QT5=ON
 CMAKE_ARGS+=	-DWANT_GIG=OFF # requires libgig
 CMAKE_ARGS+=	-DWANT_STK=OFF # requires libstk
 CMAKE_ARGS+=	-DWANT_CARLA=OFF # requires carla
 CMAKE_ARGS+=	-DWANT_SOUNDIO=OFF # requires libsoundio
+CMAKE_ARGS+=	-DWANT_SNDIO=OFF # requires sndio
 CMAKE_ARGS+=	-DWANT_VST_NOWINE=ON
 
 BUILDLINK_TRANSFORM+=	rm:-floop-optimize2 rm:-fgcse-las
@@ -46,7 +51,6 @@ LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/lmms
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo
index 0910f35f156..4de91d4f5c4 100644
--- a/audio/lmms/distinfo
+++ b/audio/lmms/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2019/06/10 19:08:42 nia Exp $
+$NetBSD: distinfo,v 1.11 2019/10/24 16:36:56 nia Exp $
 
-SHA1 (lmms_1.2.0.tar.xz) = b8c040559306d93678ed650eafd7a08fefa22e43
-RMD160 (lmms_1.2.0.tar.xz) = 8ad589d70fb0fc836bf67e4f6f18f21de099ea3f
-SHA512 (lmms_1.2.0.tar.xz) = 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf
-Size (lmms_1.2.0.tar.xz) = 14541000 bytes
+SHA1 (lmms_1.2.1.tar.xz) = 47d139272ba938de89fbd432fbd7438ea919e58c
+RMD160 (lmms_1.2.1.tar.xz) = 8a0361b2771eb49e979047e03600265c127dc220
+SHA512 (lmms_1.2.1.tar.xz) = 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
+Size (lmms_1.2.1.tar.xz) = 14543092 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
diff --git a/audio/lmms/options.mk b/audio/lmms/options.mk
index c35c9ba97b6..df98ccd54f5 100644
--- a/audio/lmms/options.mk
+++ b/audio/lmms/options.mk
@@ -1,10 +1,18 @@
-# $NetBSD: options.mk,v 1.3 2019/10/20 11:10:47 nia Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/24 16:36:56 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.lmms
+PKG_OPTIONS_VAR=		PKG_OPTIONS.lmms
 
-PKG_SUPPORTED_OPTIONS+=	alsa jack portaudio pulseaudio sdl
-PKG_SUGGESTED_OPTIONS+=	jack portaudio sdl
-PKG_SUGGESTED_OPTIONS.Linux+=	alsa pulseaudio
+PKG_SUPPORTED_OPTIONS+=		alsa jack portaudio pulseaudio sdl
+PKG_SUGGESTED_OPTIONS.Linux+=	alsa
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+# XXX may want to use SDL2 on NetBSD when support is released
+
+.if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none"
+PKG_SUGGESTED_OPTIONS+=		portaudio
+.endif
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp b/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
new file mode 100644
index 00000000000..fd59b7f4ee6
--- /dev/null
+++ b/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_core_midi_MidiOss.cpp,v 1.1 2019/10/24 16:36:56 nia 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
+@@ -71,7 +71,11 @@ QString MidiOss::probeDevice()
+ 		{
+ 			return getenv( "MIDIDEV" );
+ 		}
++#ifdef __NetBSD__
++		return "/dev/rmidi0";
++#else
+ 		return "/dev/midi";
++#endif
+ 	}
+ 	return dev;
+ }