Attachment #236892 for bug #266668




PORTNAME=	audacity
DISTVERSIONPREFIX=	Audacity-
DISTVERSION=	3.2.0
PORTREVISION=	2
CATEGORIES=	audio

MAINTAINER=	xxjack12xx@gmail.com

		-Daudacity_use_wxwidgets:STRING=system \
		-Daudacity_use_zlib:STRING=system
CMAKE_ON=	audacity_use_pa_oss audacity_obey_system_dependencies
CMAKE_OFF=	audacity_has_audiocom_upload audacity_has_networking audacity_has_updates_check \
		audacity_use_pa_alsa audacity_use_pch audacity_has_sentry_reporting \
		audacity_has_tests audacity_has_vst3

OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LV2 MAD \
			OGG SBSMS SOUNDTOUCH TWOLAME VAMP \

Lines 1-3 Link Here

(-)audacity-new/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1640677957	1	TIMESTAMP = 1664238989
2	SHA256 (audacity-audacity-Audacity-3.1.3_GH0.tar.gz) = 07aed333a20b8df381d5c0a167840883fff8ef65f5e5f71e654c0925d6c60de8	2	SHA256 (audacity-audacity-Audacity-3.2.0_GH0.tar.gz) = b6c3b15607a4925ea2ea5af12db8adaed759481fd1d3f51c5d8d9020171eea61
3	SIZE (audacity-audacity-Audacity-3.1.3_GH0.tar.gz) = 56500219	3	SIZE (audacity-audacity-Audacity-3.2.0_GH0.tar.gz) = 56964814




--- cmake-proxies/CMakeLists.txt.orig	2022-09-27 06:14:03 UTC
+++ cmake-proxies/CMakeLists.txt
@@ -130,7 +130,7 @@ else()
       libmad
       libmad/0.15.2b-1@
       OPTION_NAME libmad
