Attachment #216002 for bug #247604




# $FreeBSD$

PORTNAME=	audacity
PORTVERSION=	2.4.2
DISTVERSIONPREFIX=	Audacity-
CATEGORIES=	audio


		-Daudacity_use_portaudio:STRING=system

OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
			MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
			VORBIS VST
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI OGG SBSMS \
			SOUNDTOUCH TWOLAME VAMP VORBIS VST

LAME_DESC=		Use lame for import and export support

LV2_DESC=		Add LV2 plug-in support
MAD_DESC=		Use libmad for mp2/3 decoding support
MIDI_DESC=		MIDI support
NYQUIST_DESC=		Nyquist synthesis and composition support
SBSMS_DESC=		Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
TWOLAME_DESC=		Use libtwolame for MP2 export support

# TODO: fix NLS support properly
PLIST_SUB+=		NLS=""

NYQUIST_CMAKE_ON=	-Daudacity_use_nyquist:STRING=local
NYQUIST_CMAKE_OFF=	-Daudacity_use_nyquist:STRING=off

OGG_CMAKE_ON=		-Daudacity_use_ogg:STRING=system
OGG_CMAKE_OFF=		-Daudacity_use_ogg:STRING=local
OGG_LIB_DEPENDS=	libogg.so:audio/libogg

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1589881433	1	TIMESTAMP = 1593304211
2	SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f	2	SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099
3	SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461	3	SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430

Lines 1-7 Link Here

(-)files/patch-cmake-proxies_CMakeLists.txt (-3 / +3 lines)
1	--- cmake-proxies/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC	1	--- cmake-proxies/CMakeLists.txt.orig 2020-06-19 15:16:47 UTC
2	+++ cmake-proxies/CMakeLists.txt	2	+++ cmake-proxies/CMakeLists.txt
3	@@ -150,7 +150,7 @@ addlib( lame lame LAME YES	3	@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES
4	addlib( lib-widget-extra libextra EXTRA YES YES "" )	4	addlib( lame lame LAME YES YES "lame >= 3.100" )
5	addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )	5	addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
6	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )	6	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
7	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )	7	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )

Lines 1-10 Link Here

(-)files/patch-cmake-proxies_sbsms_CMakeLists.txt (-10 lines)
1	--- cmake-proxies/sbsms/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC
2	+++ cmake-proxies/sbsms/CMakeLists.txt
3	@@ -28,6 +28,7 @@ list( APPEND INCLUDES
4	list( APPEND OPTIONS
5	PRIVATE
6	$<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
7	+ ${SSE_FLAG}
8	)
9
10	find_package( Threads )

Lines 1-6 Link Here

(-)files/patch-lib-src_libnyquist_nyquist_cmt_cext.h (-1 / +1 lines)
1	--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2018-10-01 14:07:33 UTC	1	--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2018-10-01 14:07:33 UTC
2	+++ lib-src/libnyquist/nyquist/cmt/cext.h	2	+++ lib-src/libnyquist/nyquist/cmt/cext.h
3	@@ -58,7 +58,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca	3	@@ -61,7 +61,7 @@ EXIT(n) -- calls exit(n) after shutting down/dealloca
4	#include <malloc.h>	4	#include <malloc.h>
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (-1 / +1 lines)
1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC	1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2016-07-26 13:34:06 UTC
2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h	2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
3	@@ -160,6 +160,15 @@ extern long ptrtoabs();	3	@@ -161,6 +161,15 @@ extern long ptrtoabs();
4	#endif	4	#endif
5	#endif	5	#endif
6		6

Line 0 Link Here

(-)files/patch-src_AboutDialog.cpp (+11 lines)
	1	--- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC
	2	+++ src/AboutDialog.cpp
	3	@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
	4	// RevisionIdent.h may contain #defines like these ones:
	5	//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
	6	//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
	7	-#include <RevisionIdent.h>
	8	+//#include <RevisionIdent.h>
	9
	10	#ifndef REV_TIME
	11	#define REV_TIME "unknown date and time"

Lines 1-6 Link Here

(-)files/patch-src_AudioIO.cpp (-3 / +3 lines)
1	--- src/AudioIO.cpp.orig 2018-10-01 14:07:33 UTC	1	--- src/AudioIO.cpp.orig 2020-06-19 15:16:47 UTC
2	+++ src/AudioIO.cpp	2	+++ src/AudioIO.cpp
3	@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback	3	@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla
4	#define ROUND(x) (int) ((x)+0.5)	4	#define ROUND(x) (int) ((x)+0.5)
5	//#include <string.h>	5	//#include <string.h>
6	// #include "../lib-src/portmidi/pm_common/portmidi.h"	6	// #include "../lib-src/portmidi/pm_common/portmidi.h"
Lines 8-14 Link Here
8	#include "NoteTrack.h"	8	#include "NoteTrack.h"
9	#endif	9	#endif
10		10
11	@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)	11	@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private)
12	// return the system time as a double	12	// return the system time as a double
13	static double streamStartTime = 0; // bias system time to small number	13	static double streamStartTime = 0; // bias system time to small number
14		14




--- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
+++ src/FFmpeg.h
@@ -685,7 +685,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVOutputFormat*,
       av_oformat_next,

       (f)
    );
 #endif
@@ -766,7 +766,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       int,
       av_fifo_size,

       (f)
    );
 #endif
@@ -828,7 +828,7 @@ extern "C" {
    FFMPEG_FUNCTION_WITH_RETURN(
       AVDictionaryEntry *,
       av_dict_get,

Lines 3-8 Link Here

(-)pkg-plist (+1 lines)
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%%/modules/mod-script-pipe.so
6	%%DATADIR%%/nyquist/aud-do-support.lsp	7	%%DATADIR%%/nyquist/aud-do-support.lsp
7	%%DATADIR%%/nyquist/dspprims.lsp	8	%%DATADIR%%/nyquist/dspprims.lsp
8	%%DATADIR%%/nyquist/envelopes.lsp	9	%%DATADIR%%/nyquist/envelopes.lsp

Return to bug 247604

Lines 2-8 Link Here

(-)Makefile (-7 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.4.1	5	PORTVERSION= 2.4.2
6	DISTVERSIONPREFIX= Audacity-	6	DISTVERSIONPREFIX= Audacity-
7	CATEGORIES= audio	7	CATEGORIES= audio
8		8
Lines 37-45 Link Here
37	-Daudacity_use_portaudio:STRING=system	37	-Daudacity_use_portaudio:STRING=system
38		38
39	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \	39	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
40	MIDI NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \	40	MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
41	VORBIS VST	41	VORBIS VST
42	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \	42	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI OGG SBSMS \
43	SOUNDTOUCH TWOLAME VAMP VORBIS VST	43	SOUNDTOUCH TWOLAME VAMP VORBIS VST
44		44
45	LAME_DESC= Use lame for import and export support	45	LAME_DESC= Use lame for import and export support
Lines 46-52 Link Here
46	LV2_DESC= Add LV2 plug-in support	46	LV2_DESC= Add LV2 plug-in support
47	MAD_DESC= Use libmad for mp2/3 decoding support	47	MAD_DESC= Use libmad for mp2/3 decoding support
48	MIDI_DESC= MIDI support	48	MIDI_DESC= MIDI support
49	NYQUIST_DESC= Nyquist synthesis and composition support
50	SBSMS_DESC= Use libsbsms for pitch and tempo changing	49	SBSMS_DESC= Use libsbsms for pitch and tempo changing
51	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing	50	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
52	TWOLAME_DESC= Use libtwolame for MP2 export support	51	TWOLAME_DESC= Use libtwolame for MP2 export support
Lines 99-107 Link Here
99	# TODO: fix NLS support properly	98	# TODO: fix NLS support properly
100	PLIST_SUB+= NLS=""	99	PLIST_SUB+= NLS=""
101		100
102	NYQUIST_CMAKE_ON= -Daudacity_use_nyquist:STRING=local
103	NYQUIST_CMAKE_OFF= -Daudacity_use_nyquist:STRING=off
104
105	OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system	101	OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system
106	OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local	102	OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local
107	OGG_LIB_DEPENDS= libogg.so:audio/libogg	103	OGG_LIB_DEPENDS= libogg.so:audio/libogg

Lines 1-6 Link Here

(-)files/patch-src_FFmpeg.h (-3 / +3 lines)
1	--- src/FFmpeg.h.orig 2018-10-01 14:07:33 UTC	1	--- src/FFmpeg.h.orig 2018-10-01 14:07:33 UTC
2	+++ src/FFmpeg.h	2	+++ src/FFmpeg.h
3	@@ -667,7 +667,7 @@ extern "C" {	3	@@ -685,7 +685,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	#endif	11	#endif
12	@@ -748,7 +748,7 @@ extern "C" {	12	@@ -766,7 +766,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	#endif	20	#endif
21	@@ -810,7 +810,7 @@ extern "C" {	21	@@ -828,7 +828,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,