diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-11-14 09:35:12 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-11-14 09:35:12 +0000 |
| commit | c9acd821e49ae1f9f87779c3783c190904fed267 (patch) | |
| tree | f6c79352f14e4da9058f18aa096e4c1b9062c4ce /media-sound | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-c9acd821e49ae1f9f87779c3783c190904fed267.tar.gz gentoo-2-c9acd821e49ae1f9f87779c3783c190904fed267.tar.bz2 gentoo-2-c9acd821e49ae1f9f87779c3783c190904fed267.zip | |
dont try to run sox when building it, it's been dropped in 14.2 and can cause weird problems, bug #246300
(Portage version: 2.2_rc14/cvs/Linux 2.6.27.5 x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/sox/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/sox/files/sox-14.1.0-runsox.patch | 12 | ||||
| -rw-r--r-- | media-sound/sox/sox-14.1.0.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog index b6fb9bc40728..8d1e58c2edc6 100644 --- a/media-sound/sox/ChangeLog +++ b/media-sound/sox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/sox # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.96 2008/11/10 12:11:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.97 2008/11/14 09:35:12 aballier Exp $ + + 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> + +files/sox-14.1.0-runsox.patch, sox-14.1.0.ebuild: + dont try to run sox when building it, it's been dropped in 14.2 and can + cause weird problems, bug #246300 *sox-14.2.0 (10 Nov 2008) diff --git a/media-sound/sox/files/sox-14.1.0-runsox.patch b/media-sound/sox/files/sox-14.1.0-runsox.patch new file mode 100644 index 000000000000..8a959a701ede --- /dev/null +++ b/media-sound/sox/files/sox-14.1.0-runsox.patch @@ -0,0 +1,12 @@ +Index: sox-14.1.0/src/Makefile.in +=================================================================== +--- sox-14.1.0.orig/src/Makefile.in ++++ sox-14.1.0/src/Makefile.in +@@ -2899,7 +2899,6 @@ uninstall-am: uninstall-binPROGRAMS unin + all: sox$(EXEEXT) play rec soxi sox_sample_test$(EXEEXT) example0$(EXEEXT) example1$(EXEEXT) example2$(EXEEXT) + + play rec soxi: sox$(EXEEXT) +- ./sox --help > /dev/null + test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@ + + install-exec-hook: diff --git a/media-sound/sox/sox-14.1.0.ebuild b/media-sound/sox/sox-14.1.0.ebuild index 93e9613ae46c..b3bbf1eead7e 100644 --- a/media-sound/sox/sox-14.1.0.ebuild +++ b/media-sound/sox/sox-14.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.1.0.ebuild,v 1.7 2008/11/09 17:20:35 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.1.0.ebuild,v 1.8 2008/11/14 09:35:12 aballier Exp $ inherit flag-o-matic eutils @@ -34,6 +34,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-lavc.patch" + epatch "${FILESDIR}/${P}-runsox.patch" } src_compile () { |