-      PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file
+      PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file
    )
 endif()
 
 add_conan_lib(

Lines 1-6 Link Here

(-)audacity-new/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (-2 / +2 lines)
1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2021-02-04 18:52:51 UTC	1	--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2022-09-22 16:16:06 UTC
2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h	2	+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
3	@@ -172,6 +172,15 @@ extern long ptrtoabs();	3	@@ -181,6 +181,15 @@ extern long ptrtoabs();
4	#endif	4	#endif
5	#endif	5	#endif
6		6

Line 0 Link Here

(-)audacity-new/files/patch-libraries_lib-basic-ui_BasicUI.cpp (+10 lines)
	1	--- libraries/lib-basic-ui/BasicUI.cpp.orig 2022-09-28 03:57:45 UTC
	2	+++ libraries/lib-basic-ui/BasicUI.cpp
	3	@@ -29,6 +29,7 @@ Paul Licameli
	4
	5	#include <string>
	6
	7	+extern char** environ;
	8	namespace
	9	{
	10

Lines 1-6 Link Here

(-)audacity-new/files/patch-src_AboutDialog.cpp (-2 / +2 lines)
1	--- src/AboutDialog.cpp.orig 2021-09-22 19:37:04 UTC	1	--- src/AboutDialog.cpp.orig 2022-09-22 16:16:06 UTC
2	+++ src/AboutDialog.cpp	2	+++ src/AboutDialog.cpp
3	@@ -64,7 +64,7 @@ hold information about one contributor to Audacity.	3	@@ -59,7 +59,7 @@ hold information about one contributor to Audacity.
4	// RevisionIdent.h may contain #defines like these ones:	4	// RevisionIdent.h may contain #defines like these ones:
5	//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"	5	//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
6	//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"	6	//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_CMakeLists.txt (-11 lines)
1	--- src/CMakeLists.txt.orig 2021-10-28 09:14:30 UTC
2	+++ src/CMakeLists.txt
3	@@ -38,7 +38,7 @@ elseif( GIT_FOUND )
4	else()
5	# No Git installed and no version data is available.
6	# Generate an empty file and let AboutDialog do the rest
7	- file( TOUCH "${_PRVDIR}/RevisionIdent.h" )
8	+ file( WRITE "${_PRVDIR}/RevisionIdent.h" "\n" )
9	endif()
10
11	# Handle Audio Units option

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_MIDIPlay.cpp (-6 / +6 lines)
1	--- src/MIDIPlay.cpp.orig 2021-10-31 02:53:52 UTC	1	--- src/MIDIPlay.cpp.orig 2022-09-27 05:35:02 UTC
2	+++ src/MIDIPlay.cpp	2	+++ src/MIDIPlay.cpp
3	@@ -490,7 +490,7 @@ static double SystemTime(bool usingAlsa)	3	@@ -490,7 +490,7 @@ static double SystemTime(bool usingAlsa)
4	if (usingAlsa) {	4	if (usingAlsa) {
5	struct timespec now;	5	struct timespec now;
6	// CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time	6	// CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time
7	- clock_gettime(CLOCK_MONOTONIC_RAW, &now);	7	-#ifdef FreeBSD
8	+ clock_gettime(CLOCK_REALTIME, &now);	8	+#ifdef __FreeBSD__
9	//return now.tv_sec + now.tv_nsec * 0.000000001;	9	clock_gettime(CLOCK_REALTIME, &now);
10	return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime;	10	#else
11	}	11	clock_gettime(CLOCK_MONOTONIC_RAW, &now);

Lines 1-27 Link Here

(-)audacity-new/pkg-plist (-3 / +12 lines)
1	audacity
2	bin/audacity	1	bin/audacity
3	lib/audacity/lib-audio-devices.so	2	lib/audacity/lib-audio-devices.so
		3	lib/audacity/lib-audio-graph.so
4	lib/audacity/lib-basic-ui.so	4	lib/audacity/lib-basic-ui.so
5	lib/audacity/lib-components.so	5	lib/audacity/lib-components.so
6	lib/audacity/lib-exceptions.so	6	lib/audacity/lib-exceptions.so
7	lib/audacity/lib-ffmpeg-support.so	7	lib/audacity/lib-ffmpeg-support.so
8	lib/audacity/lib-files.so	8	lib/audacity/lib-files.so
		9	lib/audacity/lib-graphics.so
		10	lib/audacity/lib-ipc.so
9	lib/audacity/lib-math.so	11	lib/audacity/lib-math.so
		12	lib/audacity/lib-module-manager.so
10	lib/audacity/lib-preferences.so	13	lib/audacity/lib-preferences.so
		14	lib/audacity/lib-project-history.so
11	lib/audacity/lib-project-rate.so	15	lib/audacity/lib-project-rate.so
12	lib/audacity/lib-project.so	16	lib/audacity/lib-project.so
13	lib/audacity/lib-registries.so	17	lib/audacity/lib-registries.so
		18	lib/audacity/lib-sample-track.so
14	lib/audacity/lib-screen-geometry.so	19	lib/audacity/lib-screen-geometry.so
15	lib/audacity/lib-string-utils.so	20	lib/audacity/lib-string-utils.so
16	lib/audacity/lib-strings.so	21	lib/audacity/lib-strings.so
		22	lib/audacity/lib-theme-resources.so
17	lib/audacity/lib-theme.so	23	lib/audacity/lib-theme.so
		24	lib/audacity/lib-track.so
		25	lib/audacity/lib-transactions.so
18	lib/audacity/lib-utility.so	26	lib/audacity/lib-utility.so
19	lib/audacity/lib-uuid.so	27	lib/audacity/lib-uuid.so
20	lib/audacity/lib-xml.so	28	lib/audacity/lib-xml.so
21	lib/audacity/modules/mod-script-pipe.so	29	lib/audacity/modules/mod-script-pipe.so
22	share/man/man1/audacity.1.gz
23	share/applications/audacity.desktop	30	share/applications/audacity.desktop
24	%%DATADIR%%/EQDefaultCurves.xml	31	%%DATADIR%%/EffectsMenuDefaults.xml
25	%%DATADIR%%/nyquist/aud-do-support.lsp	32	%%DATADIR%%/nyquist/aud-do-support.lsp
26	%%DATADIR%%/nyquist/dspprims.lsp	33	%%DATADIR%%/nyquist/dspprims.lsp
27	%%DATADIR%%/nyquist/envelopes.lsp	34	%%DATADIR%%/nyquist/envelopes.lsp
Lines 96-101 Link Here
96	%%DATADIR%%/plug-ins/tremolo.ny	103	%%DATADIR%%/plug-ins/tremolo.ny
97	%%DATADIR%%/plug-ins/vocalrediso.ny	104	%%DATADIR%%/plug-ins/vocalrediso.ny
98	%%DATADIR%%/plug-ins/vocoder.ny	105	%%DATADIR%%/plug-ins/vocoder.ny
		106	%%PORTDOCS%%%%DOCSDIR%%/README.txt
99	share/icons/hicolor/16x16/audacity.png	107	share/icons/hicolor/16x16/audacity.png
100	share/icons/hicolor/22x22/audacity.png	108	share/icons/hicolor/22x22/audacity.png
101	share/icons/hicolor/24x24/audacity.png	109	share/icons/hicolor/24x24/audacity.png
Lines 159-164 Link Here
159	%%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo	167	%%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo
160	%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo	168	%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo
161	%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo	169	%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo
		170	share/man/man1/audacity.1.gz
162	share/metainfo/audacity.appdata.xml	171	share/metainfo/audacity.appdata.xml
163	share/mime/packages/audacity.xml	172	share/mime/packages/audacity.xml
164	share/pixmaps/audacity.xpm	173	share/pixmaps/audacity.xpm

Return to bug 266668

Lines 1-7 Link Here

(-)audacity-new/Makefile (-4 / +4 lines)
1	PORTNAME= audacity	1	PORTNAME= audacity
2	DISTVERSIONPREFIX= Audacity-	2	DISTVERSIONPREFIX= Audacity-
3	DISTVERSION= 3.1.3	3	DISTVERSION= 3.2.0
4	PORTREVISION= 2
5	CATEGORIES= audio	4	CATEGORIES= audio
6		5
7	MAINTAINER= xxjack12xx@gmail.com	6	MAINTAINER= xxjack12xx@gmail.com
Lines 46-53 Link Here
46	-Daudacity_use_wxwidgets:STRING=system \	45	-Daudacity_use_wxwidgets:STRING=system \
47	-Daudacity_use_zlib:STRING=system	46	-Daudacity_use_zlib:STRING=system
48	CMAKE_ON= audacity_use_pa_oss audacity_obey_system_dependencies	47	CMAKE_ON= audacity_use_pa_oss audacity_obey_system_dependencies
49	CMAKE_OFF= audacity_has_networking audacity_has_updates_check \	48	CMAKE_OFF= audacity_has_audiocom_upload audacity_has_networking audacity_has_updates_check \
50	audacity_use_pa_alsa audacity_use_pch	49	audacity_use_pa_alsa audacity_use_pch audacity_has_sentry_reporting \
		50	audacity_has_tests audacity_has_vst3
51		51
52	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LV2 MAD \	52	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LV2 MAD \
53	OGG SBSMS SOUNDTOUCH TWOLAME VAMP \	53	OGG SBSMS SOUNDTOUCH TWOLAME VAMP \

Lines 1-11 Link Here

(-)audacity-new/files/patch-cmake-proxies_CMakeLists.txt (-9 / +9 lines)
1	--- cmake-proxies/CMakeLists.txt.orig 2022-05-07 05:25:37 UTC	1	--- cmake-proxies/CMakeLists.txt.orig 2022-09-27 06:14:03 UTC
2	+++ cmake-proxies/CMakeLists.txt	2	+++ cmake-proxies/CMakeLists.txt
3	@@ -103,7 +103,7 @@ add_conan_lib(	3	@@ -130,7 +130,7 @@ else()
4	libmad	4	libmad
5	libmad/0.15.2b@audacity/stable	5	libmad/0.15.2b-1@
6	OPTION_NAME libmad	6	OPTION_NAME libmad
7	- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file	7	- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file
8	+ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file	8	+ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file
9	)	9	)
		10	endif()
10		11
11	add_conan_lib(