Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Oct 2015 21:44:28 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398962 - in head/audio/qjackctl: . files
Message-ID:  <201510092144.t99LiSWn018751@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Oct  9 21:44:27 2015
New Revision: 398962
URL: https://svnweb.freebsd.org/changeset/ports/398962

Log:
  audio/qjackctl: Upgrade version 0.3.13 => 0.4.0
  
  PR:		199217
  Submitted by:	ports fury

Modified:
  head/audio/qjackctl/Makefile
  head/audio/qjackctl/distinfo
  head/audio/qjackctl/files/patch-src-qjackctlSetup.cpp

Modified: head/audio/qjackctl/Makefile
==============================================================================
--- head/audio/qjackctl/Makefile	Fri Oct  9 21:41:03 2015	(r398961)
+++ head/audio/qjackctl/Makefile	Fri Oct  9 21:44:27 2015	(r398962)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qjackctl
-DISTVERSION=	0.3.13
+PORTVERSION=	0.4.0
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -11,12 +11,9 @@ COMMENT=	Qt Interface for the JACK Audio
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 USES=		gmake
-USE_QT4=	corelib dbus gui xml \
-		linguisttools_build moc_build qmake_build rcc_build uic_build
 QT_NONSTANDARD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_ac_moc=${MOC} \
@@ -24,10 +21,28 @@ CONFIGURE_ENV=	ac_cv_path_ac_moc=${MOC} 
 		ac_cv_path_ac_qmake=${QMAKE} \
 		ac_cv_path_ac_lupdate=${LUPDATE} \
 		ac_cv_path_ac_lrelease=${LRELEASE}
-CONFIGURE_ARGS=	--disable-portaudio
 INSTALLS_ICONS=	yes
 MAKE_JOBS_UNSAFE=yes
 
+OPTIONS_DEFINE=		ALSA PORTAUDIO
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_DEFAULT=	QT4
+
+ALSA_LIB_DEPENDS= 	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_ENABLE=	alsa_seq
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_CONFIGURE_ENABLE=	portaudio
+QT4_USE=		qt4=corelib,dbus,gui,xml \
+			qt4=linguisttools_build \
+			qt4=moc_build,qmake_build,rcc_build,uic_build
+QT4_CONFIGURE_ENABLE=	qt4
+QT5_USE=		qt5=core,dbus,gui,widgets,xml \
+			qt5=buildtools_build,linguisttools_build,qmake_build
+QT5_CXXFLAGS=		-fPIC
+QT5_CONFIGURE_ENABLE=	qt5
+TOOLKIT_DESC=		Qt toolkit
+
 post-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \
 		${QMAKE_ARGS}

Modified: head/audio/qjackctl/distinfo
==============================================================================
--- head/audio/qjackctl/distinfo	Fri Oct  9 21:41:03 2015	(r398961)
+++ head/audio/qjackctl/distinfo	Fri Oct  9 21:44:27 2015	(r398962)
@@ -1,2 +1,2 @@
-SHA256 (qjackctl-0.3.13.tar.gz) = 11e0041ff38ac46df466968bd5e0e33986f76b7f099bd75a66fbf2a07c1b1295
-SIZE (qjackctl-0.3.13.tar.gz) = 498208
+SHA256 (qjackctl-0.4.0.tar.gz) = 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a
+SIZE (qjackctl-0.4.0.tar.gz) = 500534

Modified: head/audio/qjackctl/files/patch-src-qjackctlSetup.cpp
==============================================================================
--- head/audio/qjackctl/files/patch-src-qjackctlSetup.cpp	Fri Oct  9 21:41:03 2015	(r398961)
+++ head/audio/qjackctl/files/patch-src-qjackctlSetup.cpp	Fri Oct  9 21:44:27 2015	(r398962)
@@ -1,11 +1,11 @@
---- src/qjackctlSetup.cpp.orig	2007-07-18 12:05:32.000000000 +0200
-+++ src/qjackctlSetup.cpp	2007-09-26 22:24:19.000000000 +0200
-@@ -290,7 +290,7 @@
- 	preset.iWordLength  = m_settings.value("/WordLength", 16).toInt();
- 	preset.iWait        = m_settings.value("/Wait", 21333).toInt();
- 	preset.iChan        = m_settings.value("/Chan", 0).toInt();
--	preset.sDriver      = m_settings.value("/Driver", "alsa").toString();
-+	preset.sDriver      = m_settings.value("/Driver", "oss").toString();
- 	preset.sInterface   = m_settings.value("/Interface").toString();
- 	preset.iAudio       = m_settings.value("/Audio", 0).toInt();
- 	preset.iDither      = m_settings.value("/Dither", 0).toInt();
+--- src/qjackctlSetup.cpp.orig	2015-07-15 13:30:36 UTC
++++ src/qjackctlSetup.cpp
+@@ -34,7 +34,7 @@
+ #if defined(WIN32)
+ #define DEFAULT_DRIVER "portaudio"
+ #else
+-#define DEFAULT_DRIVER "alsa"
++#define DEFAULT_DRIVER "oss"
+ #endif
+ 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510092144.t99LiSWn018751>