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

Collapse All | Expand All

(-)audacity-new/Makefile (-22 / +20 lines)
Lines 2-12 Link Here
2
# $FreeBSD: head/audio/audacity/Makefile 397077 2015-09-16 19:51:26Z bapt $
2
# $FreeBSD: head/audio/audacity/Makefile 397077 2015-09-16 19:51:26Z bapt $
3
3
4
PORTNAME=	audacity
4
PORTNAME=	audacity
5
PORTVERSION=	2.1.0
5
PORTVERSION=	2.1.1
6
PORTREVISION=	5
6
PORTREVISION=	0
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
8
MASTER_SITES=	https://github.com/audacity/audacity/archive/
9
DISTNAME=	${PORTNAME}-minsrc-${PORTVERSION}
9
DISTNAME=	Audacity-${PORTVERSION}
10
10
11
MAINTAINER=	xxjack12xx@gmail.com
11
MAINTAINER=	xxjack12xx@gmail.com
12
COMMENT=	GUI editor for digital audio waveforms
12
COMMENT=	GUI editor for digital audio waveforms
Lines 16-38 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}-minsrc-${PORTVERSION}
19
BUILD_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
20
		bash:${PORTSDIR}/shells/bash \
21
		autogen:${PORTSDIR}/devel/autogen
22
23
WRKSRC=		${WRKDIR}/${PORTNAME}-Audacity-${PORTVERSION}
20
24
21
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
22
USES=		cpe desktop-file-utils gettext gmake pkgconfig shared-mime-info \
26
USES=		cpe desktop-file-utils gettext gmake pkgconfig shared-mime-info shebangfix zip:infozip
23
		tar:xz
24
USE_WX=		2.8+
27
USE_WX=		2.8+
25
WX_UNICODE=	yes
28
WX_UNICODE=	yes
26
WX_COMPS=	wx
29
WX_COMPS=	wx
27
INSTALLS_ICONS=	yes
30
INSTALLS_ICONS=	yes
28
PORTDOCS=	README.txt
31
PORTDOCS=	README.txt
29
32
30
OPTIONS_DEFINE=	DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
33
OPTIONS_DEFINE=	DEBUG DOCS FLAC ID3TAG LADSPA LAME MAD MIDI NYQUIST \
31
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
34
		PORTMIXER SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
32
OPTIONS_SINGLE=	SAMPLERATED
35
OPTIONS_SINGLE=	SAMPLERATED
33
OPTIONS_SINGLE_SAMPLERATED=	SAMPLERATE #SOXR
36
OPTIONS_SINGLE_SAMPLERATED=	SAMPLERATE SOXR
34
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
37
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI NYQUIST \
35
			PORTMIXER SBSMS SOUNDTOUCH SAMPLERATE TWOLAME VAMP VORBIS VST
38
			PORTMIXER SBSMS SOUNDTOUCH SOXR TWOLAME VAMP VORBIS VST
36
OPTIONS_DEFINE_amd64=	SSE
39
OPTIONS_DEFINE_amd64=	SSE
37
OPTIONS_DEFINE_i386=	SSE
40
OPTIONS_DEFINE_i386=	SSE
38
OPTIONS_DEFAULT_amd64=	SSE
41
OPTIONS_DEFAULT_amd64=	SSE
Lines 48-54 Link Here
48
PORTMIXER_DESC=	Compile with PortMixer support
51
PORTMIXER_DESC=	Compile with PortMixer support
49
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
52
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
50
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
53
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
51
#SOXR_DESC=	Use libsoxr for sample rate conversion
54
SOXR_DESC=	Use libsoxr for sample rate conversion
52
TAGLIB_DESC=	Use TagLib for metadata support
55
TAGLIB_DESC=	Use TagLib for metadata support
53
TWOLAME_DESC=	Use libtwolame for MP2 export support
56
TWOLAME_DESC=	Use libtwolame for MP2 export support
54
VAMP_DESC=	Vamp plug-in support
57
VAMP_DESC=	Vamp plug-in support
Lines 56-72 Link Here
56
59
57
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
60
CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
58
61
59
CONFIGURE_ARGS+=	--with-lib-preference="local system" \
62
CONFIGURE_ARGS+=	--with-lib-preference="local system" --without-lv2 --without-ffmpeg \
60
			--enable-portaudio --enable-unicode
