Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/sox: ChangeLog sox-14.3.1.ebuild
Date: Thu, 29 Apr 2010 11:47:26
Message-Id: 20100429114659.ECB512C04C@corvid.gentoo.org
1 ssuominen 10/04/29 11:46:59
2
3 Modified: ChangeLog sox-14.3.1.ebuild
4 Log:
5 Fix building with USE="-mad" wrt #317595 by Sergiy Borodych.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.119 media-sound/sox/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/ChangeLog?rev=1.119&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/ChangeLog?rev=1.119&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/ChangeLog?r1=1.118&r2=1.119
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v
18 retrieving revision 1.118
19 retrieving revision 1.119
20 diff -u -r1.118 -r1.119
21 --- ChangeLog 23 Apr 2010 12:18:17 -0000 1.118
22 +++ ChangeLog 29 Apr 2010 11:46:59 -0000 1.119
23 @@ -1,6 +1,10 @@
24 # ChangeLog for media-sound/sox
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.118 2010/04/23 12:18:17 aballier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.119 2010/04/29 11:46:59 ssuominen Exp $
28 +
29 + 29 Apr 2010; Samuli Suominen <ssuominen@g.o> sox-14.3.1.ebuild,
30 + +files/sox-14.3.1-nomad.patch:
31 + Fix building with USE="-mad" wrt #317595 by Sergiy Borodych.
32
33 *sox-14.3.1 (23 Apr 2010)
34
35
36
37
38 1.2 media-sound/sox/sox-14.3.1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild?r1=1.1&r2=1.2
43
44 Index: sox-14.3.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- sox-14.3.1.ebuild 23 Apr 2010 12:18:17 -0000 1.1
51 +++ sox-14.3.1.ebuild 29 Apr 2010 11:46:59 -0000 1.2
52 @@ -1,8 +1,9 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.1 2010/04/23 12:18:17 aballier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.2 2010/04/29 11:46:59 ssuominen Exp $
57
58 -inherit flag-o-matic
59 +EAPI=2
60 +inherit eutils flag-o-matic
61
62 DESCRIPTION="The swiss army knife of sound processing programs"
63 HOMEPAGE="http://sox.sourceforge.net"
64 @@ -13,7 +14,9 @@
65 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
66 IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg oss png pulseaudio sndfile wavpack"
67
68 -RDEPEND="alsa? ( media-libs/alsa-lib )
69 +# libtool required for libltdl
70 +RDEPEND="sys-devel/libtool
71 + alsa? ( media-libs/alsa-lib )
72 amr? ( media-libs/opencore-amr )
73 encode? ( media-sound/lame )
74 flac? ( media-libs/flac )
75 @@ -31,11 +34,16 @@
76 DEPEND="${RDEPEND}
77 dev-util/pkgconfig"
78
79 -src_compile () {
80 +src_prepare() {
81 + epatch "${FILESDIR}"/${P}-nomad.patch
82 +}
83 +
84 +src_configure() {
85 # Fixes wav segfaults. See Bug #35745.
86 append-flags -fsigned-char
87
88 - econf $(use_with alsa) \
89 + econf \
90 + $(use_with alsa) \
91 $(use_enable debug) \
92 $(use_with ao) \
93 $(use_with oss) \
94 @@ -53,11 +61,9 @@
95 $(use_with pulseaudio) \
96 $(use_with wavpack) \
97 --with-distro="Gentoo"
98 -
99 - emake || die "emake failed."
100 }
101
102 src_install() {
103 - emake DESTDIR="${D}" install || die "emake install failed."
104 + emake DESTDIR="${D}" install || die
105 dodoc NEWS ChangeLog README AUTHORS
106 }