summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2010-11-09 20:36:36 +0000
committerTim Harder <radhermit@gentoo.org>2010-11-09 20:36:36 +0000
commit121316e1c9557be48ae015108fe0e0f78c317f38 (patch)
treedf2852df299653d31f1bfa6bb42b68cc3609dcab /media-sound/audacity
parentBuild the libsphinxclient library as well and fix prefix issues with patches ... (diff)
downloadgentoo-2-121316e1c9557be48ae015108fe0e0f78c317f38.tar.gz
gentoo-2-121316e1c9557be48ae015108fe0e0f78c317f38.tar.bz2
gentoo-2-121316e1c9557be48ae015108fe0e0f78c317f38.zip
Fix portaudio build errors with non-bash shells (bug #343831 by Marc Joliet). Thanks to Richard Ash for the patch. Also, use ${P} instead of ${PN}-1.3.12 for patches.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/audacity')
-rw-r--r--media-sound/audacity/ChangeLog8
-rw-r--r--media-sound/audacity/audacity-1.3.12.ebuild9
-rw-r--r--media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch12
3 files changed, 24 insertions, 5 deletions
diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 3ad23b3874a2..d55cad292332 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-sound/audacity
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.144 2010/10/27 03:09:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.145 2010/11/09 20:36:36 radhermit Exp $
+
+ 09 Nov 2010; Tim Harder <radhermit@gentoo.org> audacity-1.3.12.ebuild,
+ +files/audacity-1.3.12-portaudio-shell.patch:
+ Fix portaudio build errors with non-bash shells (bug #343831 by Marc
+ Joliet). Thanks to Richard Ash for the patch. Also, use ${P} instead of
+ ${PN}-1.3.12 for patches.
27 Oct 2010; Tim Harder <radhermit@gentoo.org> audacity-1.3.8.ebuild:
Apply patch to fix build errors with recent versions of ffmpeg (fixes bug
diff --git a/media-sound/audacity/audacity-1.3.12.ebuild b/media-sound/audacity/audacity-1.3.12.ebuild
index 0f5c0cde8059..e383a9cf5629 100644
--- a/media-sound/audacity/audacity-1.3.12.ebuild
+++ b/media-sound/audacity/audacity-1.3.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.3 2010/10/26 21:22:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.4 2010/11/09 20:36:36 radhermit Exp $
EAPI=2
@@ -48,9 +48,10 @@ DEPEND="${COMMON_DEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}/${PN}-1.3.12-automagic.patch"
- epatch "${FILESDIR}/${PN}-1.3.12-gcc45.patch"
- epatch "${FILESDIR}/${PN}-1.3.12-ffmpeg.patch"
+ epatch "${FILESDIR}/${P}-automagic.patch"
+ epatch "${FILESDIR}/${P}-gcc45.patch"
+ epatch "${FILESDIR}/${P}-ffmpeg.patch"
+ epatch "${FILESDIR}/${P}-portaudio-shell.patch"
AT_M4DIR="${S}/m4" eautoreconf
}
diff --git a/media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch b/media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch
new file mode 100644
index 000000000000..f24daf7cea6b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.12-portaudio-shell.patch
@@ -0,0 +1,12 @@
+Index: lib-src/portaudio-v19/Makefile.in
+===================================================================
+--- lib-src/portaudio-v19/Makefile.in (revision 10742)
++++ lib-src/portaudio-v19/Makefile.in (revision 10743)
+@@ -22,6 +22,7 @@
+ LIBS = @LIBS@
+ AR = @AR@
+ RANLIB = @RANLIB@
++SHELL = @SHELL@
+ LIBTOOL = @LIBTOOL@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@