Thu Oct 24 16:36:56 2019 UTC ()
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)


(nia)
diff -r1.55 -r1.56 pkgsrc/audio/lmms/Makefile
diff -r1.10 -r1.11 pkgsrc/audio/lmms/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/lmms/options.mk
diff -r0 -r1.1 pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
cvs diff -r1.55 -r1.56 pkgsrc/audio/lmms/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/lmms/Makefile 2019/09/18 14:17:05 1.55
+++ pkgsrc/audio/lmms/Makefile 2019/10/24 16:36:56 1.56
@@ -1,54 +1,58 @@ @@ -1,54 +1,58 @@
1# $NetBSD: Makefile,v 1.55 2019/09/18 14:17:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.56 2019/10/24 16:36:56 nia Exp $
2# 
3 2
4VERSION= 1.2.0 3DISTNAME= lmms_1.2.1
5PKGNAME= lmms-${VERSION} 4PKGNAME= ${DISTNAME:S/_/-/1}
6PKGREVISION= 2 5CATEGORIES= audio
7DISTNAME= lmms_${VERSION} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=LMMS/}
8EXTRACT_SUFX= .tar.xz 7GITHUB_PROJECT= lmms
9CATEGORIES= audio 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
10MASTER_SITES= ${MASTER_SITE_GITHUB:=LMMS/} 9EXTRACT_SUFX= .tar.xz
11GITHUB_RELEASE= v${VERSION} 10
12 11MAINTAINER= pkgsrc-users@NetBSD.org
13MAINTAINER= pkgsrc-users@NetBSD.org 12HOMEPAGE= https://lmms.io/
14HOMEPAGE= https://lmms.io/ 13COMMENT= Cross-platform music production software
15COMMENT= Cross-platform music production software 14LICENSE= gnu-gpl-v2
16LICENSE= gnu-gpl-v2 15
17 16TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
18USE_PKGLOCALEDIR= yes 17
19USE_LIBTOOL= yes 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
20USE_LANGUAGES= c c++03 19USE_CMAKE= yes
21USE_TOOLS+= gmake perl pkg-config 20USE_TOOLS+= pkg-config
22USE_CMAKE= yes 21USE_LANGUAGES= c c++03
23 22
24WRKSRC= ${WRKDIR}/lmms-${VERSION} 23.include "../../mk/oss.buildlink3.mk"
 24
 25.if ${OSS_TYPE} != "none"
 26LDFLAGS+= ${LIBOSSAUDIO}
 27.endif
25 28
 29CMAKE_ARGS+= -Wno-dev
26CMAKE_ARGS+= -DWANT_QT5=ON 30CMAKE_ARGS+= -DWANT_QT5=ON
27CMAKE_ARGS+= -DWANT_GIG=OFF # requires libgig 31CMAKE_ARGS+= -DWANT_GIG=OFF # requires libgig
28CMAKE_ARGS+= -DWANT_STK=OFF # requires libstk 32CMAKE_ARGS+= -DWANT_STK=OFF # requires libstk
29CMAKE_ARGS+= -DWANT_CARLA=OFF # requires carla 33CMAKE_ARGS+= -DWANT_CARLA=OFF # requires carla
30CMAKE_ARGS+= -DWANT_SOUNDIO=OFF # requires libsoundio 34CMAKE_ARGS+= -DWANT_SOUNDIO=OFF # requires libsoundio
 35CMAKE_ARGS+= -DWANT_SNDIO=OFF # requires sndio
