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

Collapse All | Expand All

(-)Makefile (-11 / +13 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacity
4
PORTNAME=	audacity
5
PORTVERSION=	2.0.6
5
PORTVERSION=	2.1.0
6
PORTREVISION=	2
6
PORTREVISION=	0
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	GOOGLE_CODE \
8
MASTER_SITES=	GOOGLE_CODE \
9
		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
9
		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
Lines 16-22 Link Here
16
16
17
LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
17
LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
18
18
19
WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
19
WRKSRC=		${WRKDIR}/${PORTNAME}-minsrc-${PORTVERSION}
20
20
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
USES=		desktop-file-utils gettext gmake pkgconfig shared-mime-info \
22
USES=		desktop-file-utils gettext gmake pkgconfig shared-mime-info \
Lines 28-38 Link Here
28
PORTDOCS=	README.txt
28
PORTDOCS=	README.txt
29
29
30
OPTIONS_DEFINE=	DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
30
OPTIONS_DEFINE=	DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
31
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS
31
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
32
OPTIONS_SINGLE=	SAMPLERATED
32
OPTIONS_SINGLE=	SAMPLERATED
33
OPTIONS_SINGLE_SAMPLERATED=	SAMPLERATE SOXR
33
OPTIONS_SINGLE_SAMPLERATED=	SAMPLERATE #SOXR
34
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
34
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
35
			PORTMIXER SBSMS SOUNDTOUCH SOXR TWOLAME VAMP VORBIS
35
			PORTMIXER SBSMS SOUNDTOUCH SAMPLERATE TWOLAME VAMP VORBIS VST
36
36
37
DEBUG_DESC=	Enable debug support
37
DEBUG_DESC=	Enable debug support
38
LAME_DESC=	Use lame for import and export support
38
LAME_DESC=	Use lame for import and export support
Lines 44-60 Link Here
44
PORTMIXER_DESC=	Compile with PortMixer support
44
PORTMIXER_DESC=	Compile with PortMixer support
45
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
45
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
46
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
46
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
47
SOXR_DESC=	Use libsoxr for sample rate conversion
47
#SOXR_DESC=	Use libsoxr for sample rate conversion
48
TAGLIB_DESC=	Use TagLib for metadata support
48
TAGLIB_DESC=	Use TagLib for metadata support
49
TWOLAME_DESC=	Use libtwolame for MP2 export support
49
TWOLAME_DESC=	Use libtwolame for MP2 export support
50
VAMP_DESC=	Vamp plug-in support
50
VAMP_DESC=	Vamp plug-in support
51
VST_DESC=	VST plug-in support
51
52
52
53
53
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
54
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
54
55
55
CONFIGURE_ARGS+=	--with-lib-preference="local system" \
56
CONFIGURE_ARGS+=	--with-lib-preference="local system" \
56
			--enable-portaudio --enable-unicode --without-lv2
57
			--enable-portaudio --enable-unicode
57
58
.if ${MACHINE_CPU:Msse}
58
.if ${MACHINE_CPU:Msse}
59
CONFIGURE_ARGS+=	--enable-sse
59
CONFIGURE_ARGS+=	--enable-sse
60
.else
60
.else
Lines 100-107 Link Here
100
SOUNDTOUCH_CONFIGURE_WITH=	soundtouch
100
SOUNDTOUCH_CONFIGURE_WITH=	soundtouch
101
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
101
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
102
102
103
SOXR_CONFIGURE_WITH=	libsoxr
103
#SOXR_CONFIGURE_WITH=	libsoxr
104
SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
104
#SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
105
105
106
TWOLAME_CONFIGURE_WITH=	libtwolame
106
TWOLAME_CONFIGURE_WITH=	libtwolame
107
TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
107
TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
Lines 111-116 Link Here
111
VORBIS_CONFIGURE_WITH=	libvorbis
111
VORBIS_CONFIGURE_WITH=	libvorbis
112
VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
112
VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
113
113
114
VST_CONFIGURE_ENABLE=	vst
115
114
.include <bsd.port.pre.mk>
116
.include <bsd.port.pre.mk>
115
117
116
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
118
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (audacity-minsrc-2.0.6.tar.xz) = 3080c190e678e0d682961a36c6e990c572dacd6b5ce499e5cec7362e9fa37d7b
1
SHA256 (audacity-minsrc-2.1.0.tar.xz) = b0d98d89b38be233e88af81e1add649732484b6f8feec95dc5977accdde042b3
2
SIZE (audacity-minsrc-2.0.6.tar.xz) = 7380460
2
SIZE (audacity-minsrc-2.1.0.tar.xz) = 5104924
(-)files/patch-lib-src__libvamp__Makefile.in (-10 lines)
Lines 1-10 Link Here
1
--- lib-src/libvamp/Makefile.in.orig	2014-09-22 20:38:14 UTC
2
+++ lib-src/libvamp/Makefile.in
3
@@ -39,6 +39,7 @@
4
 # Compile flags
5
 #
6
 CC		= @CC@
7
+CFLAGS		= -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
8
 CXX		= @CXX@
9
 CXXFLAGS	= -I. @CXXFLAGS@ @SNDFILE_CFLAGS@
10
 
(-)files/patch-src__Makefile.in (-1 / +1 lines)
Lines 1-6 Link Here
1
--- src/Makefile.in.orig	2014-09-22 20:38:13 UTC
1
--- src/Makefile.in.orig	2014-09-22 20:38:13 UTC
2
+++ src/Makefile.in
2
+++ src/Makefile.in
3
@@ -1131,8 +1131,7 @@
3
@@ -1055,8 +1055,7 @@
4
 #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
4
 #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
5
 #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
5
 #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
6
 #           ^
6
 #           ^
(-)files/patch-src_effects_VST_VSTEffect.cpp (+11 lines)
Line 0 Link Here
1
--- src/effects/VST/VSTEffect.cpp	2015-03-31 23:03:30.000000000 -0700
2
+++ src/effects/VST/VSTEffect.cpp	2015-03-01 17:06:58.000000000 -0800
3
@@ -2609,7 +2609,7 @@
4
    // symbols.
5
    //
6
    // Once we define a proper external API, the flags can be removed.
7
-   void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
8
+   void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL);
9
    if (!lib) 
