diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-sound/audacity | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-sound/audacity')
-rw-r--r-- | media-sound/audacity/Manifest | 4 | ||||
-rw-r--r-- | media-sound/audacity/audacity-2.0.2.ebuild | 98 | ||||
-rw-r--r-- | media-sound/audacity/audacity-2.0.5.ebuild | 102 | ||||
-rw-r--r-- | media-sound/audacity/audacity-2.1.1.ebuild | 104 | ||||
-rw-r--r-- | media-sound/audacity/files/audacity-1.3.13-automagic.patch | 61 | ||||
-rw-r--r-- | media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch | 164 | ||||
-rw-r--r-- | media-sound/audacity/files/audacity-1.3.14-typecast.patch | 15 | ||||
-rw-r--r-- | media-sound/audacity/metadata.xml | 28 |
8 files changed, 576 insertions, 0 deletions
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest new file mode 100644 index 000000000000..567204ee0f14 --- /dev/null +++ b/media-sound/audacity/Manifest @@ -0,0 +1,4 @@ +DIST audacity-manual-2.1.1.zip 20224419 SHA256 fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84 WHIRLPOOL 4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b +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 diff --git a/media-sound/audacity/audacity-2.0.2.ebuild b/media-sound/audacity/audacity-2.0.2.ebuild new file mode 100644 index 000000000000..438ab4ef3f72 --- /dev/null +++ b/media-sound/audacity/audacity-2.0.2.ebuild @@ -0,0 +1,98 @@ +# 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/audacity-2.0.5.ebuild b/media-sound/audacity/audacity-2.0.5.ebuild new file mode 100644 index 000000000000..11a5e3d14c8f --- /dev/null +++ b/media-sound/audacity/audacity-2.0.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~mips ppc ppc64 x86" +IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate +libsoxr 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 ) + libsoxr? ( media-libs/soxr ) + 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} + app-arch/xz-utils + 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 \ + --disable-dynamic-loading \ + $(use_enable ladspa) \ + --with-libsndfile=system \ + --with-expat=system \ + $(use_with libsamplerate) \ + $(use_with !libsamplerate libresample) \ + $(use_with libsoxr) \ + $(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/audacity-2.1.1.ebuild b/media-sound/audacity/audacity-2.1.1.ebuild new file mode 100644 index 000000000000..da1efd0adf5b --- /dev/null +++ b/media-sound/audacity/audacity-2.1.1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils wxwidgets + +MY_P="${PN}-minsrc-${PV}" +DESCRIPTION="Free crossplatform audio editor" +HOMEPAGE="http://web.audacityteam.org/" +SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${MY_P}.tar.xz + doc? ( http://dev.gentoo.org/~yngwin/distfiles/${PN}-manual-${PV}.zip )" + # wget doesn't seem to work on FossHub links, so we mirror + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav + +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst" +RESTRICT="test" + +RDEPEND=">=app-arch/zip-2.3 + dev-libs/expat + >=media-libs/libsndfile-1.0.0 + =media-libs/portaudio-19* + media-libs/soxr + x11-libs/wxGTK:2.8[X] + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( libav? ( media-video/libav:= ) + !libav? ( >=media-video/ffmpeg-1.2:= ) ) + flac? ( >=media-libs/flac-1.2.0[cxx] ) + id3tag? ( media-libs/libid3tag ) + jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) + lame? ( >=media-sound/lame-3.70 ) + lv2? ( media-libs/lv2 ) + mad? ( >=media-libs/libmad-0.14.2b ) + midi? ( media-libs/portmidi ) + sbsms? ( media-libs/libsbsms ) + soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) + twolame? ( media-sound/twolame ) + vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) + vorbis? ( >=media-libs/libvorbis-1.0 )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +REQUIRED_USE="soundtouch? ( midi )" + +S=${WORKDIR}/${MY_P} + +#src_prepare() { +# epatch "${FILESDIR}"/${P}-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 + econf \ + $(use_enable nls) \ + --enable-unicode \ + $(use_enable cpu_flags_x86_sse sse) \ + --disable-dynamic-loading \ + --enable-nyquist \ + $(use_enable ladspa) \ + $(use_enable vst) \ + --with-wx-version=${WX_GTK_VER} \ + --with-expat=system \ + $(use_with ffmpeg) \ + $(use_with lame) \ + $(use_with flac libflac) \ + $(use_with id3tag libid3tag) \ + $(use_with mad libmad) \ + $(use_with sbsms) \ + --with-libsndfile=system \ + $(use_with soundtouch) \ + --with-libsoxr=system \ + $(use_with twolame libtwolame) \ + $(use_with vamp libvamp) \ + $(use_with vorbis libvorbis) \ + $(use_with lv2) \ + --with-portaudio \ + $(use_with midi) \ + --with-widgetextra=local \ + $(use_with portmixer) +# $(use_with alsa) \ +# $(use_with jack) +} + +src_install() { + emake DESTDIR="${D}" install + + # Remove bad doc install + rm -rf "${D}"/usr/share/doc + + # Install our docs + dodoc README.txt + + use doc && dohtml -r "${WORKDIR}"/help/manual +} diff --git a/media-sound/audacity/files/audacity-1.3.13-automagic.patch b/media-sound/audacity/files/audacity-1.3.13-automagic.patch new file mode 100644 index 000000000000..4e7c2917e5db --- /dev/null +++ b/media-sound/audacity/files/audacity-1.3.13-automagic.patch @@ -0,0 +1,61 @@ +--- audacity-src-1.3.13-beta.orig/configure.in ++++ audacity-src-1.3.13-beta/configure.in +@@ -173,6 +173,9 @@ + lib_preference=$withval, + lib_preference="system local") + ++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)])) ++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)])) ++ + dnl AC_ARG_WITH(wx-version, + dnl [AS_HELP_STRING([--with-wx-version], + dnl [select wxWidgets version (if both installed) [2.8,]])], +@@ -574,13 +577,21 @@ + ;; + *) + dnl Unix +- AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) +- if [[ $have_alsa = "yes" ]] ; then +- LIBS="$LIBS -lasound" +- fi +- PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no) +- if [[ $have_jack = "yes" ]] ; then +- LIBS="$LIBS $JACK_LIBS" ++ if test "x$with_alsa" != "xno"; then ++ AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) ++ if [[ $have_alsa = "yes" ]] ; then ++ LIBS="$LIBS -lasound" ++ else ++ AC_MSG_WARN([Support for alsa not available]) ++ fi ++ fi ++ if test "x$with_jack" != "xno"; then ++ PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no) ++ if [[ $have_jack = "yes" ]] ; then ++ LIBS="$LIBS $JACK_LIBS" ++ else ++ AC_MSG_WARN([Support for jack not available]) ++ fi + fi + AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm) + if [[ $have_asihpi = "yes" ]] ; then +--- audacity-src-1.3.13-beta.orig/lib-src/portmixer/configure.ac ++++ audacity-src-1.3.13-beta/lib-src/portmixer/configure.ac +@@ -31,6 +31,8 @@ + [AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)], + [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)]) + ++AC_ARG_WITH([alsa], AC_HELP_STRING([--without-alsa], [Build without alsa library (default: test)])) ++ + # + # Check for portaudio path + # +@@ -133,7 +135,7 @@ + have_support=yes + fi + +-if [[ $have_alsa = "yes" ]] ; then ++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then + AC_MSG_NOTICE([Including support for ALSA]) + AC_DEFINE(PX_USE_LINUX_ALSA) + objects="$objects px_linux_alsa.o" diff --git a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch new file mode 100644 index 000000000000..675470913c8d --- /dev/null +++ b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch @@ -0,0 +1,164 @@ +--- 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 new file mode 100644 index 000000000000..c01046143b21 --- /dev/null +++ b/media-sound/audacity/files/audacity-1.3.14-typecast.patch @@ -0,0 +1,15 @@ +--- 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 diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml new file mode 100644 index 000000000000..efb5914d2975 --- /dev/null +++ b/media-sound/audacity/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>proaudio</herd> + <maintainer> + <email>richard@audacityteam.org</email> + <name>Richard Ash</name> + <description>Upstream - please CC on bugs that concerns upstream</description> + </maintainer> + <use> + <flag name="id3tag">Enables ID3 tagging with id3tag library</flag> + <flag name="libsoxr"> + Uses <pkg>media-libs/soxr</pkg> as audio resampling library: Better + quality than the included resampler and much faster than libsamplerate + while keeping almost the same quality. + </flag> + <flag name="lv2">Add support for Ladspa V2</flag> + <flag name="midi">Enables MIDI support</flag> + <flag name="portmixer">Enable the internal portmixer feature</flag> + <flag name="sbsms">Enables sbsms library support for slower, more accurate + pitch and tempo changing</flag> + <flag name="soundtouch">Enables soundtouch library support for pitch and + tempo changing</flag> + <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag> + <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag> + <flag name="vst">Enable VST plugin support</flag> + </use> +</pkgmetadata> |