Fix bug 362683, attempt to fix bug 362949.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 47 insertions, 4 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index f9bf6333432b..72786ec0340f 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.59 2011/04/09 09:42:36 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.60 2011/04/10 22:26:46 chithanh Exp $
+
+  10 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.9.ebuild, +files/gnash-0.8.9-look-harder-for-version_h.patch,
+  +files/gnash-0.8.9-no-deprecated-avcodec-parser.patch:
+  Fix bug 362683, attempt to fix bug 362949.
 
   09 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.9.ebuild, +files/gnash-0.8.9-libavcodec-version.patch:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index bf5801566980..75f1ab5ce538 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -12,9 +12,11 @@ AUX gnash-0.8.9-ffmpeg-detection.patch 780 RMD160 a7b02c2472b3bf2b8618e5d6d4203e
 AUX gnash-0.8.9-find-openvg.patch 465 RMD160 774f6ab0a42df1172c17f089d9c72502db6cb0bf SHA1 de8bb98460c0b37a75389c35b3e06500c4e10e15 SHA256 27d0cffa642c4eccaf894bcea590473db24462b6cd792827bdccc52653207b8b
 AUX gnash-0.8.9-klash.patch 471 RMD160 578a467c276884179a9110a18f381f46b2874157 SHA1 c480de3a87f409cbc1c1af499a304b020303fe83 SHA256 779f4be4eb25f654010b380fea4d6b092310d1f850acb040a203a7b8caf02bb8
 AUX gnash-0.8.9-libavcodec-version.patch 3181 RMD160 21473691da492c6da4c92718d7397cb7541d4747 SHA1 8cdfa8389ff0d4c84c92777f50c432cdecff4ad8 SHA256 8ec3d55aaa6fc1806b858387b9ccd5364e8bf4e21283a1156801c6c2d03e8daf
+AUX gnash-0.8.9-look-harder-for-version_h.patch 554 RMD160 6cb606cc740961433e69016f7dc8be41ab578d14 SHA1 d39135a9d6aa15a63b1b695d7eccfdb175880e39 SHA256 2e6436c021e7c2ebfe03935c8f18a10cc64810c5a5b55f0e05ef20935157f93f
+AUX gnash-0.8.9-no-deprecated-avcodec-parser.patch 807 RMD160 09b2b0eb0bcf4dd5f52863ef221e92322d5b4e0d SHA1 67013b85dcd88641477951127db0003f8c8b9fc8 SHA256 9ad06584eb75218c300e732b461e275759963931b8e0fb4ad1dd8852fa77b6d3
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
 EBUILD gnash-0.8.8.ebuild 8786 RMD160 add2414b6e6cabc3c8cc4e2f64e50ae61c852e19 SHA1 d7ee4e8c82a23bf4d1ab8ff8224db8a36baae182 SHA256 4d2e83fbbaa7f0814d4ffae8e4111a8968f562c89980199cd4e2ed1d181f3030
-EBUILD gnash-0.8.9.ebuild 7962 RMD160 273daad1185d39d62268e9fbe2dc346ea62989c4 SHA1 941cbd5b2da5691d39fa2f59154058a335395733 SHA256 f29a6a59a867a66b76df5bc28f197cecda89b3f9c768b30c6ce1943efc20dc91
-MISC ChangeLog 23609 RMD160 e42b3bd930c1f78a79269b7974c3eefc03f57732 SHA1 e9903fc31eb06b4ca4a7aedb5e6296e1500e760b SHA256 cc721867c08b84185b0bd4f2536bfc37914dc3c5c01fe9c7b6ee5bea7b4e1d57
+EBUILD gnash-0.8.9.ebuild 8166 RMD160 7d324f4f1677944aea06facce5199ae608d1fe71 SHA1 078620897a6e9b001ee1f84db9555e860170bc3a SHA256 17a02e5a3fdc179164bdde5a49b70f3c0b069e390fb11fffb0d861a75831060a
+MISC ChangeLog 23855 RMD160 832e571035e7443d0b670c33b62badd0a983cf99 SHA1 7ddba2a006b1137cbcdf3627b6945687a50d3467 SHA256 ebf85946dab156e7866cc41553c38daae69e6c35a2f6daf74be166f4dd9e6aca
 MISC metadata.xml 993 RMD160 d73282f5aae1806f9ce96c3ff940edb5ccf0543e SHA1 516d1694124004a75fde6e2a359b6dd0937905cd SHA256 9f38cad096d48ef2a5f6a8b862df7c54e428474589430966b68535c150447f07
diff --git a/www-plugins/gnash/files/gnash-0.8.9-look-harder-for-version_h.patch b/www-plugins/gnash/files/gnash-0.8.9-look-harder-for-version_h.patch
new file mode 100644
index 000000000000..71fc9b58793a
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-look-harder-for-version_h.patch
@@ -0,0 +1,13 @@
+diff -ur a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
+--- a/macros/ffmpeg.m4	2011-04-09 17:26:26.817016067 +0200
++++ b/macros/ffmpeg.m4	2011-04-09 17:51:04.142016943 +0200
+@@ -96,6 +96,9 @@
+         if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
+           ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`"
+           avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h
++          if test -f ${ffmpeg_top_incl}/${i}/version.h; then
++            avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
++          fi
+           break
+         fi
+       done
diff --git a/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-parser.patch b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-parser.patch
new file mode 100644
index 000000000000..9a46b521b755
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-no-deprecated-avcodec-parser.patch
@@ -0,0 +1,19 @@
+diff -ur a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-02-26 19:11:08.000000000 +0100
++++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp	2011-04-10 23:59:17.170781787 +0200
+@@ -658,13 +658,13 @@
+ {
+     if ( _needsParsing )
+     {
+-        return av_parser_parse(_parser, _audioCodecCtx,
++        return av_parser_parse2(_parser, _audioCodecCtx,
+                     // as of 2008-10-28 SVN, ffmpeg doesn't
+                     // accept a pointer to pointer to const..
+                     const_cast<boost::uint8_t**>(outFrame),
+                     outFrameSize,
+                     input, inputSize,
+-                    0, 0); // pts & dts
++                    0, 0, AV_NOPTS_VALUE); // pts & dts
+     }
+     else
+     {
diff --git a/www-plugins/gnash/gnash-0.8.9.ebuild b/www-plugins/gnash/gnash-0.8.9.ebuild
index dab8206b2f81..668eb90f32ca 100644
--- a/www-plugins/gnash/gnash-0.8.9.ebuild
+++ b/www-plugins/gnash/gnash-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.4 2011/04/09 09:42:36 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.5 2011/04/10 22:26:46 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -150,6 +150,10 @@ src_prepare() {
 	# Fix detection of recent ffmpeg, bug #362683
 	epatch "${FILESDIR}"/${PN}-0.8.9-ffmpeg-detection.patch
 	epatch "${FILESDIR}"/${PN}-0.8.9-libavcodec-version.patch
+	epatch "${FILESDIR}"/${PN}-0.8.9-look-harder-for-version_h.patch
+
+	# Fix linking against recent ffmpeg, bug #362949, upstream #107657
+	epatch "${FILESDIR}"/${PN}-0.8.9-no-deprecated-avcodec-parser.patch
 
 	# Fix building on ppc64, bug #342535
 	use ppc64 && append-flags -mminimal-toc