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

Collapse All | Expand All

(-)audacity3/Makefile (-8 / +4 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacity
4
PORTNAME=	audacity
5
PORTVERSION=	2.4.2
5
PORTVERSION=	3.0.0
6
PORTREVISION=	3
7
DISTVERSIONPREFIX=	Audacity-
6
DISTVERSIONPREFIX=	Audacity-
8
CATEGORIES=	audio
7
CATEGORIES=	audio
9
8
Lines 17-25 Link Here
17
		libexpat.so:textproc/expat2 \
16
		libexpat.so:textproc/expat2 \
18
		libportaudio.so:audio/portaudio \
17
		libportaudio.so:audio/portaudio \
19
		libsndfile.so:audio/libsndfile \
18
		libsndfile.so:audio/libsndfile \
20
		libsoxr.so:audio/libsoxr
19
		libsoxr.so:audio/libsoxr \
20
		libsqlite3.so:databases/sqlite3
21
21
22
USES=		cmake compiler:c++11-lang cpe desktop-file-utils gettext \
22
USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext \
23
		gnome libtool python:build pkgconfig shared-mime-info
23
		gnome libtool python:build pkgconfig shared-mime-info
24
USE_GITHUB=	yes
24
USE_GITHUB=	yes
25
USE_GNOME=	cairo gtk30
25
USE_GNOME=	cairo gtk30
Lines 134-143 Link Here
134
		-DHAVE_SSE:BOOL=OFF \
134
		-DHAVE_SSE:BOOL=OFF \
135
		-DHAVE_SSE2:BOOL=OFF
135
		-DHAVE_SSE2:BOOL=OFF
136
.endif
136
.endif
137
138
post-patch:
139
	@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
140
		/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt
141
137
142
post-install:
138
post-install:
143
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
139
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
(-)audacity3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1593304211
1
TIMESTAMP = 1616018002
2
SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099
2
SHA256 (audacity-audacity-Audacity-3.0.0_GH0.tar.gz) = 14c5b6d661fbe85fa09b7caac5fa261e392a28150fa18fca91380e695ca76cc9
3
SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430
3
SIZE (audacity-audacity-Audacity-3.0.0_GH0.tar.gz) = 64375465
(-)audacity3/files/patch-cmake-proxies_CMakeLists.txt (-4 / +4 lines)
Lines 1-11 Link Here
1
--- cmake-proxies/CMakeLists.txt.orig	2020-06-19 15:16:47 UTC
1
--- cmake-proxies/CMakeLists.txt.orig	2021-03-09 02:19:38.000000000 -0800
2
+++ cmake-proxies/CMakeLists.txt
2
+++ cmake-proxies/CMakeLists.txt	2021-03-17 17:04:26.573245000 -0700
3
@@ -132,7 +132,7 @@ addlib( expat              expat       EXPAT       YES
3
@@ -132,7 +132,7 @@
4
 addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
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   "" )
8
+addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "portaudio-2.0 >= 19" )
8
+addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "portaudio-2.0 >= 19" )
9
 addlib( sqlite             sqlite      SQLITE      YES   YES   "sqlite3 >= 3.32.0" )
9
 
10
 
10
 # Optional libraries
11
 # Optional libraries
11
 #
(-)audacity3/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt (+20 lines)
Line 0 Link Here
1
--- cmake-proxies/wxWidgets/CMakeLists.txt.orig	2021-03-09 02:19:38.000000000 -0800
2
+++ cmake-proxies/wxWidgets/CMakeLists.txt	2021-03-17 18:22:13.373870000 -0700
3
@@ -237,17 +237,6 @@
4
       "^#define +wxVERSION_STRING +"
5
 )
6
 
7
-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
8
-if( NOT ours )
9
-   message( FATAL_ERROR
10
-      "\n########################################################################\n"
11
-      "Audacity version 3.0.0 or higher requires use of a customized version of "
12
-      "wxWidgets.  For details:\n"
13
-      "  https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
14
-      "########################################################################\n"
15
-   )
16
-endif()
17
-
18
 target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
19
 target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
20
 target_compile_options( ${TARGET} INTERFACE ${COPTS} )
(-)audacity3/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h (-3 / +3 lines)
Lines 1-6 Link Here
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	2021-03-09 02:19:38.000000000 -0800
2
+++ lib-src/libnyquist/nyquist/cmt/cext.h
2
+++ lib-src/libnyquist/nyquist/cmt/cext.h	2021-03-17 17:28:08.121777000 -0700
3
@@ -61,7 +61,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
3
@@ -61,7 +61,7 @@
4
 #include <malloc.h>
4
 #include <malloc.h>
5
 #endif
5
 #endif
6
 
6
 
(-)audacity3/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h (-10 lines)
Lines 1-10 Link Here
1
--- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig	2016-07-26 13:34:06 UTC
2
+++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h
3
@@ -33,6 +33,7 @@
4
 #define STK_FILEREAD_H
