Thu Oct 17 08:20:43 2019 UTC ()
qsynth: Update to 0.5.7

Should help the build with newer fluidsynth.


(nia)
diff -r1.51 -r1.52 pkgsrc/audio/qsynth/Makefile
diff -r1.2 -r1.3 pkgsrc/audio/qsynth/PLIST
diff -r1.4 -r1.5 pkgsrc/audio/qsynth/distinfo
diff -r1.2 -r0 pkgsrc/audio/qsynth/options.mk
diff -r1.2 -r0 pkgsrc/audio/qsynth/patches/patch-Makefile.in
diff -r0 -r1.1 pkgsrc/audio/qsynth/patches/patch-src_qsynthOptions.cpp
cvs diff -r1.51 -r1.52 pkgsrc/audio/qsynth/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/qsynth/Makefile 2019/09/18 14:17:06 1.51
+++ pkgsrc/audio/qsynth/Makefile 2019/10/17 08:20:43 1.52
@@ -1,27 +1,19 @@ @@ -1,27 +1,19 @@
1# $NetBSD: Makefile,v 1.51 2019/09/18 14:17:06 ryoon Exp $ 1# $NetBSD: Makefile,v 1.52 2019/10/17 08:20:43 nia Exp $
2 2
3DISTNAME= qsynth-0.4.1 3DISTNAME= qsynth-0.5.7
4PKGREVISION= 20 
5CATEGORIES= audio 
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qsynth/} 4MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qsynth/}
7EXTRACT_USING= bsdtar 5CATEGORIES= audio
8 6
9MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://qsynth.sourceforge.net/ 8HOMEPAGE= https://qsynth.sourceforge.io/qsynth-index.html
11COMMENT= Qt GUI Interface to FluidSynth 9COMMENT= Qt GUI Interface to FluidSynth
12LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
13 11
14USE_LANGUAGES= c c++ 12USE_CMAKE= yes
15USE_LIBTOOL= yes 13USE_TOOLS+= pkg-config
16USE_TOOLS+= gmake 14USE_LANGUAGES= c c++
17GNU_CONFIGURE= yes 
18 
19PTHREAD_AUTO_VARS= yes 
20 
21.include "options.mk" 
22 15
23.include "../../audio/fluidsynth/buildlink3.mk" 16.include "../../audio/fluidsynth/buildlink3.mk"
24.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 
25.include "../../sysutils/desktop-file-utils/desktopdb.mk" 17.include "../../sysutils/desktop-file-utils/desktopdb.mk"
26.include "../../mk/pthread.buildlink3.mk" 18.include "../../x11/qt5-qtbase/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/audio/qsynth/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/qsynth/PLIST 2016/04/23 12:32:47 1.2
+++ pkgsrc/audio/qsynth/PLIST 2019/10/17 08:20:43 1.3
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1@comment $NetBSD: PLIST,v 1.2 2016/04/23 12:32:47 nros Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/10/17 08:20:43 nia Exp $
2bin/qsynth 2bin/qsynth
 3man/fr/man1/qsynth.1
3man/man1/qsynth.1 4man/man1/qsynth.1
4share/appdata/qsynth.appdata.xml 
5share/applications/qsynth.desktop 5share/applications/qsynth.desktop
6share/icons/hicolor/32x32/apps/qsynth.png 6share/metainfo/qsynth.appdata.xml
 7share/pixmaps/qsynth.png
7share/qsynth/translations/qsynth_cs.qm 8share/qsynth/translations/qsynth_cs.qm
8share/qsynth/translations/qsynth_de.qm 9share/qsynth/translations/qsynth_de.qm
 10share/qsynth/translations/qsynth_es.qm
9share/qsynth/translations/qsynth_fr.qm 11share/qsynth/translations/qsynth_fr.qm
10share/qsynth/translations/qsynth_ru.qm 12share/qsynth/translations/qsynth_ru.qm
11share/qsynth/translations/qsynth_sr.qm 13share/qsynth/translations/qsynth_sr.qm
cvs diff -r1.4 -r1.5 pkgsrc/audio/qsynth/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/qsynth/distinfo 2016/07/09 11:46:04 1.4
+++ pkgsrc/audio/qsynth/distinfo 2019/10/17 08:20:43 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2016/07/09 11:46:04 rillig Exp $ 1$NetBSD: distinfo,v 1.5 2019/10/17 08:20:43 nia Exp $
2 2
3SHA1 (qsynth-0.4.1.tar.gz) = 7b394dab4182136cdd9dd6e314b9976582f0113c 3SHA1 (qsynth-0.5.7.tar.gz) = f741da07c86d8d8dfdec9783384053bdc4251583
4RMD160 (qsynth-0.4.1.tar.gz) = ac79db014c9282fc8735b1c8cb270f7b762d1f45 4RMD160 (qsynth-0.5.7.tar.gz) = feeebed368c7224d3c980db9efb0c30e9ab3ff75
5SHA512 (qsynth-0.4.1.tar.gz) = 0a4e2dacc9116a9c52a50af39f0838a0c97d0e2f0ba75f8c3f07a219810299c5dd650ad7cd5ba337e497f83537b7cb94a181c9e3a5ba641febe1a0179d6c8620 5SHA512 (qsynth-0.5.7.tar.gz) = cf28b2e16a7951bdd1539f4fd7624b8216652ba2debb8b3ccf60daf5ad510fea75b598aef7ef7264bee9c1aabbbce5161ad13e2ec879c9568c76794bb00fd017
6Size (qsynth-0.4.1.tar.gz) = 251821 bytes 6Size (qsynth-0.5.7.tar.gz) = 315715 bytes
7SHA1 (patch-Makefile.in) = 6520871cdb3cb0e3e1004f051ee9e1cf45a3619b 7SHA1 (patch-src_qsynthOptions.cpp) = 737c2877f99fbd31a5872257fdce4c5fb3e4b284
File Deleted: pkgsrc/audio/qsynth/Attic/options.mk
File Deleted: pkgsrc/audio/qsynth/patches/Attic/patch-Makefile.in
File Added: pkgsrc/audio/qsynth/patches/patch-src_qsynthOptions.cpp
$NetBSD: patch-src_qsynthOptions.cpp,v 1.1 2019/10/17 08:20:43 nia Exp $

Use OSS as the default audio driver on non-Linux/macOS.

--- src/qsynthOptions.cpp.orig	2019-07-12 10:35:23.877356128 +0000
+++ src/qsynthOptions.cpp
@@ -487,9 +487,12 @@ void qsynthOptions::loadSetup ( qsynthSe
 #elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "winmidi").toString();
 	pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "dsound").toString();
-#else
+#elif defined(__linux__)
 	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "alsa_seq").toString();
-	pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "jack").toString();
+	pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "alsa").toString();
+#else
+	pSetup->sMidiDriver      = m_settings.value("/MidiDriver", "oss").toString();
+	pSetup->sAudioDriver     = m_settings.value("/AudioDriver", "oss").toString();
 #endif
 #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
 	pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 512).toInt();