10
    {
11
       return false;
(-)pkg-plist (-2 / +11 lines)
Lines 3-8 Link Here
3
share/appdata/audacity.appdata.xml
3
share/appdata/audacity.appdata.xml
4
share/applications/audacity.desktop
4
share/applications/audacity.desktop
5
%%DATADIR%%/EQDefaultCurves.xml
5
%%DATADIR%%/EQDefaultCurves.xml
6
%%DATADIR%%/include/audacity/ConfigInterface.h
7
%%DATADIR%%/include/audacity/EffectAutomationParameters.h
8
%%DATADIR%%/include/audacity/EffectInterface.h
9
%%DATADIR%%/include/audacity/IdentInterface.h
10
%%DATADIR%%/include/audacity/ImporterInterface.h
11
%%DATADIR%%/include/audacity/ModuleInterface.h
12
%%DATADIR%%/include/audacity/PluginInterface.h
13
%%DATADIR%%/include/audacity/Types.h
6
%%DATADIR%%/nyquist/bug.lsp
14
%%DATADIR%%/nyquist/bug.lsp
7
%%DATADIR%%/nyquist/dspprims.lsp
15
%%DATADIR%%/nyquist/dspprims.lsp
8
%%DATADIR%%/nyquist/envelopes.lsp
16
%%DATADIR%%/nyquist/envelopes.lsp
Lines 50-57 Link Here
50
%%DATADIR%%/plug-ins/beat.ny
58
%%DATADIR%%/plug-ins/beat.ny
51
%%DATADIR%%/plug-ins/clicktrack.ny
59
%%DATADIR%%/plug-ins/clicktrack.ny
52
%%DATADIR%%/plug-ins/clipfix.ny
60
%%DATADIR%%/plug-ins/clipfix.ny
53
%%DATADIR%%/plug-ins/crossfadein.ny
61
%%DATADIR%%/plug-ins/crossfadetracks.ny
54
%%DATADIR%%/plug-ins/crossfadeout.ny
55
%%DATADIR%%/plug-ins/delay.ny
62
%%DATADIR%%/plug-ins/delay.ny
56
%%DATADIR%%/plug-ins/equalabel.ny
63
%%DATADIR%%/plug-ins/equalabel.ny
57
%%DATADIR%%/plug-ins/highpass.ny
64
%%DATADIR%%/plug-ins/highpass.ny
Lines 64-69 Link Here
64
%%DATADIR%%/plug-ins/vocalremover.ny
71
%%DATADIR%%/plug-ins/vocalremover.ny
65
%%DATADIR%%/plug-ins/vocoder.ny
72
%%DATADIR%%/plug-ins/vocoder.ny
66
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
73
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
74
%%PORTDOCS%%%%DOCSDIR%%/README.txt
67
share/icons/hicolor/16x16/apps/audacity.png
75
share/icons/hicolor/16x16/apps/audacity.png
68
share/icons/hicolor/22x22/apps/audacity.png
76
share/icons/hicolor/22x22/apps/audacity.png
69
share/icons/hicolor/24x24/apps/audacity.png
77
share/icons/hicolor/24x24/apps/audacity.png
Lines 94-99 Link Here
94
share/locale/hi/LC_MESSAGES/audacity.mo
102
share/locale/hi/LC_MESSAGES/audacity.mo
95
share/locale/hr/LC_MESSAGES/audacity.mo
103
share/locale/hr/LC_MESSAGES/audacity.mo
96
share/locale/hu/LC_MESSAGES/audacity.mo
104
share/locale/hu/LC_MESSAGES/audacity.mo
105
share/locale/hy/LC_MESSAGES/audacity.mo
97
share/locale/id/LC_MESSAGES/audacity.mo
106
share/locale/id/LC_MESSAGES/audacity.mo
98
share/locale/it/LC_MESSAGES/audacity.mo
107
share/locale/it/LC_MESSAGES/audacity.mo
99
share/locale/ja/LC_MESSAGES/audacity.mo
108
share/locale/ja/LC_MESSAGES/audacity.mo

Return to bug 199080