63
			--enable-portaudio --enable-unicode
61
64
62
DEBUG_CONFIGURE_WITH=	debug
65
CONFIGURE_SHELL?=${LOCALBASE}/bin/bash
63
66
64
FFMPEG_CONFIGURE_WITH=	ffmpeg
67
DEBUG_CONFIGURE_WITH=	debug
65
FFMPEG_RUN_DEPENDS=	${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/multimedia/ffmpeg
66
FFMPEG_LIB_DEPENDS=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
67
FFMPEG_CFLAGS=		-I${LOCALBASE}/include/ffmpeg
68
FFMPEG_CPPFLAGS=	-I${LOCALBASE}/include/ffmpeg
69
FFMPEG_CXXFLAGS=	-I${LOCALBASE}/include/ffmpeg
70
68
71
FLAC_CONFIGURE_WITH=	libflac
69
FLAC_CONFIGURE_WITH=	libflac
72
FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
70
FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
Lines 99-106 Link Here
99
SOUNDTOUCH_CONFIGURE_WITH=	soundtouch
97
SOUNDTOUCH_CONFIGURE_WITH=	soundtouch
100
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
98
SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
101
99
102
#SOXR_CONFIGURE_WITH=	libsoxr
100
SOXR_CONFIGURE_WITH=	libsoxr
103
#SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
101
SOXR_BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
104
102
105
SSE_CONFIGURE_ENABLE=	sse
103
SSE_CONFIGURE_ENABLE=	sse
106
104
(-)audacity-new/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (audacity-minsrc-2.1.0.tar.xz) = b0d98d89b38be233e88af81e1add649732484b6f8feec95dc5977accdde042b3
1
SHA256 (Audacity-2.1.1.zip) = 1ec4c3b92e3653a83b30b37f67d1778050eb87bd651266865a1e30fe1f402892
2
SIZE (audacity-minsrc-2.1.0.tar.xz) = 5104924
2
SIZE (Audacity-2.1.1.zip) = 28838970
(-)audacity-new/files/patch-lib-src__libmad__configure (+20 lines)
Line 0 Link Here
1
--- ./lib-src/libmad/configure.orig       2015-10-06 02:16:15.066866000 -0700
2
+++ ./lib-src/libmad/configure    2015-10-06 02:18:15.918107000 -0700
3
@@ -11983,17 +11983,12 @@
4
 	    : #x optimize="$optimize -fforce-addr"
5
 	    : #x optimize="$optimize -finline-functions"
6
 	    : #- optimize="$optimize -fstrength-reduce"
7
-	    optimize="$optimize -fthread-jumps"
8
-	    optimize="$optimize -fcse-follow-jumps"
9
-	    optimize="$optimize -fcse-skip-blocks"
10
 	    : #x optimize="$optimize -frerun-cse-after-loop"
11
 	    : #x optimize="$optimize -frerun-loop-opt"
12
 	    : #x optimize="$optimize -fgcse"
13
 	    optimize="$optimize -fexpensive-optimizations"
14
-	    optimize="$optimize -fregmove"
15
 	    : #* optimize="$optimize -fdelayed-branch"
16
 	    : #x optimize="$optimize -fschedule-insns"
17
-	    optimize="$optimize -fschedule-insns2"
18
 	    : #? optimize="$optimize -ffunction-sections"
19
 	    : #? optimize="$optimize -fcaller-saves"
20
 	    : #> optimize="$optimize -funroll-loops"
(-)audacity-new/files/patch-lib-src__libsoxr__configure (+9 lines)
Line 0 Link Here
1
--- ./lib-src/libsoxr/configure.orig	2011-05-04 17:18:48.000000000 +0200
2
+++ ./lib-src/libsoxr/configure	2011-05-04 17:19:13.000000000 +0200
3
@@ -12,6 +12,5 @@
4
 
5
 srcdir="$@"
6
 srcdir="${srcdir#*--srcdir=}"
7
-srcdir="./${srcdir/ */}"
8
 
9
 cmake -DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF "${srcdir}"
(-)audacity-new/files/patch-lib-src__lv2__Makefile (+10 lines)
Line 0 Link Here
1
--- ./lib-src/lv2/Makefile.orig	2015-10-06 01:01:13.907852000 -0700
2
+++ ./lib-src/lv2/Makefile	2015-10-06 01:01:25.214853000 -0700
3
@@ -1,7 +1,6 @@
4
 include srcdir.mk
5
 
6
 all:
7
-	./build --srcdir=$(srcdir)
8
 
9
 check:
10
 
(-)audacity-new/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.am (+11 lines)
Line 0 Link Here
1
--- ./lib-src/soundtouch/source/SoundTouch/Makefile.am.orig	2015-10-06 02:52:33.727584000 -0700
2
+++ ./lib-src/soundtouch/source/SoundTouch/Makefile.am	2015-10-06 02:52:46.928526000 -0700
3
@@ -32,7 +32,7 @@
4
 
5
 
6
 # Compiler flags
7
-AM_CXXFLAGS=-O3 -fcheck-new -I../../include
8
+AM_CXXFLAGS=-O3 -I../../include
9
 
10
 # Compile the files that need MMX and SSE individually.
11
 libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la
(-)audacity-new/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in (+11 lines)
Line 0 Link Here
1
--- ./lib-src/soundtouch/source/SoundTouch/Makefile.in.orig	2015-07-11 03:02:22.000000000 -0700
2
+++ ./lib-src/soundtouch/source/SoundTouch/Makefile.in	2015-10-06 02:32:04.051849000 -0700
3
@@ -346,7 +346,7 @@
4
 libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86.cpp BPMDetect.cpp PeakFinder.cpp
5
 
6
 # Compiler flags
7
-AM_CXXFLAGS = -O3 -fcheck-new -I../../include
8
+AM_CXXFLAGS = -O3 -I../../include
9
 
10
 # Compile the files that need MMX and SSE individually.
11
 libSoundTouch_la_LIBADD = libSoundTouchMMX.la libSoundTouchSSE.la
(-)audacity-new/files/patch-src_FFmpeg.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/FFmpeg.h.orig	2015-03-02 01:06:57 UTC
1
--- src/FFmpeg.h.orig	2015-03-02 01:06:57 UTC
2
+++ src/FFmpeg.h
2
+++ src/FFmpeg.h
3
@@ -688,7 +688,7 @@ extern "C" {
3
@@ -689,7 +689,7 @@ extern "C" {
4
    FFMPEG_FUNCTION_WITH_RETURN(
4
    FFMPEG_FUNCTION_WITH_RETURN(
5
       AVOutputFormat*,
5
       AVOutputFormat*,
6
       av_oformat_next,
6
       av_oformat_next,
Lines 9-15 Link Here
9
       (f)
9
       (f)
10
    );
10
    );
11
    FFMPEG_FUNCTION_WITH_RETURN(
11
    FFMPEG_FUNCTION_WITH_RETURN(
12
@@ -755,7 +755,7 @@ extern "C" {
12
@@ -756,7 +756,7 @@ extern "C" {
13
    FFMPEG_FUNCTION_WITH_RETURN(
13
    FFMPEG_FUNCTION_WITH_RETURN(
14
       int,
14
       int,
15
       av_fifo_size,
15
       av_fifo_size,
Lines 18-24 Link Here
18
       (f)
18
       (f)
19
    );
19
    );
20
    FFMPEG_FUNCTION_WITH_RETURN(
20
    FFMPEG_FUNCTION_WITH_RETURN(
21
@@ -801,7 +801,7 @@ extern "C" {
21
@@ -802,7 +802,7 @@ extern "C" {
22
    FFMPEG_FUNCTION_WITH_RETURN(
22
    FFMPEG_FUNCTION_WITH_RETURN(
23
       AVDictionaryEntry *,
23
       AVDictionaryEntry *,
24
       av_dict_get,
24
       av_dict_get,
(-)audacity-new/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
@@ -1055,8 +1055,7 @@
3
@@ -1118,8 +1118,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
 #           ^
(-)audacity-new/files/patch-src_effects_VST_VSTEffect.cpp (-1 / +1 lines)
Lines 1-6 Link Here
1
--- src/effects/VST/VSTEffect.cpp	2015-03-31 23:03:30.000000000 -0700
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
2
+++ src/effects/VST/VSTEffect.cpp	2015-03-01 17:06:58.000000000 -0800
3
@@ -2609,7 +2609,7 @@
3
@@ -2576,7 +2576,7 @@
4
    // symbols.
4
    // symbols.
5
    //
5
    //
6
    // Once we define a proper external API, the flags can be removed.
6
    // Once we define a proper external API, the flags can be removed.
(-)audacity-new/files/patch-xlisp.h (-1 / +1 lines)
Lines 1-6 Link Here
1
--- lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-15 20:27:36.000000000 -0700
1
--- lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-15 20:27:36.000000000 -0700
2
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-19 00:24:11.000000000 -0700
2
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-19 00:24:11.000000000 -0700
3
@@ -152,6 +152,15 @@
3
@@ -153,6 +153,15 @@
4
 #endif
4
 #endif
5
 #endif
5
 #endif
6
6
(-)audacity-new/pkg-plist (-2 / +11 lines)
Lines 11-17 Link Here
11
%%DATADIR%%/include/audacity/ModuleInterface.h
11
%%DATADIR%%/include/audacity/ModuleInterface.h
12
%%DATADIR%%/include/audacity/PluginInterface.h
12
%%DATADIR%%/include/audacity/PluginInterface.h
13
%%DATADIR%%/include/audacity/Types.h
13
%%DATADIR%%/include/audacity/Types.h
14
%%DATADIR%%/nyquist/bug.lsp
15
%%DATADIR%%/nyquist/dspprims.lsp
14
%%DATADIR%%/nyquist/dspprims.lsp
16
%%DATADIR%%/nyquist/envelopes.lsp
15
%%DATADIR%%/nyquist/envelopes.lsp
17
%%DATADIR%%/nyquist/equalizer.lsp
16
%%DATADIR%%/nyquist/equalizer.lsp
Lines 49-76 Link Here
49
%%DATADIR%%/nyquist/sndfnint.lsp
48
%%DATADIR%%/nyquist/sndfnint.lsp
50
%%DATADIR%%/nyquist/stk.lsp
49
%%DATADIR%%/nyquist/stk.lsp
51
%%DATADIR%%/nyquist/system.lsp
50
%%DATADIR%%/nyquist/system.lsp
51
%%DATADIR%%/nyquist/test.lsp
52
%%DATADIR%%/nyquist/upic.sal
53
%%DATADIR%%/nyquist/velocity.lsp
52
%%DATADIR%%/nyquist/xlinit.lsp
54
%%DATADIR%%/nyquist/xlinit.lsp
53
%%DATADIR%%/nyquist/xm.lsp
55
%%DATADIR%%/nyquist/xm.lsp
54
%%DATADIR%%/plug-ins/SilenceMarker.ny
56
%%DATADIR%%/plug-ins/SilenceMarker.ny
55
%%DATADIR%%/plug-ins/SoundFinder.ny
57
%%DATADIR%%/plug-ins/SoundFinder.ny
58
%%DATADIR%%/plug-ins/SpectralEditMulti.ny
59
%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
60
%%DATADIR%%/plug-ins/SpectralEditShelves.ny
56
%%DATADIR%%/plug-ins/StudioFadeOut.ny
61
%%DATADIR%%/plug-ins/StudioFadeOut.ny
57
%%DATADIR%%/plug-ins/adjustable-fade.ny
62
%%DATADIR%%/plug-ins/adjustable-fade.ny
58
%%DATADIR%%/plug-ins/beat.ny
63
%%DATADIR%%/plug-ins/beat.ny
59
%%DATADIR%%/plug-ins/clicktrack.ny
64
%%DATADIR%%/plug-ins/clicktrack.ny
60
%%DATADIR%%/plug-ins/clipfix.ny
65
%%DATADIR%%/plug-ins/clipfix.ny
66
%%DATADIR%%/plug-ins/crossfadeclips.ny
61
%%DATADIR%%/plug-ins/crossfadetracks.ny
67
%%DATADIR%%/plug-ins/crossfadetracks.ny
62
%%DATADIR%%/plug-ins/delay.ny
68
%%DATADIR%%/plug-ins/delay.ny
63
%%DATADIR%%/plug-ins/equalabel.ny
69
%%DATADIR%%/plug-ins/equalabel.ny
64
%%DATADIR%%/plug-ins/highpass.ny
70
%%DATADIR%%/plug-ins/highpass.ny
71
%%DATADIR%%/plug-ins/limiter.ny
65
%%DATADIR%%/plug-ins/lowpass.ny
72
%%DATADIR%%/plug-ins/lowpass.ny
66
%%DATADIR%%/plug-ins/notch.ny
73
%%DATADIR%%/plug-ins/notch.ny
67
%%DATADIR%%/plug-ins/pluck.ny
74
%%DATADIR%%/plug-ins/pluck.ny
68
%%DATADIR%%/plug-ins/rissetdrum.ny
75
%%DATADIR%%/plug-ins/rissetdrum.ny
69
%%DATADIR%%/plug-ins/sample-data-export.ny
76
%%DATADIR%%/plug-ins/sample-data-export.ny
70
%%DATADIR%%/plug-ins/tremolo.ny
77
%%DATADIR%%/plug-ins/tremolo.ny
78
%%DATADIR%%/plug-ins/vocalrediso.ny
71
%%DATADIR%%/plug-ins/vocalremover.ny
79
%%DATADIR%%/plug-ins/vocalremover.ny
72
%%DATADIR%%/plug-ins/vocoder.ny
80
%%DATADIR%%/plug-ins/vocoder.ny
73
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
81
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
82
%%PORTDOCS%%%%DOCSDIR%%/README.txt
74
share/icons/hicolor/16x16/apps/audacity.png
83
share/icons/hicolor/16x16/apps/audacity.png
75
share/icons/hicolor/22x22/apps/audacity.png
84
share/icons/hicolor/22x22/apps/audacity.png
76
share/icons/hicolor/24x24/apps/audacity.png
85
share/icons/hicolor/24x24/apps/audacity.png
Lines 84-90 Link Here
84
share/locale/bn/LC_MESSAGES/audacity.mo
93
share/locale/bn/LC_MESSAGES/audacity.mo
85
share/locale/bs/LC_MESSAGES/audacity.mo
94
share/locale/bs/LC_MESSAGES/audacity.mo
86
share/locale/ca/LC_MESSAGES/audacity.mo
95
share/locale/ca/LC_MESSAGES/audacity.mo
87
share/locale/ca@valencia/LC_MESSAGES/audacity.mo
96
share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
88
share/locale/cs/LC_MESSAGES/audacity.mo
97
share/locale/cs/LC_MESSAGES/audacity.mo
89
share/locale/cy/LC_MESSAGES/audacity.mo
98
share/locale/cy/LC_MESSAGES/audacity.mo
90
share/locale/da/LC_MESSAGES/audacity.mo
99
share/locale/da/LC_MESSAGES/audacity.mo

Return to bug 203607