summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Malm <gengor@gentoo.org>2009-07-23 00:26:59 +0000
committerGordon Malm <gengor@gentoo.org>2009-07-23 00:26:59 +0000
commit55e741db25d3ed0c1800bfa1fd01f556aacae9bd (patch)
treeca7feddbab1bcbfe115fdb6aa67060ebbd58b570 /media-libs/faad2
parentIncluding full glibc210 patch, the first was cut (diff)
downloadgentoo-2-55e741db25d3ed0c1800bfa1fd01f556aacae9bd.tar.gz
gentoo-2-55e741db25d3ed0c1800bfa1fd01f556aacae9bd.tar.bz2
gentoo-2-55e741db25d3ed0c1800bfa1fd01f556aacae9bd.zip
QA and fix failure to compile with gcc-3.4.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'media-libs/faad2')
-rw-r--r--media-libs/faad2/ChangeLog6
-rw-r--r--media-libs/faad2/faad2-2.7-r1.ebuild7
-rw-r--r--media-libs/faad2/faad2-2.7.ebuild27
3 files changed, 19 insertions, 21 deletions
diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 765d898103b4..d8f4704e2378 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/faad2
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.123 2009/07/22 15:59:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.124 2009/07/23 00:26:59 gengor Exp $
+
+ 23 Jul 2009; Gordon Malm <gengor@gentoo.org> faad2-2.7.ebuild,
+ faad2-2.7-r1.ebuild:
+ QA and fix failure to compile with gcc-3.4.
22 Jul 2009; Christian Faulhammer <fauli@gentoo.org> faad2-2.7.ebuild:
stable x86, bug 278483
diff --git a/media-libs/faad2/faad2-2.7-r1.ebuild b/media-libs/faad2/faad2-2.7-r1.ebuild
index bcfbe2194315..794d256f241b 100644
--- a/media-libs/faad2/faad2-2.7-r1.ebuild
+++ b/media-libs/faad2/faad2-2.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7-r1.ebuild,v 1.3 2009/07/20 17:30:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7-r1.ebuild,v 1.4 2009/07/23 00:26:59 gengor Exp $
EAPI=2
inherit autotools eutils
@@ -15,8 +15,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
IUSE="digitalradio"
src_prepare() {
- epatch "${FILESDIR}"/${P}-libmp4ff-shared-lib.patch \
- "${FILESDIR}"/${P}-man1_MANS.patch
+ epatch "${FILESDIR}/${P}-libmp4ff-shared-lib.patch"
+ epatch "${FILESDIR}/${P}-man1_MANS.patch"
+ sed -i -e 's:iquote :I:' libfaad/Makefile.am || die "sed failed"
eautoreconf
}
diff --git a/media-libs/faad2/faad2-2.7.ebuild b/media-libs/faad2/faad2-2.7.ebuild
index 401b09288b13..0139268c0a01 100644
--- a/media-libs/faad2/faad2-2.7.ebuild
+++ b/media-libs/faad2/faad2-2.7.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7.ebuild,v 1.4 2009/07/22 15:59:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.7.ebuild,v 1.5 2009/07/23 00:26:59 gengor Exp $
-inherit eutils libtool
+EAPI=2
+inherit autotools eutils
DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="http://www.audiocoding.com/"
+HOMEPAGE="http://www.audiocoding.com/faad2.html"
SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
LICENSE="GPL-2"
@@ -13,26 +14,18 @@ SLOT="0"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="digitalradio"
-RDEPEND=""
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- elibtoolize
+src_prepare() {
+ sed -i -e 's:iquote :I:' libfaad/Makefile.am || die "sed failed"
+ eautoreconf
}
-src_compile() {
+src_configure() {
econf \
- $(use_with digitalradio drm)\
+ $(use_with digitalradio drm) \
--without-xmms
-
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
-
+ emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS ChangeLog NEWS README README.linux TODO
}