1 |
commit: cb7aafd6bb1bc403b096383487b0c996f7a8257b |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 12:18:49 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 12:22:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7aafd6 |
7 |
|
8 |
media-sound/audacity: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
media-sound/audacity/Manifest | 1 - |
14 |
media-sound/audacity/audacity-2.0.2.ebuild | 98 ------------ |
15 |
.../audacity/files/audacity-1.3.13-ffmpeg.patch | 164 --------------------- |
16 |
.../audacity/files/audacity-1.3.14-typecast.patch | 15 -- |
17 |
4 files changed, 278 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest |
20 |
index a630944..b4de984 100644 |
21 |
--- a/media-sound/audacity/Manifest |
22 |
+++ b/media-sound/audacity/Manifest |
23 |
@@ -1,6 +1,5 @@ |
24 |
DIST audacity-manual-2.1.1.zip 20224419 SHA256 fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84 WHIRLPOOL 4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b |
25 |
DIST audacity-manual-2.1.2.zip 20533055 SHA256 5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8 WHIRLPOOL 64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464 |
26 |
-DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e WHIRLPOOL 3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868 |
27 |
DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004 WHIRLPOOL 106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0 |
28 |
DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d WHIRLPOOL 240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762 |
29 |
DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da WHIRLPOOL 7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f |
30 |
|
31 |
diff --git a/media-sound/audacity/audacity-2.0.2.ebuild b/media-sound/audacity/audacity-2.0.2.ebuild |
32 |
deleted file mode 100644 |
33 |
index 438ab4e..0000000 |
34 |
--- a/media-sound/audacity/audacity-2.0.2.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,98 +0,0 @@ |
37 |
-# Copyright 1999-2015 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=4 |
42 |
- |
43 |
-inherit eutils wxwidgets autotools versionator |
44 |
- |
45 |
-MY_PV=$(replace_version_separator 3 -) |
46 |
-MY_P="${PN}-src-${MY_PV}" |
47 |
-MY_T="${PN}-minsrc-${MY_PV}" |
48 |
-DESCRIPTION="Free crossplatform audio editor" |
49 |
-HOMEPAGE="http://web.audacityteam.org/" |
50 |
-SRC_URI="mirror://gentoo/${MY_T}.tar.bz2" |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="amd64 ~mips ppc ppc64 x86" |
55 |
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis" |
56 |
-RESTRICT="test" |
57 |
- |
58 |
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X] |
59 |
- >=app-arch/zip-2.3 |
60 |
- >=media-libs/libsndfile-1.0.0 |
61 |
- dev-libs/expat |
62 |
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) |
63 |
- vorbis? ( >=media-libs/libvorbis-1.0 ) |
64 |
- mp3? ( >=media-libs/libmad-0.14.2b ) |
65 |
- flac? ( >=media-libs/flac-1.2.0[cxx] ) |
66 |
- id3tag? ( media-libs/libid3tag ) |
67 |
- sbsms? ( media-libs/libsbsms ) |
68 |
- soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) |
69 |
- vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) |
70 |
- twolame? ( media-sound/twolame ) |
71 |
- ffmpeg? ( virtual/ffmpeg ) |
72 |
- alsa? ( media-libs/alsa-lib ) |
73 |
- jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )" |
74 |
-# Crashes at startup here... |
75 |
-# lv2? ( >=media-libs/slv2-0.6.0 ) |
76 |
-# Disabled upstream ATM |
77 |
-# ladspa? ( >=media-libs/liblrdf-0.4.0 ) |
78 |
- |
79 |
-RDEPEND="${COMMON_DEPEND} |
80 |
- mp3? ( >=media-sound/lame-3.70 )" |
81 |
-DEPEND="${COMMON_DEPEND} |
82 |
- virtual/pkgconfig" |
83 |
- |
84 |
-REQUIRED_USE="soundtouch? ( midi )" |
85 |
- |
86 |
-S=${WORKDIR}/${MY_P} |
87 |
- |
88 |
-src_prepare() { |
89 |
- epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch |
90 |
- |
91 |
- AT_M4DIR="${S}/m4" eautoreconf |
92 |
-} |
93 |
- |
94 |
-src_configure() { |
95 |
- WX_GTK_VER="2.8" |
96 |
- need-wxwidgets unicode |
97 |
- |
98 |
- # * always use system libraries if possible |
99 |
- # * options listed in the order that configure --help lists them |
100 |
- # * if libsamplerate not requested, use libresample instead. |
101 |
- econf \ |
102 |
- --enable-unicode \ |
103 |
- --enable-nyquist \ |
104 |
- $(use_enable ladspa) \ |
105 |
- --with-libsndfile=system \ |
106 |
- --with-expat=system \ |
107 |
- $(use_with libsamplerate) \ |
108 |
- $(use_with !libsamplerate libresample) \ |
109 |
- $(use_with vorbis libvorbis) \ |
110 |
- $(use_with mp3 libmad) \ |
111 |
- $(use_with flac libflac) \ |
112 |
- $(use_with id3tag libid3tag) \ |
113 |
- $(use_with sbsms) \ |
114 |
- $(use_with soundtouch) \ |
115 |
- $(use_with vamp libvamp) \ |
116 |
- $(use_with twolame libtwolame) \ |
117 |
- $(use_with ffmpeg) \ |
118 |
- $(use_with midi) \ |
119 |
- $(use_with alsa) \ |
120 |
- $(use_with jack) |
121 |
-} |
122 |
- |
123 |
-# $(use_with lv2 slv2) \ |
124 |
-# $(use_with ladspa liblrdf) \ |
125 |
- |
126 |
-src_install() { |
127 |
- emake DESTDIR="${D}" install |
128 |
- |
129 |
- # Remove bad doc install |
130 |
- rm -rf "${D}"/usr/share/doc |
131 |
- |
132 |
- # Install our docs |
133 |
- dodoc README.txt |
134 |
-} |
135 |
|
136 |
diff --git a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch |
137 |
deleted file mode 100644 |
138 |
index 6754709..0000000 |
139 |
--- a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch |
140 |
+++ /dev/null |
141 |
@@ -1,164 +0,0 @@ |
142 |
---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpeg.cpp |
143 |
-+++ audacity-src-1.3.13-beta/src/export/ExportFFmpeg.cpp |
144 |
-@@ -352,7 +352,7 @@ |
145 |
- avcodec_get_context_defaults(mEncAudioCodecCtx); |
146 |
- |
147 |
- mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid; |
148 |
-- mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO; |
149 |
-+ mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO; |
150 |
- mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id); |
151 |
- mSampleRate = (int)project->GetRate(); |
152 |
- mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by default; |
153 |
-@@ -403,7 +403,6 @@ |
154 |
- mEncAudioCodecCtx->flags2 = 0; |
155 |
- if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR; |
156 |
- if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only? |
157 |
-- mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true); |
158 |
- mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1); |
159 |
- mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0); |
160 |
- mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0); |
161 |
-@@ -569,7 +569,7 @@ |
162 |
- pkt.stream_index = mEncAudioStream->index; |
163 |
- pkt.data = mEncAudioEncodedBuf; |
164 |
- pkt.size = nEncodedBytes; |
165 |
-- pkt.flags |= PKT_FLAG_KEY; |
166 |
-+ pkt.flags |= AV_PKT_FLAG_KEY; |
167 |
- |
168 |
- // Set presentation time of frame (currently in the codec's timebase) in the stream timebase. |
169 |
- if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts != int64_t(AV_NOPTS_VALUE)) |
170 |
-@@ -656,7 +656,7 @@ |
171 |
- |
172 |
- pkt.stream_index = mEncAudioStream->index; |
173 |
- pkt.data = mEncAudioEncodedBuf; |
174 |
-- pkt.flags |= PKT_FLAG_KEY; |
175 |
-+ pkt.flags |= AV_PKT_FLAG_KEY; |
176 |
- |
177 |
- // Write the encoded audio frame to the output file. |
178 |
- if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0) |
179 |
---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpegDialogs.cpp |
180 |
-+++ audacity-src-1.3.13-beta/src/export/ExportFFmpegDialogs.cpp |
181 |
-@@ -1288,7 +1288,7 @@ |
182 |
- while ((codec = av_codec_next(codec))) |
183 |
- { |
184 |
- // We're only interested in audio and only in encoders |
185 |
-- if (codec->type == CODEC_TYPE_AUDIO && codec->encode) |
186 |
-+ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode) |
187 |
- { |
188 |
- mCodecNames.Add(wxString::FromUTF8(codec->name)); |
189 |
- mCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str())); |
190 |
-@@ -1528,7 +1528,7 @@ |
191 |
- // Find the codec, that is claimed to be compatible |
192 |
- AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec); |
193 |
- // If it exists, is audio and has encoder |
194 |
-- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode) |
195 |
-+ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode) |
196 |
- { |
197 |
- // If it was selected - remember it's new index |
198 |
- if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); |
199 |
-@@ -1543,7 +1543,7 @@ |
200 |
- AVCodec *codec = NULL; |
201 |
- while ((codec = av_codec_next(codec))) |
202 |
- { |
203 |
-- if (codec->type == CODEC_TYPE_AUDIO && codec->encode) |
204 |
-+ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode) |
205 |
- { |
206 |
- if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0) |
207 |
- { |
208 |
-@@ -1563,7 +1563,7 @@ |
209 |
- if (format != NULL) |
210 |
- { |
211 |
- AVCodec *codec = avcodec_find_encoder(format->audio_codec); |
212 |
-- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode) |
213 |
-+ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode) |
214 |
- { |
215 |
- if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); |
216 |
- mShownCodecNames.Add(wxString::FromUTF8(codec->name)); |
217 |
---- audacity-src-1.3.13-beta.orig/src/FFmpeg.cpp |
218 |
-+++ audacity-src-1.3.13-beta/src/FFmpeg.cpp |
219 |
-@@ -316,7 +316,7 @@ |
220 |
- pd.buf_size = 0; |
221 |
- pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE); |
222 |
- if (pd.buf == NULL) { |
223 |
-- err = AVERROR_NOMEM; |
224 |
-+ err = AVERROR(ENOMEM); |
225 |
- goto fail; |
226 |
- } |
227 |
- |
228 |
-@@ -381,7 +381,7 @@ |
229 |
- |
230 |
- // Didn't find a suitable format, so bail |
231 |
- if (!fmt) { |
232 |
-- err = AVERROR_NOFMT; |
233 |
-+ err = AVERROR(EILSEQ); |
234 |
- goto fail; |
235 |
- } |
236 |
- |
237 |
-@@ -855,7 +855,6 @@ |
238 |
- FFMPEG_INITDYN(codec, avcodec_find_decoder); |
239 |
- FFMPEG_INITDYN(codec, avcodec_get_context_defaults); |
240 |
- FFMPEG_INITDYN(codec, avcodec_open); |
241 |
-- FFMPEG_INITDYN(codec, avcodec_decode_audio2); |
242 |
- FFMPEG_INITDYN(codec, avcodec_decode_audio3); |
243 |
- FFMPEG_INITDYN(codec, avcodec_encode_audio); |
244 |
- FFMPEG_INITDYN(codec, avcodec_close); |
245 |
---- audacity-src-1.3.13-beta.orig/src/FFmpeg.h |
246 |
-+++ audacity-src-1.3.13-beta/src/FFmpeg.h |
247 |
-@@ -559,7 +559,11 @@ |
248 |
- FFMPEG_FUNCTION_WITH_RETURN( |
249 |
- void*, |
250 |
- av_fast_realloc, |
251 |
-+#if LIBAVUTIL_VERSION_MAJOR < 51 |
252 |
- (void *ptr, unsigned int *size, unsigned int min_size), |
253 |
-+#else |
254 |
-+ (void *ptr, unsigned int *size, size_t min_size), |
255 |
-+#endif |
256 |
- (ptr, size, min_size) |
257 |
- ); |
258 |
- FFMPEG_FUNCTION_WITH_RETURN( |
259 |
-@@ -747,7 +751,11 @@ |
260 |
- FFMPEG_FUNCTION_WITH_RETURN( |
261 |
- void*, |
262 |
- av_malloc, |
263 |
-+#if LIBAVUTIL_VERSION_MAJOR < 51 |
264 |
- (unsigned int size), |
265 |
-+#else |
266 |
-+ (size_t size), |
267 |
-+#endif |
268 |
- (size) |
269 |
- ); |
270 |
- FFMPEG_FUNCTION_NO_RETURN( |
271 |
---- audacity-src-1.3.13-beta.orig/src/import/ImportFFmpeg.cpp |
272 |
-+++ audacity-src-1.3.13-beta/src/import/ImportFFmpeg.cpp |
273 |
-@@ -416,7 +416,7 @@ |
274 |
- // Fill the stream contexts |
275 |
- for (unsigned int i = 0; i < mFormatContext->nb_streams; i++) |
276 |
- { |
277 |
-- if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) |
278 |
-+ if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) |
279 |
- { |
280 |
- //Create a context |
281 |
- streamContext *sc = new streamContext; |
282 |
---- audacity-src-1.3.13-beta.orig/src/ondemand/ODDecodeFFmpegTask.cpp |
283 |
-+++ audacity-src-1.3.13-beta/src/ondemand/ODDecodeFFmpegTask.cpp |
284 |
-@@ -156,7 +156,7 @@ |
285 |
- //test the audio stream(s) |
286 |
- for (unsigned int i = 0; i < ic->nb_streams; i++) |
287 |
- { |
288 |
-- if (ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) |
289 |
-+ if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) |
290 |
- { |
291 |
- audioStreamExists = true; |
292 |
- st = ic->streams[i]; |
293 |
-@@ -573,10 +573,10 @@ |
294 |
- } |
295 |
- } |
296 |
- |
297 |
-- // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but |
298 |
-+ // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but |
299 |
- // also returns the number of bytes it decoded in the same parameter. |
300 |
- sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz; |
301 |
-- nBytesDecoded = avcodec_decode_audio2(sc->m_codecCtx, |
302 |
-+ nBytesDecoded = avcodec_decode_audio3(sc->m_codecCtx, |
303 |
- sc->m_decodedAudioSamples, // out |
304 |
- &sc->m_decodedAudioSamplesValidSiz, // in/out |
305 |
- pDecode, nDecodeSiz); // in |
306 |
|
307 |
diff --git a/media-sound/audacity/files/audacity-1.3.14-typecast.patch b/media-sound/audacity/files/audacity-1.3.14-typecast.patch |
308 |
deleted file mode 100644 |
309 |
index c010461..0000000 |
310 |
--- a/media-sound/audacity/files/audacity-1.3.14-typecast.patch |
311 |
+++ /dev/null |
312 |
@@ -1,15 +0,0 @@ |
313 |
---- audacity-src-1.3.14-beta/src/TrackPanel.cpp.orig |
314 |
-+++ audacity-src-1.3.14-beta/src/TrackPanel.cpp |
315 |
-@@ -2915,7 +2915,11 @@ |
316 |
- { |
317 |
- // Make sure we always have the first linked track of a stereo track |
318 |
- if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack)) |
319 |
-- mouseTrack = mTracks->GetLink(mouseTrack); |
320 |
-+ mouseTrack = |
321 |
-+#ifndef USE_MIDI |
322 |
-+ (WaveTrack*) |
323 |
-+#endif |
324 |
-+ mTracks->GetLink(mouseTrack); |
325 |
- |
326 |
- // Temporary apply the offset because we want to see if the |
327 |
- // track fits with the desired offset |