31CMAKE_ARGS+= -DWANT_VST_NOWINE=ON 36CMAKE_ARGS+= -DWANT_VST_NOWINE=ON
32 37
33BUILDLINK_TRANSFORM+= rm:-floop-optimize2 rm:-fgcse-las 38BUILDLINK_TRANSFORM+= rm:-floop-optimize2 rm:-fgcse-las
34 39
35# for libzynaddsubfx.so in plugins/zynaddsubfx/. 40# for libzynaddsubfx.so in plugins/zynaddsubfx/.
36LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/lmms 41LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/lmms
37 42
38.include "options.mk" 43.include "options.mk"
39.include "../../audio/fluidsynth/buildlink3.mk" 44.include "../../audio/fluidsynth/buildlink3.mk"
40.include "../../audio/lame/buildlink3.mk" 45.include "../../audio/lame/buildlink3.mk"
41.include "../../audio/libsamplerate/buildlink3.mk" 46.include "../../audio/libsamplerate/buildlink3.mk"
42.include "../../audio/libsndfile/buildlink3.mk" 47.include "../../audio/libsndfile/buildlink3.mk"
43.include "../../audio/libvorbis/buildlink3.mk" 48.include "../../audio/libvorbis/buildlink3.mk"
44.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 49.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
45.include "../../math/fftwf/buildlink3.mk" 50.include "../../math/fftwf/buildlink3.mk"
46.include "../../multimedia/libogg/buildlink3.mk" 51.include "../../multimedia/libogg/buildlink3.mk"
47.include "../../sysutils/desktop-file-utils/desktopdb.mk" 52.include "../../sysutils/desktop-file-utils/desktopdb.mk"
48.include "../../x11/qt5-qtbase/buildlink3.mk" 53.include "../../x11/qt5-qtbase/buildlink3.mk"
49.include "../../x11/qt5-qttools/buildlink3.mk" 
50.include "../../x11/qt5-qtx11extras/buildlink3.mk" 54.include "../../x11/qt5-qtx11extras/buildlink3.mk"
51.include "../../mk/dlopen.buildlink3.mk" 55.include "../../mk/dlopen.buildlink3.mk"
52.include "../../mk/pthread.buildlink3.mk" 56.include "../../mk/pthread.buildlink3.mk"
53BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 57BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
54.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/audio/lmms/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/lmms/distinfo 2019/06/10 19:08:42 1.10
+++ pkgsrc/audio/lmms/distinfo 2019/10/24 16:36:56 1.11
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.10 2019/06/10 19:08:42 nia Exp $ 1$NetBSD: distinfo,v 1.11 2019/10/24 16:36:56 nia Exp $
2 2
3SHA1 (lmms_1.2.0.tar.xz) = b8c040559306d93678ed650eafd7a08fefa22e43 3SHA1 (lmms_1.2.1.tar.xz) = 47d139272ba938de89fbd432fbd7438ea919e58c
4RMD160 (lmms_1.2.0.tar.xz) = 8ad589d70fb0fc836bf67e4f6f18f21de099ea3f 4RMD160 (lmms_1.2.1.tar.xz) = 8a0361b2771eb49e979047e03600265c127dc220
5SHA512 (lmms_1.2.0.tar.xz) = 7d3476fbcbda49d75efee4161f6478656e38a517b6a3b24740ea354e223fba51210f45ff74b46fd1ac73fc6e65409226088b12e29558c91eb818da58734ab6cf 5SHA512 (lmms_1.2.1.tar.xz) = 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
6Size (lmms_1.2.0.tar.xz) = 14541000 bytes 6Size (lmms_1.2.1.tar.xz) = 14543092 bytes
7SHA1 (patch-CMakeLists.txt) = e30599b486c83b734fd8f9afa4cf2bd488eab338 7SHA1 (patch-CMakeLists.txt) = e30599b486c83b734fd8f9afa4cf2bd488eab338
8SHA1 (patch-src_CMakeLists.txt) = 92acfc9bc236c1b211bbe9686de818641c01b257 8SHA1 (patch-src_CMakeLists.txt) = 92acfc9bc236c1b211bbe9686de818641c01b257
9SHA1 (patch-src_core_audio_AudioOss.cpp) = 6bc591b929f26cbfb5f160c3d9b49316bf165e58 9SHA1 (patch-src_core_audio_AudioOss.cpp) = 6bc591b929f26cbfb5f160c3d9b49316bf165e58
 10SHA1 (patch-src_core_midi_MidiOss.cpp) = d1bf1a7bf9aaec549f3ac97d300c7bee4d81ff29
cvs diff -r1.3 -r1.4 pkgsrc/audio/lmms/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/lmms/options.mk 2019/10/20 11:10:47 1.3
+++ pkgsrc/audio/lmms/options.mk 2019/10/24 16:36:56 1.4
@@ -1,20 +1,28 @@ @@ -1,20 +1,28 @@
1# $NetBSD: options.mk,v 1.3 2019/10/20 11:10:47 nia Exp $ 1# $NetBSD: options.mk,v 1.4 2019/10/24 16:36:56 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.lmms 3PKG_OPTIONS_VAR= PKG_OPTIONS.lmms
4 4
5PKG_SUPPORTED_OPTIONS+= alsa jack portaudio pulseaudio sdl 5PKG_SUPPORTED_OPTIONS+= alsa jack portaudio pulseaudio sdl
6PKG_SUGGESTED_OPTIONS+= jack portaudio sdl 6PKG_SUGGESTED_OPTIONS.Linux+= alsa
7PKG_SUGGESTED_OPTIONS.Linux+= alsa pulseaudio 7
 8.include "../../mk/bsd.fast.prefs.mk"
 9.include "../../mk/oss.buildlink3.mk"
 10
 11# XXX may want to use SDL2 on NetBSD when support is released
 12
 13.if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none"
 14PKG_SUGGESTED_OPTIONS+= portaudio
 15.endif
8 16
9.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
10 18
11.if !empty(PKG_OPTIONS:Malsa) 19.if !empty(PKG_OPTIONS:Malsa)
12CMAKE_ARGS+= -DWANT_ALSA=ON 20CMAKE_ARGS+= -DWANT_ALSA=ON
13.include "../../audio/alsa-lib/buildlink3.mk" 21.include "../../audio/alsa-lib/buildlink3.mk"
14.else 22.else
15CMAKE_ARGS+= -DWANT_ALSA=OFF 23CMAKE_ARGS+= -DWANT_ALSA=OFF
16.endif 24.endif
17 25
18.if !empty(PKG_OPTIONS:Mjack) 26.if !empty(PKG_OPTIONS:Mjack)
19CMAKE_ARGS+= -DWANT_JACK=ON 27CMAKE_ARGS+= -DWANT_JACK=ON
20.include "../../audio/jack/buildlink3.mk" 28.include "../../audio/jack/buildlink3.mk"
File Added: pkgsrc/audio/lmms/patches/patch-src_core_midi_MidiOss.cpp
$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;
 }