[proaudio] [2076] audacity live ebuild fix bug #114 (thx mystica555)

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [2076] audacity live ebuild fix bug #114 (thx mystica555)
From: subversion@xxxxxxxxxxxxx
Date: Sat, 21 Jan 2012 14:36:24 +0100

Revision: 2076
Author:   evermind
Date:     2012-01-21 14:36:23 +0100 (Sat, 21 Jan 2012)
Log Message:
-----------
audacity live ebuild fix bug #114 (thx mystica555)

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/audacity/ChangeLog
    trunk/overlays/proaudio/media-sound/audacity/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/audacity/audacity-99999999.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
    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	2012-01-21 13:36:21 UTC (rev 2075)
+++ trunk/overlays/proaudio/media-sound/audacity/ChangeLog	2012-01-21 13:36:23 UTC (rev 2076)
@@ -1,7 +1,13 @@
 # ChangeLog for media-sound/audacity
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*audacity-99999999 (21 Jan 2012)
+
+  21 Jan 2012; Frieder Buerzele <evermind@xxxxxxxxxxxxx> -audacity-9999.ebuild,
+  -files/audacity-9999-ffmpeg.patch, +audacity-99999999.ebuild:
+  fix bug into #114 (thx mystica555)
+
   12 Nov 2010; Hakan Demiralp <keenblade@xxxxxxxxxxxxx>
   audacity-9999.ebuild, +files/audacity-9999-ffmpeg.patch, metadata.xml:
   Updated live ebuild wrt #104 by "cynapsia"

Modified: trunk/overlays/proaudio/media-sound/audacity/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/Manifest	2012-01-21 13:36:21 UTC (rev 2075)
+++ trunk/overlays/proaudio/media-sound/audacity/Manifest	2012-01-21 13:36:23 UTC (rev 2076)
@@ -1,5 +1,4 @@
-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 2766 RMD160 caa54055ebb3ff8352dea5a97f93cb97f510e45d SHA1 18d5816d610268f119f04938fa9ebe7b6aa5e317 SHA256 bff668cd19aff8918f93515447c3e1a66f80622b30d9b26082d1f499a708b85a
-MISC ChangeLog 563 RMD160 fc4396810891da87e4ffcddf5e47c35ec9a513c5 SHA1 b2b0d5ed196c0d24d7604f86299b5d6341738285 SHA256 7285e2a9b7acd1672430632a032c31a78c07c4d0cc94e7564827207f224ab331
+EBUILD audacity-99999999.ebuild 2709 RMD160 1df49977887ed23fe78d513854e58f8cf330ca61 SHA1 1f0253f7a7ce5f99e73abe64ff4c6e30b54dee21 SHA256 83bbc75cb96396755d4f2c5ac0cf8a0a1f75c06ad702cb8b78a34b80ce6dd5ab
+MISC ChangeLog 779 RMD160 9665ab3b5db62fc668e5e323c9bf3d6d5a30fbde SHA1 9b762adaa5043f8d4093410de9ff3795b42ad4eb SHA256 f0fd2f1499078345980f2c16fc6ed55f4becf145852636399d1994eb6497bbce
 MISC metadata.xml 772 RMD160 c9e5f39c7d354d47eb361c57d13b4bb3635d964f SHA1 5c62385d7647607f3c9175cadb495274f1f19f94 SHA256 771a0daf1ca4afe5897ae74a139fe08b5cc6aab78f9e9546978b672f8b8a5c4e

Deleted: trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild	2012-01-21 13:36:21 UTC (rev 2075)
+++ trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild	2012-01-21 13:36:23 UTC (rev 2076)
@@ -1,108 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-
-inherit eutils wxwidgets autotools versionator subversion
-
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 +nyquist sbsms soundtouch twolame unicode vamp vorbis"
-
-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=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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 )
-	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}/${MY_P}
-
-src_unpack() {
-	echo "${ESVN_REPO_URI}"
-	subversion_src_unpack
-	cd "${ESVN_STORE_DIR}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-9999-ffmpeg.patch"
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-	local myconf
-
-	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="${myconf}"
-	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_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() {
-	emake DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf "${D}"/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt
-}

Copied: trunk/overlays/proaudio/media-sound/audacity/audacity-99999999.ebuild (from rev 2075, trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/audacity-99999999.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/audacity-99999999.ebuild	2012-01-21 13:36:23 UTC (rev 2076)
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils wxwidgets autotools versionator subversion
+
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis"
+
+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=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+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 )
+	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 )"
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	echo "${ESVN_REPO_URI}"
+	subversion_src_unpack
+	cd "${ESVN_STORE_DIR}"
+}
+
+src_prepare() {
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+	local myconf
+
+	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="${myconf}"
+	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 \
+		--enable-unicode \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		$(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() {
+	emake DESTDIR="${D}" install || die
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}

Deleted: trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch	2012-01-21 13:36:21 UTC (rev 2075)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-9999-ffmpeg.patch	2012-01-21 13:36:23 UTC (rev 2076)
@@ -1,52 +0,0 @@
---- 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);

Messages sorted by: [ date | thread ]
Prev by Date: [proaudio] [2075] fix pyliblo hopefully (thx Arve Barsnes)
Next by Date: [proaudio] [2077] fix bug #113 (thx Trainzer)
Previous by thread: [proaudio] [2075] fix pyliblo hopefully (thx Arve Barsnes)
Next by thread: [proaudio] [2077] fix bug #113 (thx Trainzer)

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/