www-plugins/gnash-0.8.7 compile fix and default renderer change

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 58 insertions, 5 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 0fb8c87db88a..c983d5042896 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2010/03/15 20:55:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.23 2010/03/17 23:35:21 chithanh Exp $
+
+  17 Mar 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.7.ebuild, +files/gnash-0.8.7-amf-include.patch:
+  Make agg the default renderer again, bug #309801. Attempt to fix build
+  with USE="lirc", bug #286933
 
 *gnash-0.8.7 (15 Mar 2010)
 
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 7b18a10ff85a..97e1ce2f5708 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -5,6 +5,7 @@ AUX gnash-0.8.5-xpcom-idldir.patch 740 RMD160 2e01374e5ae5a69218160fb3abbbceff67
 AUX gnash-0.8.5-xpidl-sdkdir.patch 1014 RMD160 21b49bccc13af7159d3b81a72b3c82f0daf98eb8 SHA1 c9092cde8baff0c184c961d3b2434740c1dc0a7d SHA256 d7682af2cc466e571fc9d59d0fbd305f087d8e4676f489977ca17c2ad306d6b3
 AUX gnash-0.8.6-libcore-as3-headers.patch 612 RMD160 31ae6528c526f575c2bee58f108a7bc168910aba SHA1 0ca78a130ee6c822e18ffe2b3acc89f28204f6b5 SHA256 83029564cbb2313e99ba7e2947b774c146d732caa2ceb5ce312248692a1505a5
 AUX gnash-0.8.6-libssh-0.4.patch 9679 RMD160 42430640559c0441d906fb731723ba9ac0acc1df SHA1 2a3755c2eac2a3e9ca42ecb14007c7be18ad72e8 SHA256 1f22f7373df925cc9b5c1c7cc1e40f5e8f2d46d3a6d12298a2b27cf89f75fef1
+AUX gnash-0.8.7-amf-include.patch 1121 RMD160 5e17e26f5033816f011ccee9b943588fd55986a4 SHA1 955b1e17ddad3f2cca3cadb73e84c52714f57f3c SHA256 ea3a2324c061828142f715c9e40dbf21007e5230b1f81f8dbea7a8313bcc86bd
 AUX gnash-0.8.7-klash.patch 4224 RMD160 9d988887af247a1810f3afd22ac56ff20b510276 SHA1 5f4991870587351282fabbe853c89fdb03853c54 SHA256 2676ae1d6d3d41937a06ca59c6252b64ece1ec8f5232cf21dbfc0126396101c0
 AUX gnash-0.8.7-moc-qt4.patch 677 RMD160 b24a4421202a75d11ec6d868e3048a78b883abf8 SHA1 7b3af0e10afc9b1600d264b2435a0324effa88f1 SHA256 b510bfb59ad1cfc54e06227f922cafb44816abe0df55765a6884323892016240
 AUX gnash-0.8.7-xpcom-idldir.patch 731 RMD160 5c79c44dd90ce3555e7a32694c2adbf01d8e5493 SHA1 a6230e75ee301831fc24311d41a4691e509f2bc3 SHA256 1b9bcd8c731e8ae49e2f22fa8e1d5da05b50822d77c3758900bb251cfbd3d32c
@@ -13,6 +14,6 @@ DIST gnash-0.8.6.tar.bz2 3571055 RMD160 987342b6cc46e94d5684d917bebbe6f6da6033bf
 DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
 EBUILD gnash-0.8.5.ebuild 6821 RMD160 1c98adc66e062632ce9ebd7786e5d5521619ba40 SHA1 205146eac55069bfda754e3b35c97a2cc85b3c22 SHA256 b416952e5ea784f649978f337e0b156fe4e05b356725be03640889ed6c231d44
 EBUILD gnash-0.8.6.ebuild 7706 RMD160 d6f012bca625b0ddf07a7825d46148fa918bf6e5 SHA1 d7925fa6186ef2c5e5cb6664fcfa9f727f17d1b2 SHA256 77951ff4e95c61b91a703cbed907751528dfa0ac1186b73677833eb01c828266