5
 
6
 #include "Stk.h"
7
+#include <stdio.h>
8
 
9
 namespace Nyq
10
 {
(-)audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c (+12 lines)
Line 0 Link Here
1
--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig	2021-03-09 02:19:38.000000000 -0800
2
+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c	2021-03-17 17:09:35.677331000 -0700
3
@@ -19,8 +19,7 @@
4
 /* do some sanity checking: */
5
 #ifndef XL_BIG_ENDIAN
6
 #ifndef XL_LITTLE_ENDIAN
7
-#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined
8
-in xlisp.h
9
+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h
10
 #endif
11
 #endif
12
 #ifdef XL_BIG_ENDIAN
(-)audacity3/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h (-4 / +4 lines)
Lines 1-6 Link Here
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	2021-03-17 17:23:49.169659000 -0700
2
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
2
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h	2021-03-17 17:24:27.385843000 -0700
3
@@ -161,6 +161,15 @@ extern long ptrtoabs();
3
@@ -172,6 +172,15 @@
4
 #endif
4
 #endif
5
 #endif
5
 #endif
6
 
6
 
Lines 13-18 Link Here
13
+#endif
13
+#endif
14
+#endif
14
+#endif
15
+
15
+
16
 /* Apple CC */
16
 /* Apple CC (xcode, macOS, macintosh) */
17
 #ifdef __APPLE__
17
 #ifdef __APPLE__
18
 #define NNODES 2000
18
 #define NNODES 2000
(-)audacity3/files/patch-src_AboutDialog.cpp (-1 / +1 lines)
Lines 1-6 Link Here
1
--- src/AboutDialog.cpp.orig	2020-06-28 06:25:54 UTC
1
--- src/AboutDialog.cpp.orig	2020-06-28 06:25:54 UTC
2
+++ src/AboutDialog.cpp
2
+++ src/AboutDialog.cpp
3
@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
3
@@ -62,7 +62,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"
(-)audacity3/files/patch-src_AudioIO.cpp (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/AudioIO.cpp.orig	2020-06-19 15:16:47 UTC
1
--- src/AudioIO.cpp.orig	2020-06-19 15:16:47 UTC
2
+++ src/AudioIO.cpp
2
+++ src/AudioIO.cpp
3
@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla
3
@@ -490,7 +490,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
@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private)
11
@@ -814,13 +813,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
 
(-)audacity3/files/patch-src_ProjectSerializer.cpp (+60 lines)
Line 0 Link Here
1
--- src/ProjectSerializer.cpp.orig 2021-03-09 02:19:38.000000000 -0800
2
+++ src/ProjectSerializer.cpp      2021-03-17 18:22:13.373870000 -0700
3
@@ -206,9 +206,9 @@ ProjectSerializer::ProjectSerializer(size_t allocSize)
4
    std::call_once(flag, []{
5
       // Just once per run, store header information in the unique static
6
       // dictionary that will be written into each project that is saved.
7
-      // Store the size of "wxChar" so we can convert during recovery in
8
-      // case the file is used on a system with a different character size.
9
-      char size = sizeof(wxChar);
10
+      // Store the size of "wxStringCharType" so we can convert during recovery
11
+      // in case the file is used on a system with a different character size.
12
+      char size = sizeof(wxStringCharType);
13
       mDict.AppendByte(FT_CharSize);
14
       mDict.AppendData(&size, 1);
15
    });
16
@@ -242,7 +242,7 @@ void ProjectSerializer::WriteAttr(const wxString & name, const wxString & value)
17
    mBuffer.AppendByte(FT_String);
18
    WriteName(name);
19
 
20
-   const Length len = value.length() * sizeof(wxChar);
21
+   const Length len = value.length() * sizeof(wxStringCharType);
22
    WriteLength( mBuffer, len );
23
    mBuffer.AppendData(value.wx_str(), len);
24
 }
25
@@ -309,7 +309,7 @@ void ProjectSerializer::WriteData(const wxString & value)
26
 {
27
    mBuffer.AppendByte(FT_Data);
28
 
29
-   Length len = value.length() * sizeof(wxChar);
30
+   Length len = value.length() * sizeof(wxStringCharType);
31
    WriteLength( mBuffer, len );
32
    mBuffer.AppendData(value.wx_str(), len);
33
 }
34
@@ -317,7 +317,7 @@ void ProjectSerializer::WriteData(const wxString & value)
35
 void ProjectSerializer::Write(const wxString & value)
36
 {
37
    mBuffer.AppendByte(FT_Raw);
38
-   Length len = value.length() * sizeof(wxChar);
39
+   Length len = value.length() * sizeof(wxStringCharType);
40
    WriteLength( mBuffer, len );
41
    mBuffer.AppendData(value.wx_str(), len);
42
 }
