qsynth: Update to 0.5.7

Should help the build with newer fluidsynth.

6 files changed, 40 insertions, 69 deletions

diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 9403ccb0cfd..d07cbf0ddb7 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -1,27 +1,19 @@
-# $NetBSD: Makefile,v 1.51 2019/09/18 14:17:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2019/10/17 08:20:43 nia Exp $
 
-DISTNAME=	qsynth-0.4.1
-PKGREVISION=	20
-CATEGORIES=	audio
+DISTNAME=	qsynth-0.5.7
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qsynth/}
-EXTRACT_USING=	bsdtar
+CATEGORIES=	audio
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://qsynth.sourceforge.net/
+HOMEPAGE=	https://qsynth.sourceforge.io/qsynth-index.html
 COMMENT=	Qt GUI Interface to FluidSynth
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-
-PTHREAD_AUTO_VARS=	yes
-
-.include "options.mk"
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config
+USE_LANGUAGES=	c c++
 
 .include "../../audio/fluidsynth/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/pthread.buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/qsynth/PLIST b/audio/qsynth/PLIST
index e3d7e07b341..dfeadbe2318 100644
--- a/audio/qsynth/PLIST
+++ b/audio/qsynth/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2016/04/23 12:32:47 nros Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/10/17 08:20:43 nia Exp $
 bin/qsynth
+man/fr/man1/qsynth.1
 man/man1/qsynth.1
-share/appdata/qsynth.appdata.xml
 share/applications/qsynth.desktop
-share/icons/hicolor/32x32/apps/qsynth.png
+share/metainfo/qsynth.appdata.xml
+share/pixmaps/qsynth.png
 share/qsynth/translations/qsynth_cs.qm
 share/qsynth/translations/qsynth_de.qm
+share/qsynth/translations/qsynth_es.qm
 share/qsynth/translations/qsynth_fr.qm
 share/qsynth/translations/qsynth_ru.qm
 share/qsynth/translations/qsynth_sr.qm
diff --git a/audio/qsynth/distinfo b/audio/qsynth/distinfo
index 343983e50cb..6a434195278 100644
--- a/audio/qsynth/distinfo
+++ b/audio/qsynth/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/07/09 11:46:04 rillig Exp $
+$NetBSD: distinfo,v 1.5 2019/10/17 08:20:43 nia Exp $
 
-SHA1 (qsynth-0.4.1.tar.gz) = 7b394dab4182136cdd9dd6e314b9976582f0113c
-RMD160 (qsynth-0.4.1.tar.gz) = ac79db014c9282fc8735b1c8cb270f7b762d1f45
-SHA512 (qsynth-0.4.1.tar.gz) = 0a4e2dacc9116a9c52a50af39f0838a0c97d0e2f0ba75f8c3f07a219810299c5dd650ad7cd5ba337e497f83537b7cb94a181c9e3a5ba641febe1a0179d6c8620
-Size (qsynth-0.4.1.tar.gz) = 251821 bytes
-SHA1 (patch-Makefile.in) = 6520871cdb3cb0e3e1004f051ee9e1cf45a3619b
+SHA1 (qsynth-0.5.7.tar.gz) = f741da07c86d8d8dfdec9783384053bdc4251583
+RMD160 (qsynth-0.5.7.tar.gz) = feeebed368c7224d3c980db9efb0c30e9ab3ff75
+SHA512 (qsynth-0.5.7.tar.gz) = cf28b2e16a7951bdd1539f4fd7624b8216652ba2debb8b3ccf60daf5ad510fea75b598aef7ef7264bee9c1aabbbce5161ad13e2ec879c9568c76794bb00fd017
+Size (qsynth-0.5.7.tar.gz) = 315715 bytes
+SHA1 (patch-src_qsynthOptions.cpp) = 737c2877f99fbd31a5872257fdce4c5fb3e4b284
diff --git a/audio/qsynth/options.mk b/audio/qsynth/options.mk
deleted file mode 100644
index b641ead68aa..00000000000
--- a/audio/qsynth/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2016/07/09 11:46:04 rillig Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.qsynth
-PKG_OPTIONS_REQUIRED_GROUPS= qt
-PKG_OPTIONS_GROUP.qt= 	qt4 qt5
-PKG_SUGGESTED_OPTIONS=	qt4
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mqt5)
-CONFIGURE_ARGS+=        --with-qt5=${QTDIR}
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.  if ${OPSYS} != "Darwin"
-.	include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mqt4)
-CONFIGURE_ARGS+=        --with-qt4=${QTDIR}
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.endif
diff --git a/audio/qsynth/patches/patch-Makefile.in b/audio/qsynth/patches/patch-Makefile.in
deleted file mode 100644
index 421cd0256e7..00000000000
--- a/audio/qsynth/patches/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2016/07/09 11:46:04 rillig Exp $
-
-* pkgsrc install does not have -v
-
---- Makefile.in.orig	2016-04-05 15:57:45.000000000 +0000
-+++ Makefile.in
-@@ -104,11 +104,10 @@ translations_lrelease:	translations_lupd
- 
- install:	$(target) translations_lrelease $(name).1
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
--	@install -d -v -m 0755 $(DESTDIR)$(translations_dir)
--	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
--	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
--	@install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1
--	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name).1
-+	@$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(translations_dir)
-+	@$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-+	@$(BSD_INSTALL_DATA) $(translations_targets) $(DESTDIR)$(translations_dir)
-+	@$(BSD_INSTALL_MAN) $(name).1 $(DESTDIR)$(mandir)/man1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/audio/qsynth/patches/patch-src_qsynthOptions.cpp b/audio/qsynth/patches/patch-src_qsynthOptions.cpp
new file mode 100644
index 00000000000..be197e329fd
--- /dev/null
+++ b/audio/qsynth/patches/patch-src_qsynthOptions.cpp
@@ -0,0 +1,21 @@
+$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();