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

Collapse All | Expand All

(-)Makefile (-28 / +14 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacity
4
PORTNAME=	audacity
5
PORTVERSION=	2.0.5
5
PORTVERSION=	2.0.6
6
PORTREVISION=	3
7
CATEGORIES=	audio
6
CATEGORIES=	audio
8
MASTER_SITES=	GOOGLE_CODE \
7
MASTER_SITES=	GOOGLE_CODE \
9
		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
8
		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
Lines 18-26 Link Here
18
17
19
WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
18
WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
20
19
21
USE_AUTOTOOLS=	aclocal autoconf
22
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
23
USES=		tar:xz desktop-file-utils gmake gettext pkgconfig shared-mime-info
21
USES=		desktop-file-utils gettext gmake pkgconfig shared-mime-info \
22
		tar:xz
24
USE_WX=		2.8
23
USE_WX=		2.8
25
WX_UNICODE=	yes
24
WX_UNICODE=	yes
26
WX_COMPS=	wx
25
WX_COMPS=	wx
Lines 30-36 Link Here
30
OPTIONS_DEFINE=	DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
29
OPTIONS_DEFINE=	DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
31
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS
30
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS
32
OPTIONS_RADIO=	SAMPLERATED
31
OPTIONS_RADIO=	SAMPLERATED
33
OPTIONS_RADIO_SAMPLERATED=	RESAMPLE SAMPLERATE SOXR
32
OPTIONS_RADIO_SAMPLERATED=	SAMPLERATE SOXR
34
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
33
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
35
			PORTMIXER SBSMS SOUNDTOUCH SOXR TWOLAME VAMP VORBIS
34
			PORTMIXER SBSMS SOUNDTOUCH SOXR TWOLAME VAMP VORBIS
36
35
Lines 39-45 Link Here
39
MAD_DESC=	Use libmad for mp2/3 decoding support
38
MAD_DESC=	Use libmad for mp2/3 decoding support
40
MIDI_DESC=	Use portSMF for Midi support
39
MIDI_DESC=	Use portSMF for Midi support
41
NYQUIST_DESC=	Nyquist plug-in support
40
NYQUIST_DESC=	Nyquist plug-in support
42
RESAMPLE_DESC=	Use libresample for sample rate conversion
43
SAMPLERATE_DESC=	Use libsamplerate for sample rate conversion
41
SAMPLERATE_DESC=	Use libsamplerate for sample rate conversion
44
SAMPLERATED_DESC=	Default sample rate conversion support
42
SAMPLERATED_DESC=	Default sample rate conversion support
45
PORTMIXER_DESC=	Compile with PortMixer support
43
PORTMIXER_DESC=	Compile with PortMixer support
Lines 50-64 Link Here
50
TWOLAME_DESC=	Use libtwolame for MP2 export support
48
TWOLAME_DESC=	Use libtwolame for MP2 export support
51
VAMP_DESC=	Vamp plug-in support
49
VAMP_DESC=	Vamp plug-in support
52
50
53
ACLOCAL_ARGS+=	-I ${WRKSRC}/m4
54
AUTOCONF_ARGS+=	-I ${WRKSRC}/m4
55
51
56
CONFIGURE_ARG+=	--destdir=/
57
58
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
52
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
59
53
60
CONFIGURE_ARGS+=	--with-lib-preference="local system" \
54
CONFIGURE_ARGS+=	--with-lib-preference="local system" \
61
			--with-portaudio --enable-unicode
55
			--enable-portaudio --enable-unicode --without-lv2
62
56
63
.if ${MACHINE_CPU:Msse}
57
.if ${MACHINE_CPU:Msse}
64
CONFIGURE_ARGS+=	--enable-sse
58
CONFIGURE_ARGS+=	--enable-sse
Lines 69-79 Link Here
69
DEBUG_CONFIGURE_WITH=	debug
63
DEBUG_CONFIGURE_WITH=	debug
70
64
71
FFMPEG_CONFIGURE_WITH=	ffmpeg
65
FFMPEG_CONFIGURE_WITH=	ffmpeg
72
FFMPEG_RUN_DEPENDS=	ffmpeg0:${PORTSDIR}/multimedia/ffmpeg0
66
FFMPEG_RUN_DEPENDS=     ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
73
FFMPEG_BUILD_DEPENDS=	ffmpeg0>=0:${PORTSDIR}/multimedia/ffmpeg0
67
FFMPEG_CFLAGS=		-I${LOCALBASE}/include/ffmpeg
74
FFMPEG_CFLAGS=		-I${LOCALBASE}/include/ffmpeg0
68
FFMPEG_CPPFLAGS=	-I${LOCALBASE}/include/ffmpeg
75
FFMPEG_CPPFLAGS=	-I${LOCALBASE}/include/ffmpeg0
69
FFMPEG_CXXFLAGS=	-I${LOCALBASE}/include/ffmpeg
76
FFMPEG_CXXFLAGS=	-I${LOCALBASE}/include/ffmpeg0
77
70
78
FLAC_CONFIGURE_WITH=	libflac
71
FLAC_CONFIGURE_WITH=	libflac
79
FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
72
FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
Lines 98-105 Link Here
98
91
99
PORTMIXER_CONFIGURE_WITH=	portmixer
92
PORTMIXER_CONFIGURE_WITH=	portmixer
100
93
101
RESAMPLE_CONFIGURE_WITH=	libresample
102
103
SAMPLERATE_CONFIGURE_WITH=	libsamplerate
94
SAMPLERATE_CONFIGURE_WITH=	libsamplerate
104
SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
95
SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
105
96
Lines 122-140 Link Here
122
.include <bsd.port.pre.mk>
113
.include <bsd.port.pre.mk>
123
114
124
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
115
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
125
CPPFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
116
CPPFLAGS+=	-I${WRKSRC}/lib-src/portsmf ${PTHREAD_CFLAGS}
126
CXXFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
117
CXXFLAGS+=	-I${WRKSRC}/lib-src/portsmf ${PTHREAD_CFLAGS}
127
CFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
118
CFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${WRKSRC}/lib-src/lame -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
128
119
129
post-patch:
120
post-patch:
130
#audacity links to some dependencies if present, even if explicitly disabled.
121
.if ! ${PORT_OPTIONS:MPORTMIXER}
131
#these must be patched out for the case when they are installed but
122
	@${REINPLACE_CMD} -e 's/ portmixer / /' ${WRKSRC}/lib-src/Makefile.in
132
#option-disabled to avoid unrecorded dependencies.
133
134
.if empty(PORT_OPTIONS:MSAMPLERATE)
135
	@${REINPLACE_CMD} -e 's|libresample.a -lsamplerate $(LIBS)|libresample.a $(LIBS)|' ${WRKSRC}/lib-src/libresample/Makefile.in
136
.endif
123
.endif
137
138
	@${REINPLACE_CMD} -e 's|inline void|static inline void|' ${WRKSRC}/lib-src/libnyquist/nyquist/ffts/src/fftlib.c
124
	@${REINPLACE_CMD} -e 's|inline void|static inline void|' ${WRKSRC}/lib-src/libnyquist/nyquist/ffts/src/fftlib.c
139
125
140
post-install:
126
post-install:
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (audacity-minsrc-2.0.5.tar.xz) = e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79
1
SHA256 (audacity-minsrc-2.0.6.tar.xz) = 3080c190e678e0d682961a36c6e990c572dacd6b5ce499e5cec7362e9fa37d7b
2
SIZE (audacity-minsrc-2.0.5.tar.xz) = 5314060
2
SIZE (audacity-minsrc-2.0.6.tar.xz) = 7380460
(-)files/patch-Makefile.in (-14 lines)
Lines 1-14 Link Here
1
--- ./Makefile.in.orig	2013-01-18 19:50:47.000000000 +0400
2
+++ ./Makefile.in	2013-01-27 22:38:11.000000000 +0400
3
@@ -31,11 +31,6 @@
4
 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
5
 	$(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)
6
 
7
-	# install docs
8
-	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/
9
-	$(INSTALL) -m 644 README.txt $(DESTDIR)$(DOCDIR)/README.txt
10
-	$(INSTALL) -m 644 LICENSE.txt $(DESTDIR)$(DOCDIR)/LICENSE.txt
11
-
12
 	# install manpage
13
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
14
 	-test -f help/audacity.1.gz && \
(-)files/patch-lib-src__libvamp__Makefile.in (+10 lines)
Line 0 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-portaudio.h (+48 lines)
Line 0 Link Here
1
diff -ur lib-src/portmixer/include/portmixer.h lib-src/portmixer/include/portmixer.h
2
--- lib-src/portmixer/include/portmixer.h	2014-09-22 13:38:13.000000000 -0700
3
+++ lib-src/portmixer/include/portmixer.h	2014-10-01 19:49:06.000000000 -0700
4
@@ -45,7 +45,7 @@
5
  *
6
  */
7
 
8
-#include "portaudio.h"
9
+#include "../../portaudio-v19/include/portaudio.h"
10
 
11
 typedef void PxMixer;
12
 
13
diff -ur src/AudioIO.h src/AudioIO.h
14
--- src/AudioIO.h	2014-09-22 13:38:13.000000000 -0700
15
+++ src/AudioIO.h	2014-10-01 19:48:46.000000000 -0700
16
@@ -13,7 +13,7 @@
17
 #ifndef __AUDACITY_AUDIO_IO__
18
 #define __AUDACITY_AUDIO_IO__
19
 
20
-#include "portaudio.h"
21
+#include "../lib-src/portaudio-v19/include/portaudio.h"
22
 #include "Audacity.h"
23
 #include "Experimental.h"
24
 
25
diff -ur src/DeviceManager.cpp src/DeviceManager.cpp
26
--- src/DeviceManager.cpp	2014-09-22 13:38:13.000000000 -0700
27
+++ src/DeviceManager.cpp	2014-10-01 19:48:52.000000000 -0700
28
@@ -6,7 +6,7 @@
29
 
30
 ******************************************************************/
31
 
32
-#include "portaudio.h"
33
+#include "../lib-src/portaudio-v19/include/portaudio.h"
34
 #ifdef __WXMSW__
35
 #include "pa_win_wasapi.h"
36
 #endif
37
diff -ur src/prefs/DevicePrefs.cpp src/prefs/DevicePrefs.cpp
38
--- src/prefs/DevicePrefs.cpp	2014-09-22 13:38:13.000000000 -0700
39
+++ src/prefs/DevicePrefs.cpp	2014-10-01 19:48:39.000000000 -0700
40
@@ -30,7 +30,7 @@
41
 #include <wx/intl.h>
42
 #include <wx/log.h>
43
 
44
-#include "portaudio.h"
45
+#include "../../lib-src/portaudio-v19/include/portaudio.h"
46
 
47
 #include "../AudioIO.h"
48
 #include "../Internat.h"
(-)files/patch-src__Makefile.in (+12 lines)
Line 0 Link Here
1
--- src/Makefile.in.orig	2014-09-22 20:38:13 UTC
2
+++ src/Makefile.in
3
@@ -1131,8 +1131,7 @@
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") );
6
 #           ^
7
-audacity_CXXFLAGS = \
8
-   -Wno-unused-local-typedefs
9
+audacity_CXXFLAGS =
10
 
11
 audacity_LDFLAGS = -rdynamic
12
 audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \
(-)pkg-plist (+3 lines)
Lines 1-5 Link Here
1
bin/audacity
1
bin/audacity
2
man/man1/audacity.1.gz
2
man/man1/audacity.1.gz
3
share/appdata/audacity.appdata.xml
3
share/applications/audacity.desktop
4
share/applications/audacity.desktop
4
%%DATADIR%%/EQDefaultCurves.xml
5
%%DATADIR%%/EQDefaultCurves.xml
5
%%DATADIR%%/nyquist/bug.lsp
6
%%DATADIR%%/nyquist/bug.lsp
Lines 62-67 Link Here
62
%%DATADIR%%/plug-ins/tremolo.ny
63
%%DATADIR%%/plug-ins/tremolo.ny
63
%%DATADIR%%/plug-ins/vocalremover.ny
64
%%DATADIR%%/plug-ins/vocalremover.ny
64
%%DATADIR%%/plug-ins/vocoder.ny
65
%%DATADIR%%/plug-ins/vocoder.ny
66
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
65
share/icons/hicolor/16x16/apps/audacity.png
67
share/icons/hicolor/16x16/apps/audacity.png
66
share/icons/hicolor/22x22/apps/audacity.png
68
share/icons/hicolor/22x22/apps/audacity.png
67
share/icons/hicolor/24x24/apps/audacity.png
69
share/icons/hicolor/24x24/apps/audacity.png
Lines 114-119 Link Here
114
share/locale/sr_RS/LC_MESSAGES/audacity.mo
116
share/locale/sr_RS/LC_MESSAGES/audacity.mo
115
share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
117
share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
116
share/locale/sv/LC_MESSAGES/audacity.mo
118
share/locale/sv/LC_MESSAGES/audacity.mo
119
share/locale/ta/LC_MESSAGES/audacity.mo
117
share/locale/tg/LC_MESSAGES/audacity.mo
120
share/locale/tg/LC_MESSAGES/audacity.mo
118
share/locale/tr/LC_MESSAGES/audacity.mo
121
share/locale/tr/LC_MESSAGES/audacity.mo
119
share/locale/uk/LC_MESSAGES/audacity.mo
122
share/locale/uk/LC_MESSAGES/audacity.mo

Return to bug 194083