summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-11-15 22:29:46 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-11-15 22:29:46 +0000
commit9810ea28d4586527f63cafcac2415b903c9dcb81 (patch)
tree7cd85bd7a0f27df8031b7745cd8e74e37be91b07
parentFix Manifest, bug #344949 (diff)
downloadhistorical-9810ea28d4586527f63cafcac2415b903c9dcb81.tar.gz
historical-9810ea28d4586527f63cafcac2415b903c9dcb81.tar.bz2
historical-9810ea28d4586527f63cafcac2415b903c9dcb81.zip
Fix building on ppc64, bug #342535. Require agg for fbcon, bug #340567.
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
-rw-r--r--www-plugins/gnash/ChangeLog6
-rw-r--r--www-plugins/gnash/Manifest14
-rw-r--r--www-plugins/gnash/gnash-0.8.8.ebuild10
3 files changed, 16 insertions, 14 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 1211b8a16514..73001cc87b3a 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.50 2010/10/06 20:35:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.51 2010/11/15 22:29:46 chithanh Exp $
+
+ 15 Nov 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ gnash-0.8.8.ebuild:
+ Fix building on ppc64, bug #342535. Require agg for fbcon, bug #340567.
06 Oct 2010; Markus Meier <maekke@gentoo.org> gnash-0.8.8.ebuild:
x86 stable, bug #339102
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index bcd06478268d..3dcea829d720 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
AUX gnash-0.8.5-moc-qt4.patch 622 RMD160 7143ab1170f536ed35b618740723ff823859e2bd SHA1 24ee33fa3aaed598e48ed6dcdadf94dcdeace588 SHA256 a10cce240d2b241f90523042cd464b81cda0b4e00fd4408f7b421e9a12e18702
@@ -23,13 +20,6 @@ DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02
EBUILD gnash-0.8.5.ebuild 6847 RMD160 a5c919db8f2000ccdd69c506a3e1e4c38575d899 SHA1 cca2bff47f3e59042b7b09b0d1c6963d54964a77 SHA256 5bc8619c682951efa4b796aabf1c365b0180bfd8599c9551468dbee2dc37b5ab
EBUILD gnash-0.8.6.ebuild 7734 RMD160 aedd6a1a87187a6136d8cf2e22ea1c43a2210880 SHA1 a2c0420b2e04ce74abfdee2d825269464d67e9a6 SHA256 bb1c4c7d2bb2d63559cdeded66d78131d0749dbb429ae0fc7abec472ea090d01
EBUILD gnash-0.8.7.ebuild 8000 RMD160 0dc1df45702543893bd7ce339f956372c3b24027 SHA1 7dfeaceaecfd0936a9b4d4bb592d635b07330b13 SHA256 7204ce7639200d232326215f530297c341fff5d86a0c15424ae247ce84c01b66
-EBUILD gnash-0.8.8.ebuild 8381 RMD160 e027aa36e0e643c6ea2b5c328f7a4ddb5e0cc855 SHA1 00c5a596705cd7c978aa7f97c49d069eefcae71d SHA256 723729db809b9489d342639dd8154625e4d9190b9633393f78fbca0ee7d898e5
-MISC ChangeLog 21326 RMD160 423c96972147ef6a3e1d41fe2f1728c6f935311a SHA1 533630144ec47a724fd8dfb9c50f4239b20eae4e SHA256 35a0ba5efc4346445475ed5c3fa028c92c3cdf296f3887ead1b9457f8bcc9d32
+EBUILD gnash-0.8.8.ebuild 8605 RMD160 8f2de7f121a2a2d3ab6ee365af0b50fcf7ae96f7 SHA1 c7b8e00d86b2d46bdff4825685989f57c9152b7b SHA256 f2ba785aded82a600a957ef87ab55c258d1a8700df47b0f26caada84a0ab7a21
+MISC ChangeLog 21494 RMD160 ab3f25a35a09048c0bb0279cf98d215833e6d965 SHA1 4d896ddbd8b283bc69071ba29bd5034e16d1ef78 SHA256 a4d087c1cab342b08258ae779555679ee4b6b6ad68619d27edeb9eb3db4ec923
MISC metadata.xml 907 RMD160 ff350bb7405df94509463f0e8448a7a766aef8f0 SHA1 d4d6cd31be21a2d25b39bb03e5ab3f10676809ff SHA256 e771bc85dac450875f1978807de8e1106d0fce2097eaaab249a4718c729c386b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkys3TsACgkQkKaRLQcq0GK/dwCgrkHid/Fk9n1NYQXxjnQ6IOzd
-ckEAnA2hybSykRScB5pJfivjx8mgQKmA
-=Fmoq
------END PGP SIGNATURE-----
diff --git a/www-plugins/gnash/gnash-0.8.8.ebuild b/www-plugins/gnash/gnash-0.8.8.ebuild
index 94851f69743d..9242fb7718f8 100644
--- a/www-plugins/gnash/gnash-0.8.8.ebuild
+++ b/www-plugins/gnash/gnash-0.8.8.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.8.ebuild,v 1.11 2010/10/06 20:35:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.12 2010/11/15 22:29:46 chithanh Exp $
EAPI=3
CMAKE_REQUIRED="never"
@@ -121,6 +121,11 @@ pkg_setup() {
die "Nsplugin requires the gtk gui."
fi
+ if use fbcon && use !agg; then
+ eerror "Building gnash with fbcon requires the agg renderer."
+ die "fbcon requires the agg USE flag."
+ fi
+
if use sdl; then
einfo "Enable SDL as gui frontend and sound handler"
fi
@@ -152,6 +157,9 @@ src_prepare() {
# Use external dejagnu for tests, bug #321017
epatch "${FILESDIR}"/${PN}-0.8.8-external-dejagnu.patch
+ # Fix building on ppc64, bug #342535
+ use ppc64 && append-flags -mminimal-toc
+
eautoreconf
}
src_configure() {