Attachment #197654 for bug #231837




# $FreeBSD$

PORTNAME=	audacity
PORTVERSION=	2.3.0
DISTVERSIONPREFIX=	Audacity-
PORTREVISION=	3
CATEGORIES=	audio

MAINTAINER=	xxjack12xx@gmail.com

USE_GITHUB=	yes

OPTIONS_DEFINE=	NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
		MAD MOD_SCRIPT_PIPE MOD_NYQ_BENCH SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD \
			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
MOD_SCRIPT_PIPE_DESC=	mod-script-pipe scripting support
MOD_NYQ_BENCH_DESC=	Enable Nyquist Workbench
SBSMS_DESC=	Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
TAGLIB_DESC=	Use TagLib for metadata support

LADSPA_CONFIGURE_ENABLE=	ladspa
LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa

MAD_CONFIGURE_WITH=	libmad=system
MAD_LIB_DEPENDS=	libmad.so:audio/libmad

LAME_CONFIGURE_ON=	--with-lame=system
LAME_CONFIGURE_OFF=	--with-lame	# --without-lame is broken
LAME_CPPFLAGS=		-I${LOCALBASE}/include

LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
			libsuil-0.so:audio/suil

MAD_CONFIGURE_WITH=	libmad=system
MAD_LIB_DEPENDS=	libmad.so:audio/libmad

MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe
MOD_SCRIPT_PIPE_USES=	python:3.6+
MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
MOD_NYQ_BENCH_USES=	python:3.6+

SBSMS_CONFIGURE_WITH=	sbsms

SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1519297034	1	TIMESTAMP = 1538360236
2	SHA256 (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3	2	SHA256 (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 37127f68dceeb5da08d008ec9373a65e2d5d0a9b937c808a5d7c3b88aa9e275e
3	SIZE (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 25947462	3	SIZE (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 27479664

Lines 1-6 Link Here

(-)files/patch-include_audacity_Types.h (-1 / +1 lines)
1	--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC	1	--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC
2	+++ include/audacity/Types.h	2	+++ include/audacity/Types.h
3	@@ -72,7 +72,7 @@	3	@@ -73,7 +73,7 @@
4	sampleCount ( long v ) : value { v } {}	4	sampleCount ( long v ) : value { v } {}
5		5
6	// unsigned long is 64 bit on some platforms. Let it narrow.	6	// unsigned long is 64 bit on some platforms. Let it narrow.

Lines 7-14 Link Here

(-)files/patch-lib-src_FileDialog_Makefile.am (-2 / +2 lines)
7	+DIST_SUBDIRS= gtk mac win	7	+DIST_SUBDIRS= gtk mac win
8	lib_LTLIBRARIES = libFileDialog.la	8	lib_LTLIBRARIES = libFileDialog.la
9		9
10	libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations	10	libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
11	@@ -7,22 +9,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)	11	@@ -8,22 +10,32 @@
12	libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h	12	libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
13		13
14	if GTK	14	if GTK

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	@@ -153,6 +153,15 @@ extern long ptrtoabs();	3	@@ -160,6 +160,15 @@ extern long ptrtoabs();
4	#endif	4	#endif
5	#endif	5	#endif
6		6

Lines 1-6 Link Here

(-)files/patch-src_AudioIO.cpp (-2 / +2 lines)
1	--- src/AudioIO.cpp.orig 2018-07-17 20:25:01 UTC	1	--- src/AudioIO.cpp.orig 2018-07-17 20:25:01 UTC
2	+++ src/AudioIO.cpp	2	+++ src/AudioIO.cpp
3	@@ -465,7 +465,6 @@ TimeTrack and AudioIOListener and whether the playback	3	@@ -467,7 +467,6 @@ TimeTrack and AudioIOListener and whether the playback
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	@@ -979,13 +978,22 @@ struct AudioIO::ScrubQueue (private)	11	@@ -787,13 +787,22 @@ struct AudioIO::ScrubQueue (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

Lines 1-6 Link Here

(-)files/patch-src_FFmpeg.h (-6 / +6 lines)
1	--- src/FFmpeg.h.orig 2016-07-26 13:34:06 UTC	1	--- src/FFmpeg.h.orig 2016-07-26 13:34:06 UTC
2	+++ src/FFmpeg.h	2	+++ src/FFmpeg.h
3	@@ -689,7 +689,7 @@ extern "C" {	3	@@ -705,7 +705,7 @@
4	FFMPEG_FUNCTION_WITH_RETURN(	4	FFMPEG_FUNCTION_WITH_RETURN(
5	AVOutputFormat*,	5	AVOutputFormat*,
6	av_oformat_next,	6	av_oformat_next,
Lines 8-16 Link Here
8	+ (const AVOutputFormat *f),	8	+ (const AVOutputFormat *f),
9	(f)	9	(f)
10	);	10	);
		11	#endif
		12	@@ -786,7 +786,7 @@
11	FFMPEG_FUNCTION_WITH_RETURN(	13	FFMPEG_FUNCTION_WITH_RETURN(
12	@@ -756,7 +756,7 @@ extern "C" {
13	FFMPEG_FUNCTION_WITH_RETURN(
14	int,	14	int,
15	av_fifo_size,	15	av_fifo_size,
16	- (AVFifoBuffer *f),	16	- (AVFifoBuffer *f),
Lines 17-25 Link Here
17	+ (const AVFifoBuffer *f),	17	+ (const AVFifoBuffer *f),
18	(f)	18	(f)
19	);	19	);
		20	#endif
		21	@@ -848,7 +848,7 @@
20	FFMPEG_FUNCTION_WITH_RETURN(	22	FFMPEG_FUNCTION_WITH_RETURN(
21	@@ -802,7 +802,7 @@ extern "C" {
22	FFMPEG_FUNCTION_WITH_RETURN(
23	AVDictionaryEntry *,	23	AVDictionaryEntry *,
24	av_dict_get,	24	av_dict_get,
25	- (AVDictionary m, const char key, const AVDictionaryEntry *prev, int flags),	25	- (AVDictionary m, const char key, const AVDictionaryEntry *prev, int flags),
Lines 26-29 Link Here
26	+ (const AVDictionary m, const char key, const AVDictionaryEntry *prev, int flags),	26	+ (const AVDictionary m, const char key, const AVDictionaryEntry *prev, int flags),
27	(m, key, prev, flags)	27	(m, key, prev, flags)
28	);	28	);
29	FFMPEG_FUNCTION_WITH_RETURN(	29	#endif

Lines 1-6 Link Here

(-)files/patch-src_Makefile.am (-1 / +1 lines)
1	--- src/Makefile.am.orig 2016-07-26 13:34:06 UTC	1	--- src/Makefile.am.orig 2016-07-26 13:34:06 UTC
2	+++ src/Makefile.am	2	+++ src/Makefile.am
3	@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \	3	@@ -79,8 +79,7 @@ audacity_CPPFLAGS = \
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	# ^




--- src/MemoryX.h.orig	2018-09-30 19:45:06.332028000 -0700
+++ src/MemoryX.h	2018-09-30 19:45:59.977440000 -0700
@@ -1,6 +1,7 @@
 #ifndef __AUDACITY_MEMORY_X_H__
 #define __AUDACITY_MEMORY_X_H__

+#include <stdlib.h>
 // C++ standard header <memory> with a few extensions
 #include <memory>
 #include <cstdlib> // Needed for free.
@@ -706,7 +707,7 @@
 // For using std::unordered_map on wxString
 namespace std
 {
-   template<typename T> struct hash;
+   //template<typename T> struct hash;
    template<> struct hash< wxString > {
       size_t operator () (const wxString &str) const // noexcept
       {

Return to bug 231837

Lines 2-10 Link Here

(-)Makefile (-6 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= audacity	4	PORTNAME= audacity
5	PORTVERSION= 2.2.2	5	PORTVERSION= 2.3.0
6	DISTVERSIONPREFIX= Audacity-	6	DISTVERSIONPREFIX= Audacity-
7	PORTREVISION= 3
8	CATEGORIES= audio	7	CATEGORIES= audio
9		8
10	MAINTAINER= xxjack12xx@gmail.com	9	MAINTAINER= xxjack12xx@gmail.com
Lines 40-46 Link Here
40	USE_GITHUB= yes	39	USE_GITHUB= yes
41		40
42	OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \	41	OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
43	MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	42	MAD MOD_SCRIPT_PIPE MOD_NYQ_BENCH SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
44	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \	43	OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \
45	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST	44	SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
46		45
Lines 53-58 Link Here
53	LAME_DESC= Use lame for import and export support	52	LAME_DESC= Use lame for import and export support
54	LV2_DESC= Add LV2 plug-in support	53	LV2_DESC= Add LV2 plug-in support
55	MAD_DESC= Use libmad for mp2/3 decoding support	54	MAD_DESC= Use libmad for mp2/3 decoding support
		55	MOD_SCRIPT_PIPE_DESC= mod-script-pipe scripting support
		56	MOD_NYQ_BENCH_DESC= Enable Nyquist Workbench
56	SBSMS_DESC= Use libsbsms for pitch and tempo changing	57	SBSMS_DESC= Use libsbsms for pitch and tempo changing
57	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing	58	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
58	TAGLIB_DESC= Use TagLib for metadata support	59	TAGLIB_DESC= Use TagLib for metadata support
Lines 101-109 Link Here
101	LADSPA_CONFIGURE_ENABLE= ladspa	102	LADSPA_CONFIGURE_ENABLE= ladspa
102	LADSPA_RUN_DEPENDS= listplugins:audio/ladspa	103	LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
103		104
104	MAD_CONFIGURE_WITH= libmad=system
105	MAD_LIB_DEPENDS= libmad.so:audio/libmad
106
107	LAME_CONFIGURE_ON= --with-lame=system	105	LAME_CONFIGURE_ON= --with-lame=system
108	LAME_CONFIGURE_OFF= --with-lame # --without-lame is broken	106	LAME_CONFIGURE_OFF= --with-lame # --without-lame is broken
109	LAME_CPPFLAGS= -I${LOCALBASE}/include	107	LAME_CPPFLAGS= -I${LOCALBASE}/include
Lines 114-119 Link Here
114	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \	112	LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
115	libsuil-0.so:audio/suil	113	libsuil-0.so:audio/suil
116		114
		115	MAD_CONFIGURE_WITH= libmad=system
		116	MAD_LIB_DEPENDS= libmad.so:audio/libmad
		117
		118	MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe
		119	MOD_SCRIPT_PIPE_USES= python:3.6+
		120	MOD_NYQ_BENCH_CONFIGURE_WITH= mod-nyq-bench
		121	MOD_NYQ_BENCH_USES= python:3.6+
		122
117	SBSMS_CONFIGURE_WITH= sbsms	123	SBSMS_CONFIGURE_WITH= sbsms
118		124
119	SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system	125	SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system

Lines 1-5 Link Here

(-)files/patch-src_MemoryX.h (-12 / +12 lines)
1	--- src/MemoryX.h.orig 2018-02-22 14:12:04.240599000 -0800	1	--- src/MemoryX.h.orig 2018-09-30 19:45:06.332028000 -0700
2	+++ src/MemoryX.h 2018-02-22 14:01:53.685861000 -0800	2	+++ src/MemoryX.h 2018-09-30 19:45:59.977440000 -0700
3	@@ -1,6 +1,7 @@	3	@@ -1,6 +1,7 @@
4	#ifndef __AUDACITY_MEMORY_X_H__	4	#ifndef __AUDACITY_MEMORY_X_H__
5	#define __AUDACITY_MEMORY_X_H__	5	#define __AUDACITY_MEMORY_X_H__
Lines 7-19 Link Here
7	+#include <stdlib.h>	7	+#include <stdlib.h>
8	// C++ standard header <memory> with a few extensions	8	// C++ standard header <memory> with a few extensions
9	#include <memory>	9	#include <memory>
10	#ifndef safenew	10	#include <cstdlib> // Needed for free.
11	@@ -1171,7 +1172,7 @@	11	@@ -706,7 +707,7 @@
12	namespace tr1	12	// For using std::unordered_map on wxString
13	{	13	namespace std
14	#endif	14	{
15	- template<typename T> struct hash;	15	- template<typename T> struct hash;
16	+ //template<typename T> struct hash;	16	+ //template<typename T> struct hash;
17	template<> struct hash< wxString > {	17	template<> struct hash< wxString > {
18	size_t operator () (const wxString &str) const // noexcept	18	size_t operator () (const wxString &str) const // noexcept
19	{	19	{