summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-04-05 17:19:23 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-04-05 17:19:23 +0000
commit43b80a4c7af78dff7d02ba722dd9d88dd5b14f3d (patch)
tree88b5a96c7c1a25046fae9e02887e9cb66909fede /media-sound
parentdev-haskell/hs-plugins has been removed, now remove the mask. (diff)
downloadgentoo-2-43b80a4c7af78dff7d02ba722dd9d88dd5b14f3d.tar.gz
gentoo-2-43b80a4c7af78dff7d02ba722dd9d88dd5b14f3d.tar.bz2
gentoo-2-43b80a4c7af78dff7d02ba722dd9d88dd5b14f3d.zip
Remove -Werror from build, bug 260915. Also drop aac use-flag, since faad2 cannot be detected with faad2-2.6* (missing mp4ff.h) and does not compile with faad2-2.7, since libmp4ff is only installed as a static archive.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/muine/ChangeLog7
-rw-r--r--media-sound/muine/muine-0.8.10.ebuild10
2 files changed, 9 insertions, 8 deletions
diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 8e73dd710d00..112e2d3c097a 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/muine
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.52 2009/04/05 11:29:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.53 2009/04/05 17:19:23 loki_val Exp $
+
+ 05 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> muine-0.8.10.ebuild:
+ Remove -Werror from build, bug 260915. Also drop aac use-flag, since faad2
+ cannot be detected with faad2-2.6* (missing mp4ff.h) and does not compile
+ with faad2-2.7, since libmp4ff is only installed as a static archive.
05 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> -muine-0.8.7.ebuild,
-muine-0.8.8.ebuild:
diff --git a/media-sound/muine/muine-0.8.10.ebuild b/media-sound/muine/muine-0.8.10.ebuild
index fa6587ee9562..82f4e617c785 100644
--- a/media-sound/muine/muine-0.8.10.ebuild
+++ b/media-sound/muine/muine-0.8.10.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-sound/muine/muine-0.8.10.ebuild,v 1.5 2009/04/04 14:53:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.8.10.ebuild,v 1.6 2009/04/05 17:19:23 loki_val Exp $
EAPI=2
@@ -13,7 +13,7 @@ SRC_URI="http://download.gnome.org/sources/muine/0.8/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE="aac flac mad vorbis xine"
+IUSE="flac mad vorbis xine"
RDEPEND="x11-themes/gnome-icon-theme
>=dev-lang/mono-2
@@ -29,7 +29,6 @@ RDEPEND="x11-themes/gnome-icon-theme
>=media-libs/flac-1.1.2
>=media-libs/libvorbis-1
>=media-libs/libid3tag-0.15.0b
- aac? ( >=media-libs/faad2-2.0-r4 )
xine? ( >=media-libs/xine-lib-1 )
!xine? (
=media-libs/gstreamer-0.10*
@@ -57,8 +56,6 @@ PATCHES=( "${FILESDIR}/${P}-buttons.patch" )
# The build is not parallel safe
MAKEOPTS="${MAKEOPTS} -j1"
-G2CONF="$(use_enable aac faad2) $(use_enable xine)"
-
src_unpack() {
gnome2_src_unpack
}
@@ -69,8 +66,7 @@ src_prepare() {
}
src_configure() {
- append-flags -Wno-error
- gnome2_src_configure
+ gnome2_src_configure --enable-compile-warnings=yes --disable-faad2 $(use_enable xine)
}
src_compile() {