svn commit: r448452 - in head/audio/qsynth: . files

[Richard Gallamore]

Author: ultima
Date: Mon Aug 21 06:57:50 2017
New Revision: 448452
URL: https://svnweb.freebsd.org/changeset/ports/448452

Log:
  * Updated to 0.4.4
  * Removed QT4 option, obsoleted
  * Added XUNIQUE option, to match configure
  * Moved patch to post-patch target
  
  PR:		221456
  Submitted by:	Yuri Victorovich
  Reviewed by:	matthew (mentor)
  Approved by:	matthew (mentor)
  Differential Revision:	https://reviews.freebsd.org/D12095

Deleted:
  head/audio/qsynth/files/patch-src_qsynthOptions.cpp
Modified:
  head/audio/qsynth/Makefile
  head/audio/qsynth/distinfo
  head/audio/qsynth/pkg-plist

Modified: head/audio/qsynth/Makefile
==============================================================================
--- head/audio/qsynth/Makefile	Mon Aug 21 06:53:26 2017	(r448451)
+++ head/audio/qsynth/Makefile	Mon Aug 21 06:57:50 2017	(r448452)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qsynth
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.4
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -14,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 
-USES=		gmake
-QT_NONSTANDARD=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_ac_cv_qmake=${QMAKE} \
 		ac_cv_path_ac_moc=${MOC} \
@@ -24,30 +23,32 @@ CONFIGURE_ENV=	ac_cv_path_ac_cv_qmake=${QMAKE} \
 		ac_cv_path_ac_lrelease=${LRELEASE}
 CONFIGURE_ARGS=	--localedir=${DATADIR} \
 		--with-fluidsynth=${LOCALBASE}
+USE_CXXSTD=	c++11
+USE_QT5=	core gui widgets buildtools_build linguisttools_build qmake_build
+USE_GL=		gl
+INSTALLS_ICONS=	yes
 
-OPTIONS_DEFINE=		GRADIENT SYSTEM_TRAY
-OPTIONS_SINGLE=		TOOLKIT
-OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
-OPTIONS_DEFAULT=	GRADIENT QT4 SYSTEM_TRAY
+OPTIONS_DEFINE=	GRADIENT SYSTEM_TRAY XUNIQUE
+OPTIONS_DEFAULT=GRADIENT SYSTEM_TRAY XUNIQUE
 
 GRADIENT_DESC=		Gradient eye-candy
 GRADIENT_CONFIGURE_ENABLE=	gradient
-QT4_USE=		qt4=corelib,gui \
-			qt4=linguisttools_build \
-			qt4=moc_build,qmake_build,rcc_build,uic_build
-QT4_CONFIGURE_ENABLE=	qt4
-QT5_USE=		qt5=core,gui,widgets,x11extras \
-			qt5=buildtools_build,linguisttools_build,qmake_build
-QT5_CONFIGURE_ENABLE=	qt5
 SYSTEM_TRAY_DESC=	System-tray icon support
 SYSTEM_TRAY_CONFIGURE_ENABLE=	system-tray
-TOOLKIT_DESC=		Qt toolkit
+XUNIQUE_DESC=		X11 unique/single instance
+XUNIQUE_CONFIGURE_ENABLE=	xunique
+XUNIQUE_USE=		XORG=x11
 
+post-patch:
+	@${REINPLACE_CMD} -e ' \
+		s|oss,alsa,alsa_seq,|jack,oss,|; \
+		s|alsa,jack,oss,dsound,|jack,oss,dsound,|; \
+		s|"/MidiDriver", "alsa_seq"|"/MidiDriver", "jack"|; \
+		s|m_settings.value("/SoundFontDir").toString();|m_settings.value("/SoundFontDir").toString().isEmpty() ? "${LOCALBASE}/share/sounds/sf2" : m_settings.value("/SoundFontDir").toString();|' \
+		${WRKSRC}/src/qsynthOptions.cpp
+
 post-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o qsynth.mak \
 		${QMAKE_ARGS})
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qsynth
 
 .include <bsd.port.mk>

Modified: head/audio/qsynth/distinfo
==============================================================================
--- head/audio/qsynth/distinfo	Mon Aug 21 06:53:26 2017	(r448451)
+++ head/audio/qsynth/distinfo	Mon Aug 21 06:57:50 2017	(r448452)
@@ -1,2 +1,3 @@
-SHA256 (qsynth-0.4.1.tar.gz) = 50f4e36e0c5a7e092429e1cafbd8989346127b8b0c0868566addcacc5735970c
-SIZE (qsynth-0.4.1.tar.gz) = 251821
+TIMESTAMP = 1502579710
+SHA256 (qsynth-0.4.4.tar.gz) = 0ef914447b1f3a3ecd9c38101f06fc9c67e1d8367202a3f7a494f5d167b40e62
+SIZE (qsynth-0.4.4.tar.gz) = 260482

Modified: head/audio/qsynth/pkg-plist
==============================================================================
--- head/audio/qsynth/pkg-plist	Mon Aug 21 06:53:26 2017	(r448451)
+++ head/audio/qsynth/pkg-plist	Mon Aug 21 06:57:50 2017	(r448452)
@@ -1,5 +1,6 @@
 bin/qsynth
 man/man1/qsynth.1.gz
+man/man1/qsynth.fr.1.gz
 share/appdata/qsynth.appdata.xml
 share/applications/qsynth.desktop
 share/icons/hicolor/32x32/apps/qsynth.png