43
@@ -334,7 +334,7 @@ void ProjectSerializer::WriteSubTree(const ProjectSerializer & value)
44
 
45
 void ProjectSerializer::WriteName(const wxString & name)
46
 {
47
-   wxASSERT(name.length() * sizeof(wxChar) <= SHRT_MAX);
48
+   wxASSERT(name.length() * sizeof(wxStringCharType) <= SHRT_MAX);
49
    UShort id;
50
 
51
    auto nameiter = mNames.find(name);
52
@@ -346,7 +346,7 @@ void ProjectSerializer::WriteName(const wxString & name)
53
    {
54
       // mNames is static.  This appends each name to static mDict only once
55
       // in each run.
56
-      UShort len = name.length() * sizeof(wxChar);
57
+      UShort len = name.length() * sizeof(wxStringCharType);
58
 
59
       id = mNames.size();
60
       mNames[name] = id;
(-)audacity3/files/patch-src_widgets_Grid.cpp (+11 lines)
Line 0 Link Here
1
--- src/widgets/Grid.cpp.orig	2021-03-09 02:19:38.000000000 -0800
2
+++ src/widgets/Grid.cpp	2021-03-17 17:03:30.286591000 -0700
3
@@ -572,7 +572,7 @@
4
          {
5
             wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol));
6
             wxClipboard::Get()->SetData(data);
7
-            SetCellValue(crow, ccol, {});
8
+            SetCellValue(crow, ccol, "");
9
             return;
10
          }
11
          break;
(-)audacity3/pkg-plist (-2 / +3 lines)
Lines 49-56 Link Here
49
%%DATADIR%%/nyquist/velocity.lsp
49
%%DATADIR%%/nyquist/velocity.lsp
50
%%DATADIR%%/nyquist/xlinit.lsp
50
%%DATADIR%%/nyquist/xlinit.lsp
51
%%DATADIR%%/nyquist/xm.lsp
51
%%DATADIR%%/nyquist/xm.lsp
52
%%DATADIR%%/plug-ins/SilenceMarker.ny
53
%%DATADIR%%/plug-ins/SoundFinder.ny
54
%%DATADIR%%/plug-ins/SpectralEditMulti.ny
52
%%DATADIR%%/plug-ins/SpectralEditMulti.ny
55
%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
53
%%DATADIR%%/plug-ins/SpectralEditParametricEQ.ny
56
%%DATADIR%%/plug-ins/SpectralEditShelves.ny
54
%%DATADIR%%/plug-ins/SpectralEditShelves.ny
Lines 64-69 Link Here
64
%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
62
%%DATADIR%%/plug-ins/eq-xml-to-txt-converter.ny
65
%%DATADIR%%/plug-ins/equalabel.ny
63
%%DATADIR%%/plug-ins/equalabel.ny
66
%%DATADIR%%/plug-ins/highpass.ny
64
%%DATADIR%%/plug-ins/highpass.ny
65
%%DATADIR%%/plug-ins/label-sounds.ny
67
%%DATADIR%%/plug-ins/limiter.ny
66
%%DATADIR%%/plug-ins/limiter.ny
68
%%DATADIR%%/plug-ins/lowpass.ny
67
%%DATADIR%%/plug-ins/lowpass.ny
69
%%DATADIR%%/plug-ins/noisegate.ny
68
%%DATADIR%%/plug-ins/noisegate.ny
Lines 93-98 Link Here
93
%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo
92
%%NLS%%share/locale/bs/LC_MESSAGES/audacity.mo
94
%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo
93
%%NLS%%share/locale/ca/LC_MESSAGES/audacity.mo
95
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
94
%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/audacity.mo
95
%%NLS%%share/locale/co/LC_MESSAGES/audacity.mo
96
%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo
96
%%NLS%%share/locale/cs/LC_MESSAGES/audacity.mo
97
%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo
97
%%NLS%%share/locale/cy/LC_MESSAGES/audacity.mo
98
%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo
98
%%NLS%%share/locale/da/LC_MESSAGES/audacity.mo
Lines 119-124 Link Here
119
%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo
119
%%NLS%%share/locale/ko/LC_MESSAGES/audacity.mo
120
%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo
120
%%NLS%%share/locale/lt/LC_MESSAGES/audacity.mo
121
%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo
121
%%NLS%%share/locale/mk/LC_MESSAGES/audacity.mo
122
%%NLS%%share/locale/mr/LC_MESSAGES/audacity.mo
122
%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo
123
%%NLS%%share/locale/my/LC_MESSAGES/audacity.mo
123
%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo
124
%%NLS%%share/locale/nb/LC_MESSAGES/audacity.mo
124
%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo
125
%%NLS%%share/locale/nl/LC_MESSAGES/audacity.mo

Return to bug 254598