| 1 |
ssuominen 09/07/10 01:07:23 |
| 2 |
|
| 3 |
Modified: darkice-0.19.ebuild ChangeLog |
| 4 |
Removed: darkice-0.18.1.ebuild |
| 5 |
Log: |
| 6 |
Fix building with GLIBC 2.10 and GCC 4.4 wrt #277216, thanks to Diego E. 'Flameeyes' Pettenò. |
| 7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 media-sound/darkice/darkice-0.19.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: darkice-0.19.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- darkice-0.19.ebuild 25 Jun 2009 17:42:10 -0000 1.6 |
| 23 |
+++ darkice-0.19.ebuild 10 Jul 2009 01:07:23 -0000 1.7 |
| 24 |
@@ -1,7 +1,8 @@ |
| 25 |
# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild,v 1.6 2009/06/25 17:42:10 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/darkice-0.19.ebuild,v 1.7 2009/07/10 01:07:23 ssuominen Exp $ |
| 29 |
|
| 30 |
+EAPI=2 |
| 31 |
inherit eutils |
| 32 |
|
| 33 |
DESCRIPTION="IceCast live streamer, delivering ogg and mp3 streams simultaneously to multiple hosts." |
| 34 |
@@ -11,7 +12,7 @@ |
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="amd64 hppa ppc sparc x86" |
| 38 |
-IUSE="aac alsa encode jack twolame vorbis" |
| 39 |
+IUSE="aac alsa jack mp3 twolame vorbis" |
| 40 |
|
| 41 |
RDEPEND="encode? ( media-sound/lame ) |
| 42 |
vorbis? ( media-libs/libvorbis ) |
| 43 |
@@ -19,33 +20,35 @@ |
| 44 |
twolame? ( media-sound/twolame ) |
| 45 |
alsa? ( media-libs/alsa-lib ) |
| 46 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 47 |
- !encode? ( !vorbis? ( !aac? ( !twolame? ( media-libs/libvorbis ) ) ) )" |
| 48 |
+ !mp3? ( !vorbis? ( !aac? ( !twolame? ( media-sound/lame ) ) ) )" |
| 49 |
DEPEND="${RDEPEND}" |
| 50 |
|
| 51 |
src_unpack() { |
| 52 |
unpack ${A} |
| 53 |
cd "${S}" |
| 54 |
- epatch "${FILESDIR}"/${PN}-0.18.1-gcc43.patch |
| 55 |
+ epatch "${FILESDIR}"/${PN}-0.18.1-gcc43.patch \ |
| 56 |
+ "${FILESDIR}"/${P}-gcc44.patch |
| 57 |
} |
| 58 |
|
| 59 |
-src_compile() { |
| 60 |
- if ! use encode && ! use vorbis && ! use aac && ! use twolame; then |
| 61 |
- ewarn "One of USE flags encode, vorbis, aac, or twolame is required." |
| 62 |
- ewarn "Selecting vorbis for you." |
| 63 |
- local myconf="--with-vorbis" |
| 64 |
+src_configure() { |
| 65 |
+ local myconf |
| 66 |
+ |
| 67 |
+ if ! use mp3 && ! use vorbis && ! use aac && ! use twolame; then |
| 68 |
+ ewarn "One of USE flags mp3, vorbis, aac, or twolame is required." |
| 69 |
+ ewarn "Selecting mp3 for you." |
| 70 |
+ myconf="--with-lame" |
| 71 |
fi |
| 72 |
|
| 73 |
econf $(use_with aac faac) \ |
| 74 |
$(use_with alsa) \ |
| 75 |
- $(use_with encode lame) \ |
| 76 |
+ $(use_with mp3 lame) \ |
| 77 |
$(use_with jack) \ |
| 78 |
$(use_with twolame) \ |
| 79 |
$(use_with vorbis) \ |
| 80 |
${myconf} |
| 81 |
- emake || die "emake failed." |
| 82 |
} |
| 83 |
|
| 84 |
src_install() { |
| 85 |
- emake DESTDIR="${D}" install || die "emake install failed." |
| 86 |
+ emake DESTDIR="${D}" install || die "emake install failed" |
| 87 |
dodoc AUTHORS ChangeLog FAQ NEWS README TODO |
| 88 |
} |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.55 media-sound/darkice/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/ChangeLog?rev=1.55&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/ChangeLog?rev=1.55&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/darkice/ChangeLog?r1=1.54&r2=1.55 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v |
| 101 |
retrieving revision 1.54 |
| 102 |
retrieving revision 1.55 |
| 103 |
diff -u -r1.54 -r1.55 |
| 104 |
--- ChangeLog 25 Jun 2009 17:42:10 -0000 1.54 |
| 105 |
+++ ChangeLog 10 Jul 2009 01:07:23 -0000 1.55 |
| 106 |
@@ -1,6 +1,12 @@ |
| 107 |
# ChangeLog for media-sound/darkice |
| 108 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.54 2009/06/25 17:42:10 armin76 Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/darkice/ChangeLog,v 1.55 2009/07/10 01:07:23 ssuominen Exp $ |
| 111 |
+ |
| 112 |
+ 10 Jul 2009; Samuli Suominen <ssuominen@g.o> |
| 113 |
+ -darkice-0.18.1.ebuild, darkice-0.19.ebuild, |
| 114 |
+ +files/darkice-0.19-gcc44.patch: |
| 115 |
+ Fix building with GLIBC 2.10 and GCC 4.4 wrt #277216, thanks to Diego E. |
| 116 |
+ 'Flameeyes' Pettenò. |
| 117 |
|
| 118 |
25 Jun 2009; Raúl Porcel <armin76@g.o> darkice-0.19.ebuild: |
| 119 |
sparc stable wrt #270783 |
Archives