-EBUILD gnash-0.8.7.ebuild 7687 RMD160 e4c37c38f97eead19868138315f15b51755e799f SHA1 ad7155883fb3c33352fa33549b648b602cc65047 SHA256 76a6dcf2d536dad4738302af1d2a1539f6a351c30857903d6115e2ec71931451
-MISC ChangeLog 16538 RMD160 a8f60a2e1752e97e74867d59b4aeb2f0469a5565 SHA1 21a0aa935c421a6a9db7102f53b62e1cf50d034c SHA256 c204ce07ca4854c5b316413659ab062e55d90a7d47a84e6874ff49377f81277e
+EBUILD gnash-0.8.7.ebuild 7786 RMD160 dbb212f4af21f11173b528180e1ea4eaf800fe4a SHA1 205bac58613fd1c5663cd6c163da5d569da31abd SHA256 c63a1e1b49d158df10ebd43a05afafaa3ed21c39b24ac38da45be68cefa63ef7
+MISC ChangeLog 16772 RMD160 fd70316c9d0288641d81228299553d9b6d7f05df SHA1 c54222ea8fafc28cff3e7ec53f88996c38d67ecd SHA256 0078d49aed9ae6aa82ace51785ec3413e110e2dbcfd7e8c1e02da3fd7c71dd48
 MISC metadata.xml 629 RMD160 c09d2f9e4f61ffff0d0a86807f5ae79fc3986474 SHA1 3a7a29e2e3c9d91a0cd1fd61a35eb6e069f3a0e7 SHA256 145ff961a7e0d2e841559d29dd8ab3fc8e448acce4eacb4e8b960209d2a1f41f
diff --git a/www-plugins/gnash/files/gnash-0.8.7-amf-include.patch b/www-plugins/gnash/files/gnash-0.8.7-amf-include.patch
new file mode 100644
index 000000000000..2537ab06b4bc
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.7-amf-include.patch
@@ -0,0 +1,44 @@
+diff -ur a/libnet/cque.h b/libnet/cque.h
+--- a/libnet/cque.h	2010-02-11 00:20:18.000000000 +0100
++++ b/libnet/cque.h	2010-03-18 00:05:37.000000000 +0100
+@@ -24,8 +24,9 @@
+ #include <boost/thread/condition.hpp>
+ #include <deque>
+ 
++#include "libamf/amf.h"
+ #include "getclocktime.hpp"
+-#include "buffer.h"
++#include "libamf/buffer.h"
+ #include "network.h"
+ #include "dsodefs.h" //For DSOEXPORT.
+ 
+diff -ur a/libnet/sshclient.h b/libnet/sshclient.h
+--- a/libnet/sshclient.h	2010-02-11 00:20:18.000000000 +0100
++++ b/libnet/sshclient.h	2010-03-18 00:03:49.000000000 +0100
+@@ -34,9 +34,10 @@
+ #include <libssh/sftp.h>
+ }
+ 
++#include "libamf/amf.h"
+ #include "cque.h"
+ #include "network.h"
+-#include "buffer.h"
++#include "libamf/buffer.h"
+ 
+ namespace gnash
+ {
+diff -ur a/libnet/sslclient.h b/libnet/sslclient.h
+--- a/libnet/sslclient.h	2010-02-11 00:20:17.000000000 +0100
++++ b/libnet/sslclient.h	2010-03-18 00:05:24.000000000 +0100
+@@ -38,9 +38,10 @@
+ #include <openssl/err.h>
+ #endif
+ 
++#include "libamf/amf.h"
+ #include "cque.h"
+ #include "network.h"
+-#include "buffer.h"
++#include "libamf/buffer.h"
+ 
+ namespace gnash
+ {
diff --git a/www-plugins/gnash/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild
index b4fdedde1a67..18c4bb6447a2 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.1 2010/03/15 20:55:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.2 2010/03/17 23:35:21 chithanh Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="false"
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="agg cairo cygnal dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin +opengl python +sdl ssh ssl test video_cards_intel"
+IUSE="+agg cairo cygnal dbus doc +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl ssh ssl test video_cards_intel"
 
 RDEPEND=">=dev-libs/boost-1.35.0
 	dev-libs/expat
@@ -106,6 +106,9 @@ pkg_setup() {
 src_prepare() {
 	local mozsdk_incdir=${S}/plugin/mozilla-sdk/include
 
+	# Fix missing includes of amr.h, bug #286933
+	epatch "${FILESDIR}"/${PN}-0.8.7-amf-include.patch
+
 	# Defines $(XPIDL) correctly using sdkdir variable from libxul.pc
 	epatch "${FILESDIR}"/${PN}-0.8.5-xpidl-sdkdir.patch