1 |
commit: a659cbc4376a23d8e8cfa2e50f3676d276c474ef |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Aug 13 18:49:01 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 17 16:28:00 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a659cbc4 |
7 |
|
8 |
media-sound/audacity: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/17116 |
13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
14 |
|
15 |
.../audacity-2.3.2-Fix-building-without-midi.patch | 71 ---------------------- |
16 |
...3.2-fix_building_against_system_portaudio.patch | 56 ----------------- |
17 |
2 files changed, 127 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch |
20 |
deleted file mode 100644 |
21 |
index d4ec1a7320f..00000000000 |
22 |
--- a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch |
23 |
+++ /dev/null |
24 |
@@ -1,71 +0,0 @@ |
25 |
-diff -urpN a/src/Track.h b/src/Track.h |
26 |
---- a/src/Track.h 2019-05-04 13:38:57.000000000 +0300 |
27 |
-+++ b/src/Track.h 2019-08-27 19:32:36.937551831 +0300 |
28 |
-@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector |
29 |
- |
30 |
- using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >; |
31 |
- |
32 |
--#if defined(USE_MIDI) |
33 |
--class NoteTrack; |
34 |
--#endif |
35 |
-- |
36 |
- class TrackList; |
37 |
- |
38 |
- using ListOfTracks = std::list< std::shared_ptr< Track > >; |
39 |
-@@ -74,9 +70,7 @@ enum class TrackKind |
40 |
- { |
41 |
- None, |
42 |
- Wave, |
43 |
--#if defined(USE_MIDI) |
44 |
- Note, |
45 |
--#endif |
46 |
- Label, |
47 |
- Time, |
48 |
- Audio, |
49 |
-diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp |
50 |
---- a/src/menus/FileMenus.cpp 2019-05-04 13:38:57.000000000 +0300 |
51 |
-+++ b/src/menus/FileMenus.cpp 2019-08-27 19:32:36.939551720 +0300 |
52 |
-@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI( |
53 |
- } |
54 |
- #endif |
55 |
- |
56 |
--#ifdef USE_MIDI |
57 |
-- |
58 |
- // Menu handler functions |
59 |
- |
60 |
- struct Handler : CommandHandlerObject { |
61 |
-@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext |
62 |
- } |
63 |
- } |
64 |
- |
65 |
-+#ifdef USE_MIDI |
66 |
- void OnImportMIDI(const CommandContext &context) |
67 |
- { |
68 |
- auto &project = context.project; |
69 |
-@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext & |
70 |
- if (!fileName.empty()) |
71 |
- DoImportMIDI(&project, fileName); |
72 |
- } |
73 |
--#endif |
74 |
-+#endif // USE_MIDI |
75 |
- |
76 |
- void OnImportRaw(const CommandContext &context) |
77 |
- { |
78 |
-diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp |
79 |
---- a/src/tracks/ui/TimeShiftHandle.cpp 2019-05-04 13:38:57.000000000 +0300 |
80 |
-+++ b/src/tracks/ui/TimeShiftHandle.cpp 2019-08-27 19:32:36.940551665 +0300 |
81 |
-@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click |
82 |
- ok = false; |
83 |
- else |
84 |
- captureClips = true; |
85 |
-- }, |
86 |
- #ifdef USE_MIDI |
87 |
-+ }, |
88 |
- [&](NoteTrack *) { |
89 |
- captureClips = true; |
90 |
-- } |
91 |
- #endif |
92 |
-+ } |
93 |
- ); |
94 |
- |
95 |
- if ( ! ok ) |
96 |
|
97 |
diff --git a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch |
98 |
deleted file mode 100644 |
99 |
index fa785fdd6c5..00000000000 |
100 |
--- a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch |
101 |
+++ /dev/null |
102 |
@@ -1,56 +0,0 @@ |
103 |
-From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001 |
104 |
-From: Antonio Ospite <ao2@×××.it> |
105 |
-Date: Tue, 7 Nov 2017 13:06:33 +0100 |
106 |
-Subject: [PATCH] Fix building against the system portaudio library |
107 |
- |
108 |
-Building against the system portaudio results in this error: |
109 |
- |
110 |
-./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime' |
111 |
-audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*, |
112 |
-unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)': |
113 |
-./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime' |
114 |
-collect2: error: ld returned 1 exit status |
115 |
-Makefile:2349: recipe for target 'audacity' failed |
116 |
-make[3]: *** [audacity] Error 1 |
117 |
- |
118 |
-This is because PaUtil_GetTime is declared as a C symbol in pa_util.h |
119 |
-but is resolved as a C++ symbol at link time. |
120 |
- |
121 |
-Audacity fixes this in the local tree with this change: |
122 |
-https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7 |
123 |
- |
124 |
-However this is not general enough for the portaudio debian package. |
125 |
- |
126 |
-Since PaUtil_GetTime() is the only function causing problems, just copy |
127 |
-over the code where it's used. |
128 |
---- |
129 |
- src/AudioIO.cpp | 17 ++++++++++++++++- |
130 |
- 1 file changed, 16 insertions(+), 1 deletion(-) |
131 |
- |
132 |
---- a/src/AudioIO.cpp |
133 |
-+++ b/src/AudioIO.cpp |
134 |
-@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe |
135 |
- #define ROUND(x) (int) ((x)+0.5) |
136 |
- //#include <string.h> |
137 |
- #include "../lib-src/portmidi/pm_common/portmidi.h" |
138 |
-- #include "../lib-src/portaudio-v19/src/common/pa_util.h" |
139 |
- #include "NoteTrack.h" |
140 |
-+ |
141 |
-+PaTime PaUtil_GetTime( void ) |
142 |
-+{ |
143 |
-+#ifdef HAVE_MACH_ABSOLUTE_TIME |
144 |
-+ return mach_absolute_time() * machSecondsConversionScaler_; |
145 |
-+#elif defined(HAVE_CLOCK_GETTIME) |
146 |
-+ struct timespec tp; |
147 |
-+ clock_gettime(CLOCK_REALTIME, &tp); |
148 |
-+ return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9); |
149 |
-+#else |
150 |
-+ struct timeval tv; |
151 |
-+ gettimeofday( &tv, NULL ); |
152 |
-+ return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec; |
153 |
-+#endif |
154 |
-+} |
155 |
-+ |
156 |
- #endif |
157 |
- |
158 |
- #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT |