aboutsummaryrefslogtreecommitdiff
path: root/audio/qjackctl
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2015-10-09 21:44:27 +0000
committerJohn Marino <marino@FreeBSD.org>2015-10-09 21:44:27 +0000
commitda50850272f3a81cab89945b84c3cc3ca4bbf829 (patch)
treea64f60130a39d4ab59f716ed76401cf61a9c06a8 /audio/qjackctl
parente6b7c4e82074d797e671ebbb52c312f763e90c52 (diff)
downloadports-da50850272f3a81cab89945b84c3cc3ca4bbf829.tar.gz
ports-da50850272f3a81cab89945b84c3cc3ca4bbf829.zip
Notes
Diffstat (limited to 'audio/qjackctl')
-rw-r--r--audio/qjackctl/Makefile27
-rw-r--r--audio/qjackctl/distinfo4
-rw-r--r--audio/qjackctl/files/patch-src-qjackctlSetup.cpp22
3 files changed, 34 insertions, 19 deletions
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 70e45dee6ed3..747e41f5ad28 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -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 Connection Kit
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}
diff --git a/audio/qjackctl/distinfo b/audio/qjackctl/distinfo
index e2bdcfb0af71..094c1aca7763 100644
--- a/audio/qjackctl/distinfo
+++ b/audio/qjackctl/distinfo
@@ -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
diff --git a/audio/qjackctl/files/patch-src-qjackctlSetup.cpp b/audio/qjackctl/files/patch-src-qjackctlSetup.cpp
index 57845f8cb9ab..879c9123b8ba 100644
--- a/audio/qjackctl/files/patch-src-qjackctlSetup.cpp
+++ b/audio/qjackctl/files/patch-src-qjackctlSetup.cpp
@@ -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
+
+