Revision: 1804
Author: keenblade
Date: 2010-11-12 10:06:46 +0100 (Fri, 12 Nov 2010)
Log Message:
-----------
audacity-9999: updated live ebuild
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/audacity/ChangeLog
trunk/overlays/proaudio/media-sound/audacity/Manifest
trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
trunk/overlays/proaudio/media-sound/audacity/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch
Modified: trunk/overlays/proaudio/media-sound/audacity/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/ChangeLog 2010-11-10
19:18:37 UTC (rev 1803)
+++ trunk/overlays/proaudio/media-sound/audacity/ChangeLog 2010-11-12
09:06:46 UTC (rev 1804)
@@ -2,7 +2,11 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 11 Aug 2010; Hakan Demiralp <[email protected] audacity-9999.ebuild:
+ 12 Nov 2010; Hakan Demiralp <[email protected]>
+ audacity-9999.ebuild, +files/audacity-9999-ffmpeg.patch, metadata.xml:
+ Updated live ebuild wrt #104 by "cynapsia"
+
+ 11 Aug 2010; Hakan Demiralp <[email protected]> audacity-9999.ebuild:
media-libs/vamp-plugin-sdk is used in the ebuild instead of dev-lib
category. Thanks to audiodef
Modified: trunk/overlays/proaudio/media-sound/audacity/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/Manifest 2010-11-10
19:18:37 UTC (rev 1803)
+++ trunk/overlays/proaudio/media-sound/audacity/Manifest 2010-11-12
09:06:46 UTC (rev 1804)
@@ -1,4 +1,5 @@
+AUX audacity-9999-ffmpeg.patch 2247 RMD160
278ecc43b796dc272be6d70cd4d233d5e5704ddd SHA1
601b893304d359596919acd1429764910035692d SHA256
07d325b3a3aacb2b264327c4d57d5769dbab3dce13f32c91cafe8c64db7e8a08
AUX audacity-9999-gentoo.patch 18178 RMD160
7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 SHA1
872a8d48bbd68ab64d09c064763340aa8a44db1e SHA256
2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655
-EBUILD audacity-9999.ebuild 2572 RMD160
5314c39a38871480ca77a778f3e2141e744eaa23 SHA1
d857b597ba563e012e8c95d72862d9aeb872a104 SHA256
eda413ad47a4d811911e74cb93be635b36168ff7aa5d90ed5b16cf9f9c7f5b3d
-MISC ChangeLog 387 RMD160 b568f66c8913789680c7a8491516abede874fc83 SHA1
2d52521ad4bd6e42dde5de28904cfa6df1d20d1b SHA256
bac78daab108e135c3f8e74e418fd558aad24f077194e3e332b2307f63bb9d2c
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+EBUILD audacity-9999.ebuild 2766 RMD160
caa54055ebb3ff8352dea5a97f93cb97f510e45d SHA1
18d5816d610268f119f04938fa9ebe7b6aa5e317 SHA256
bff668cd19aff8918f93515447c3e1a66f80622b30d9b26082d1f499a708b85a
+MISC ChangeLog 563 RMD160 fc4396810891da87e4ffcddf5e47c35ec9a513c5 SHA1
b2b0d5ed196c0d24d7604f86299b5d6341738285 SHA256
7285e2a9b7acd1672430632a032c31a78c07c4d0cc94e7564827207f224ab331
+MISC metadata.xml 772 RMD160 c9e5f39c7d354d47eb361c57d13b4bb3635d964f SHA1
5c62385d7647607f3c9175cadb495274f1f19f94 SHA256
771a0daf1ca4afe5897ae74a139fe08b5cc6aab78f9e9546978b672f8b8a5c4e
Modified: trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
2010-11-10 19:18:37 UTC (rev 1803)
+++ trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
2010-11-12 09:06:46 UTC (rev 1804)
@@ -2,98 +2,99 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
+EAPI="2"
+WX_GTK_VER="2.8"
-inherit eutils autotools wxwidgets cvs subversion
+inherit eutils wxwidgets autotools versionator subversion
-IUSE="flac ladspa libsamplerate mp3 unicode vamp vorbis pa-devel"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 +nyquist
sbsms soundtouch twolame unicode vamp vorbis"
-MY_P="${PN}-src-${PV}"
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}-beta"
+MY_T="${PN}-minsrc-${MY_PV}-beta"
DESCRIPTION="Free crossplatform audio editor"
HOMEPAGE="http://audacity.sourceforge.net/";
+ESVN_REPO_URI="http://${PN}.googlecode.com/svn/${PN}-src/trunk/";
+SRC_URI=""
-ECVS_SERVER="audacity.cvs.sourceforge.net:/cvsroot/audacity"
-ECVS_MODULE="${PN}"
-
-ESVN_REPO_URI="https://www.portaudio.com/repos/portaudio/branches/v19-devel";
-
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
RESTRICT="test"
-DEPEND=">=x11-libs/wxGTK-2.6
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
>=app-arch/zip-2.3
- dev-libs/expat
>=media-libs/libsndfile-1.0.0
- >=media-libs/libsoundtouch-1.3.1
- vorbis? ( >=media-libs/libvorbis-1.0 )
- mp3? ( >=media-libs/libmad-0.14.2b
- media-libs/libid3tag )
- flac? ( media-libs/flac )
+ dev-libs/expat
libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- vamp? ( media-libs/vamp-plugin-sdk )"
-RDEPEND="${DEPEND}
+ 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 )
+ soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+ vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+ twolame? ( media-sound/twolame )
+ ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
+ alsa? ( media-libs/alsa-lib )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+
+RDEPEND="${COMMON_DEPEND}
mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
-S="${WORKDIR}/${ECVS_MODULE}"
+S=${WORKDIR}/${MY_P}
-pkg_setup() {
- if use pa-devel; then
- ewarn "You enabled the pa-devel useflag. This will fetch the
portaudio"
- ewarn "v19-devel from SVN and replace the one shipped with
${PN} SVN"
- ewarn "Note: this might lead to horrible compile and/or runtime
errors!"
- fi
+src_unpack() {
+ echo "${ESVN_REPO_URI}"
+ subversion_src_unpack
+ cd "${ESVN_STORE_DIR}"
}
-src_unpack() {
- cvs_src_unpack
-
- cd "${S}"
- #epatch "${FILESDIR}/${P}-gentoo.patch"
- #epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
-
- #eautoreconf || die
-
- if use pa-devel; then
- subversion_src_unpack
- cd lib-src
- rm -r portaudio-v19
- cp -R "${ESVN_STORE_DIR}/${PN}/v19-devel" portaudio-v19
- fi
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-9999-ffmpeg.patch"
+ AT_M4DIR="${S}/m4" eautoreconf
}
-src_compile() {
+src_configure() {
+ need-wxwidgets unicode
local myconf
- if has_version "=x11-libs/wxGTK-2.8*"; then
- myconf="--with-wx-version=2.8"
+ if use sbsms && use soundtouch ; then
+ echo
+ einfo "You have USE='soundtouch sbsms' It is not possible to
use both, so"
+ einfo "SOUNDTOUCH has been selected by default."
+ echo
+ myconf="${myconf}"
+ elif use sbsms && ! use soundtouch ; then
+ myconf="${myconf} --with-sbsms"
else
- myconf="--with-wx-version=2.6"
+ myconf="${myconf}"
fi
- myconf="${myconf} --with-libsndfile=system"
- myconf="${myconf} --with-libexpat=system"
- myconf="${myconf} --with-libsoundtouch=system"
-
- if use libsamplerate ; then
- myconf="${myconf} --with-libsamplerate=system
--without-libresample"
- else
- myconf="${myconf} --without-libsamplerate" #
--with-libresample=local
- fi
-
+ # * always use system libraries if possible
+ # * options listed in the order that configure --help lists them
+ # * if libsamplerate not requested, use libresample instead.
econf \
+ --with-libsndfile=system \
+ --with-expat=system \
$(use_enable unicode) \
+ $(use_enable nyquist) \
$(use_enable ladspa) \
- $(use_enable vamp) \
- $(use_with vorbis vorbis system) \
- $(use_with mp3 libmad system) \
- $(use_with mp3 id3tag system) \
- $(use_with flac flac system) \
- ${myconf} || die
-
- emake || die
+ $(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 soundtouch) \
+ $(use_with vamp libvamp) \
+ $(use_with twolame libtwolame) \
+ $(use_with ffmpeg) \
+ $(use_with midi) \
+ $(use_with alsa) \
+ $(use_with jack) \
+ ${myconf}
}
src_install() {
@@ -104,7 +105,4 @@
# Install our docs
dodoc README.txt
-
- insinto /usr/share/audacity/
- newins images/AudacityLogo48x48.xpm audacity.xpm
}
Added:
trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch
2010-11-12 09:06:46 UTC (rev 1804)
@@ -0,0 +1,52 @@
+--- audacity-src-1.3.12-beta.orig/src/FFmpeg.cpp 2010-03-30
04:28:54.000000000 -0700
++++ audacity-src-1.3.12-beta/src/FFmpeg.cpp 2010-10-26 12:22:02.145695409
-0700
+@@ -204,7 +204,11 @@
+ return ret;
+ }
+
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
++static int ufile_write(URLContext *h, const unsigned char *buf, int size)
++#else
+ static int ufile_write(URLContext *h, unsigned char *buf, int size)
++#endif
+ {
+ return (int) ((wxFile *) h->priv_data)->Write(buf, size);
+ }
+@@ -356,7 +360,11 @@
+ }
+ // Otherwize, resort to extension matching if available
+ else if (fmt1->extensions) {
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
++ if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) {
++#else
+ if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) {
++#endif
+ score = 50;
+ }
+ }
+@@ -829,7 +837,11 @@
+ INITDYN(avformat,av_open_input_file);
+ INITDYN(avformat,av_open_input_stream);
+ INITDYN(avformat,get_buffer);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
++ INITDYN(avformat,av_match_ext);
++#else
+ INITDYN(avformat,match_ext);
++#endif
+
+ #if FFMPEG_STABLE
+ INITDYN(avformat,av_init_packet);
+--- audacity-src-1.3.12-beta.orig/src/FFmpeg.h 2010-03-30 04:28:54.000000000
-0700
++++ audacity-src-1.3.12-beta/src/FFmpeg.h 2010-10-26 12:23:02.618168997
-0700
+@@ -224,7 +224,11 @@
+ AVStream* (*av_new_stream) (AVFormatContext *s,
int id);
+ AVFormatContext* (*av_alloc_format_context) (void);
+ AVOutputFormat* (*guess_format) (const char
*short_name, const char *filename, const char *mime_type);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 60, 0)
++ int (*av_match_ext) (const char *filename,
const char *extensions);
++#else
+ int (*match_ext) (const char *filename,
const char *extensions);
++#endif
+ int (*av_write_trailer) (AVFormatContext *s);
+ int (*av_interleaved_write_frame) (AVFormatContext *s,
AVPacket *pkt);
+ int (*av_write_frame) (AVFormatContext *s,
AVPacket *pkt);
Modified: trunk/overlays/proaudio/media-sound/audacity/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/metadata.xml 2010-11-10
19:18:37 UTC (rev 1803)
+++ trunk/overlays/proaudio/media-sound/audacity/metadata.xml 2010-11-12
09:06:46 UTC (rev 1804)
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>[email protected]</email>
- <name>pro-audio overlay team</name>
- </maintainer>
+ <herd>no-herd</herd>
+ <maintainer>
+ <email>[email protected]</email>
+ <name>pro-audio overlay team</name>
+ </maintainer>
+ <use>
+ <flag name='id3tag'>use libid3tag for mp3 id3 tag support</flag>
+ <flag name='midi'>use portSMF for Midi support</flag>
+ <flag name='nyquist'>enable Nyquist plug-in support</flag>
+ <flag name='soundtouch'>use libSoundTouch for pitch and tempo
changing</flag>
+ <flag name='sbsms'>use libsbsms for pitch and tempo changing</flag>
+ <flag name='twolame'>use libtwolame for MP2 export support</flag>
+ <flag name='vamp'>use libvamp for Vamp plug-in support</flag>
+ </use>
</pkgmetadata>
