[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     cb7aafd6bb1bc403b096383487b0c996f7a8257b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 12:18:49 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 12:22:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7aafd6

media-sound/audacity: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/audacity/Manifest                      |   1 -
 media-sound/audacity/audacity-2.0.2.ebuild         |  98 ------------
 .../audacity/files/audacity-1.3.13-ffmpeg.patch    | 164 ---------------------
 .../audacity/files/audacity-1.3.14-typecast.patch  |  15 --
 4 files changed, 278 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index a630944..b4de984 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,5 @@
 DIST audacity-manual-2.1.1.zip 20224419 SHA256 fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84 WHIRLPOOL 4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
 DIST audacity-manual-2.1.2.zip 20533055 SHA256 5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8 WHIRLPOOL 64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
-DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e WHIRLPOOL 3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004 WHIRLPOOL 106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
 DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d WHIRLPOOL 240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
 DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da WHIRLPOOL 7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f

diff --git a/media-sound/audacity/audacity-2.0.2.ebuild b/media-sound/audacity/audacity-2.0.2.ebuild
deleted file mode 100644
index 438ab4e..0000000
--- a/media-sound/audacity/audacity-2.0.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils wxwidgets autotools versionator
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/"
-SRC_URI="mirror://gentoo/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis"
-RESTRICT="test"
-
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
-	>=app-arch/zip-2.3
-	>=media-libs/libsndfile-1.0.0
-	dev-libs/expat
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mp3? ( >=media-libs/libmad-0.14.2b )
-	flac? ( >=media-libs/flac-1.2.0[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	twolame? ( media-sound/twolame )
-	ffmpeg? ( virtual/ffmpeg )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#	lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-	mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
-
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	# * if libsamplerate not requested, use libresample instead.
-	econf \
-		--enable-unicode \
-		--enable-nyquist \
-		$(use_enable ladspa) \
-		--with-libsndfile=system \
-		--with-expat=system \
-		$(use_with libsamplerate) \
-		$(use_with !libsamplerate libresample) \
-		$(use_with vorbis libvorbis) \
-		$(use_with mp3 libmad) \
-		$(use_with flac libflac) \
-		$(use_with id3tag libid3tag) \
-		$(use_with sbsms) \
-		$(use_with soundtouch) \
-		$(use_with vamp libvamp) \
-		$(use_with twolame libtwolame) \
-		$(use_with ffmpeg) \
-		$(use_with midi) \
-		$(use_with alsa) \
-		$(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-}

diff --git a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch
deleted file mode 100644
index 6754709..0000000
--- a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch
+++ /dev/null
@@ -1,164 +0,0 @@
---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpeg.cpp
-+++ audacity-src-1.3.13-beta/src/export/ExportFFmpeg.cpp
-@@ -352,7 +352,7 @@
-    avcodec_get_context_defaults(mEncAudioCodecCtx);
- 
-    mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
--   mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
-+   mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO;
-    mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
-    mSampleRate = (int)project->GetRate();
-    mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by default;
-@@ -403,7 +403,6 @@
-       mEncAudioCodecCtx->flags2 = 0;
-       if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
-       if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
--      mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
-       mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
-       mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
-       mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
-@@ -569,7 +569,7 @@
-       pkt.stream_index = mEncAudioStream->index;
-       pkt.data = mEncAudioEncodedBuf;
-       pkt.size = nEncodedBytes;
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
- 
-       // Set presentation time of frame (currently in the codec's timebase) in the stream timebase.
-       if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts != int64_t(AV_NOPTS_VALUE))
-@@ -656,7 +656,7 @@
- 
-       pkt.stream_index = mEncAudioStream->index;
-       pkt.data = mEncAudioEncodedBuf;
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
- 
-       // Write the encoded audio frame to the output file.
-       if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0)
---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpegDialogs.cpp
-+++ audacity-src-1.3.13-beta/src/export/ExportFFmpegDialogs.cpp
-@@ -1288,7 +1288,7 @@
-    while ((codec = av_codec_next(codec)))
-    {
-       // We're only interested in audio and only in encoders
--      if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
-+      if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
-       {
-          mCodecNames.Add(wxString::FromUTF8(codec->name));
-          mCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str()));
-@@ -1528,7 +1528,7 @@
-          // Find the codec, that is claimed to be compatible
-          AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec);
-          // If it exists, is audio and has encoder
--         if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode)
-+         if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode)
-          {
-             // If it was selected - remember it's new index
-             if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount();
-@@ -1543,7 +1543,7 @@
-       AVCodec *codec = NULL;
-       while ((codec = av_codec_next(codec)))
-       {
--         if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
-+         if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
-          {
-             if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0)
-             {
-@@ -1563,7 +1563,7 @@
-       if (format != NULL)
-       {
-          AVCodec *codec = avcodec_find_encoder(format->audio_codec);
--         if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode)
-+         if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode)
-          {
-             if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount();
-             mShownCodecNames.Add(wxString::FromUTF8(codec->name));
---- audacity-src-1.3.13-beta.orig/src/FFmpeg.cpp
-+++ audacity-src-1.3.13-beta/src/FFmpeg.cpp
-@@ -316,7 +316,7 @@
-    pd.buf_size = 0;
-    pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
-    if (pd.buf == NULL) {
--      err = AVERROR_NOMEM;
-+      err = AVERROR(ENOMEM);
-       goto fail;
-    }
- 
-@@ -381,7 +381,7 @@
- 
-    // Didn't find a suitable format, so bail
-    if (!fmt) {
--      err = AVERROR_NOFMT;
-+      err = AVERROR(EILSEQ);
-       goto fail;
-    }
- 
-@@ -855,7 +855,6 @@
-    FFMPEG_INITDYN(codec, avcodec_find_decoder);
-    FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
-    FFMPEG_INITDYN(codec, avcodec_open);
--   FFMPEG_INITDYN(codec, avcodec_decode_audio2);
-    FFMPEG_INITDYN(codec, avcodec_decode_audio3);
-    FFMPEG_INITDYN(codec, avcodec_encode_audio);
-    FFMPEG_INITDYN(codec, avcodec_close);
---- audacity-src-1.3.13-beta.orig/src/FFmpeg.h
-+++ audacity-src-1.3.13-beta/src/FFmpeg.h
-@@ -559,7 +559,11 @@
-    FFMPEG_FUNCTION_WITH_RETURN(
-       void*,
-       av_fast_realloc,
-+#if LIBAVUTIL_VERSION_MAJOR < 51
-       (void *ptr, unsigned int *size, unsigned int min_size),
-+#else
-+      (void *ptr, unsigned int *size, size_t min_size),
-+#endif
-       (ptr, size, min_size)
-    );
-    FFMPEG_FUNCTION_WITH_RETURN(
-@@ -747,7 +751,11 @@
-    FFMPEG_FUNCTION_WITH_RETURN(
-       void*,
-       av_malloc,
-+#if LIBAVUTIL_VERSION_MAJOR < 51
-       (unsigned int size),
-+#else
-+      (size_t size),
-+#endif
-       (size)
-    );
-    FFMPEG_FUNCTION_NO_RETURN(
---- audacity-src-1.3.13-beta.orig/src/import/ImportFFmpeg.cpp
-+++ audacity-src-1.3.13-beta/src/import/ImportFFmpeg.cpp
-@@ -416,7 +416,7 @@
-    // Fill the stream contexts
-    for (unsigned int i = 0; i < mFormatContext->nb_streams; i++)
-    {
--      if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+      if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-       {
-          //Create a context
-          streamContext *sc = new streamContext;
---- audacity-src-1.3.13-beta.orig/src/ondemand/ODDecodeFFmpegTask.cpp
-+++ audacity-src-1.3.13-beta/src/ondemand/ODDecodeFFmpegTask.cpp
-@@ -156,7 +156,7 @@
-    //test the audio stream(s)
-    for (unsigned int i = 0; i < ic->nb_streams; i++)
-    {
--      if (ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+      if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-       {  
-          audioStreamExists = true;                 
-          st = ic->streams[i];
-@@ -573,10 +573,10 @@
-       }
-    }
- 
--   // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
-+   // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
-    // also returns the number of bytes it decoded in the same parameter.
-    sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
--   nBytesDecoded = avcodec_decode_audio2(sc->m_codecCtx, 
-+   nBytesDecoded = avcodec_decode_audio3(sc->m_codecCtx, 
-       sc->m_decodedAudioSamples,		      // out
-       &sc->m_decodedAudioSamplesValidSiz,	// in/out
-       pDecode, nDecodeSiz);				   // in

diff --git a/media-sound/audacity/files/audacity-1.3.14-typecast.patch b/media-sound/audacity/files/audacity-1.3.14-typecast.patch
deleted file mode 100644
index c010461..0000000
--- a/media-sound/audacity/files/audacity-1.3.14-typecast.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- audacity-src-1.3.14-beta/src/TrackPanel.cpp.orig
-+++ audacity-src-1.3.14-beta/src/TrackPanel.cpp
-@@ -2915,7 +2915,11 @@
-    {
-       // Make sure we always have the first linked track of a stereo track
-       if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack))
--         mouseTrack = mTracks->GetLink(mouseTrack);
-+         mouseTrack = 
-+#ifndef USE_MIDI
-+                      (WaveTrack*)
-+#endif
-+                                   mTracks->GetLink(mouseTrack);
- 
-       // Temporary apply the offset because we want to see if the
-       // track fits with the desired offset