View | Details | Raw Unified | Return to bug 199217 | Differences between
and this patch

Collapse All | Expand All

(-)audio/qjackctl/Makefile (-6 / +21 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/audio/qjackctl/Makefile 383073 2015-04-02 21:21:39Z pawel $
2
# $FreeBSD: head/audio/qjackctl/Makefile 383073 2015-04-02 21:21:39Z pawel $
3
3
4
PORTNAME=	qjackctl
4
PORTNAME=	qjackctl
5
DISTVERSION=	0.3.13
5
PORTVERSION=	0.4.0
6
CATEGORIES=	audio
6
CATEGORIES=	audio
7
MASTER_SITES=	SF
7
MASTER_SITES=	SF
8
8
Lines 11-22 Link Here
11
11
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
13
14
LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
14
LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
15
		libjack.so:${PORTSDIR}/audio/jack
16
15
17
USES=		gmake
16
USES=		gmake
18
USE_QT4=	corelib dbus gui xml \
19
		linguisttools_build moc_build qmake_build rcc_build uic_build
20
QT_NONSTANDARD=	yes
17
QT_NONSTANDARD=	yes
21
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
22
CONFIGURE_ENV=	ac_cv_path_ac_moc=${MOC} \
19
CONFIGURE_ENV=	ac_cv_path_ac_moc=${MOC} \
Lines 24-33 Link Here
24
		ac_cv_path_ac_qmake=${QMAKE} \
21
		ac_cv_path_ac_qmake=${QMAKE} \
25
		ac_cv_path_ac_lupdate=${LUPDATE} \
22
		ac_cv_path_ac_lupdate=${LUPDATE} \
26
		ac_cv_path_ac_lrelease=${LRELEASE}
23
		ac_cv_path_ac_lrelease=${LRELEASE}
27
CONFIGURE_ARGS=	--disable-portaudio
28
INSTALLS_ICONS=	yes
24
INSTALLS_ICONS=	yes
29
MAKE_JOBS_UNSAFE=yes
25
MAKE_JOBS_UNSAFE=yes
30
26
27
OPTIONS_DEFINE=		ALSA PORTAUDIO
28
OPTIONS_SINGLE=		TOOLKIT
29
OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
30
OPTIONS_DEFAULT=	QT4
31
32
ALSA_LIB_DEPENDS= 	libasound.so:${PORTSDIR}/audio/alsa-lib
33
ALSA_CONFIGURE_ENABLE=	alsa_seq
34
PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
35
PORTAUDIO_CONFIGURE_ENABLE=	portaudio
36
QT4_USE=		qt4=corelib,dbus,gui,xml \
37
			qt4=linguisttools_build \
38
			qt4=moc_build,qmake_build,rcc_build,uic_build
39
QT4_CONFIGURE_ENABLE=	qt4
40
QT5_USE=		qt5=core,dbus,gui,widgets,xml \
41
			qt5=buildtools_build,linguisttools_build,qmake_build
42
QT5_CXXFLAGS=		-fPIC
43
QT5_CONFIGURE_ENABLE=	qt5
44
TOOLKIT_DESC=		Qt toolkit
45
31
post-configure:
46
post-configure:
32
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \
47
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \
33
		${QMAKE_ARGS}
48
		${QMAKE_ARGS}
(-)audio/qjackctl/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qjackctl-0.3.13.tar.gz) = 11e0041ff38ac46df466968bd5e0e33986f76b7f099bd75a66fbf2a07c1b1295
1
SHA256 (qjackctl-0.4.0.tar.gz) = 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a
2
SIZE (qjackctl-0.3.13.tar.gz) = 498208
2
SIZE (qjackctl-0.4.0.tar.gz) = 500534
(-)audio/qjackctl/files/patch-src-qjackctlSetup.cpp (-11 / +11 lines)
Lines 1-11 Link Here
1
--- src/qjackctlSetup.cpp.orig	2007-07-18 12:05:32.000000000 +0200
1
--- src/qjackctlSetup.cpp.orig	2015-07-15 13:30:36 UTC
2
+++ src/qjackctlSetup.cpp	2007-09-26 22:24:19.000000000 +0200
2
+++ src/qjackctlSetup.cpp
3
@@ -290,7 +290,7 @@
3
@@ -34,7 +34,7 @@
4
 	preset.iWordLength  = m_settings.value("/WordLength", 16).toInt();
4
 #if defined(WIN32)
5
 	preset.iWait        = m_settings.value("/Wait", 21333).toInt();
5
 #define DEFAULT_DRIVER "portaudio"
6
 	preset.iChan        = m_settings.value("/Chan", 0).toInt();
6
 #else
7
-	preset.sDriver      = m_settings.value("/Driver", "alsa").toString();
7
-#define DEFAULT_DRIVER "alsa"
8
+	preset.sDriver      = m_settings.value("/Driver", "oss").toString();
8
+#define DEFAULT_DRIVER "oss"
9
 	preset.sInterface   = m_settings.value("/Interface").toString();
9
 #endif
10
 	preset.iAudio       = m_settings.value("/Audio", 0).toInt();
10
 
11
 	preset.iDither      = m_settings.value("/Dither", 0).toInt();
11
 

Return to bug 199217