diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-06-27 12:52:11 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-06-27 12:52:11 +0000 |
commit | 3ada07a0054b4d907b52c8f8ba2e8cbe55ed4842 (patch) | |
tree | 750e6242ea569f1d761bb9f52647fc67f6857a84 /www-plugins | |
parent | old (diff) | |
download | gentoo-2-3ada07a0054b4d907b52c8f8ba2e8cbe55ed4842.tar.gz gentoo-2-3ada07a0054b4d907b52c8f8ba2e8cbe55ed4842.tar.bz2 gentoo-2-3ada07a0054b4d907b52c8f8ba2e8cbe55ed4842.zip |
depend on libsdl when gtk and kde frontends are disabled, bug #325445
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
-rw-r--r-- | www-plugins/gnash/ChangeLog | 6 | ||||
-rw-r--r-- | www-plugins/gnash/gnash-0.8.7.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 43764e4e1ec5..237d2bb3ea60 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-plugins/gnash # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.27 2010/06/21 13:12:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.28 2010/06/27 12:52:11 chithanh Exp $ + + 27 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + gnash-0.8.7.ebuild: + depend on libsdl when gtk and kde frontends are disabled, bug #325445 21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> gnash-0.8.7.ebuild: Fix building with FFmpeg >= 0.6 wrt #324357 by Diego E. Pettenò. diff --git a/www-plugins/gnash/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild index a4868e5fc5c6..d54e7858999d 100644 --- a/www-plugins/gnash/gnash-0.8.7.ebuild +++ b/www-plugins/gnash/gnash-0.8.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.6 2010/06/21 13:12:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.7 2010/06/27 12:52:11 chithanh Exp $ EAPI="2" CMAKE_REQUIRED="never" @@ -58,6 +58,7 @@ RDEPEND=">=dev-libs/boost-1.35.0 gtk? ( x11-libs/gtkglext ) ) sdl? ( media-libs/libsdl[X] ) + !kde? ( !gtk? ( media-libs/libsdl[X] ) ) nsplugin? ( net-libs/xulrunner:1.9 ) media-libs/speex[ogg] sys-libs/zlib @@ -84,8 +85,8 @@ pkg_setup() { if ! ( use kde || use gtk || use sdl ); then ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]." - has_version media-libs/libsdl[X] && ewarn "sdl enabled as default" \ - || die "Please enable at least one of these USE flags." + ewarn "sdl enabled as default" +# die "Please enable at least one of these USE flags." fi if use python && use !gtk; then |