Fix building against recent ffmpeg, drop useless video_cards_intel.

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

4 files changed, 35 insertions, 6 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 2d1ace0e29fc..bdd1fc780c2d 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # 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.57 2011/03/27 12:03:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.58 2011/04/07 23:53:30 chithanh Exp $
+
+  07 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.9.ebuild, +files/gnash-0.8.9-ffmpeg-detection.patch:
+  Fix building against recent ffmpeg, drop useless video_cards_intel.
 
   27 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.8.ebuild, gnash-0.8.9.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index b6378cee949a..e1db95ba6e36 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -8,11 +8,12 @@ AUX gnash-0.8.8-klash.patch 1127 RMD160 f03e8de0d5bcc3eeea08ca45b96196519b01d362
 AUX gnash-0.8.8-secure-tempfile-creation.patch 1166 RMD160 0c8d089de4107fc473e8cf765fa6ab809e07051a SHA1 f0037f46314fb2430f61dd8a3f8251b0513dbe01 SHA256 7883b1b94e5cb621d1c7773450dcf0b23bb9a677f72df8b50309ee9747ddc197
 AUX gnash-0.8.9-documentation-paths.patch 623 RMD160 cdf0bb4cc4626bd50ab32c5a19183b57917f6e8e SHA1 eae72553893d2150b79ec71d948143ae8a4c5959 SHA256 473fefab01376ef8d9450518dee16ef6057cfd0618629e13f3f3ec8adf8c251f
 AUX gnash-0.8.9-external-dejagnu.patch 700 RMD160 b24901796187f5b9ee2a27b60c0232884302af69 SHA1 5dc178479f5ad2aa1eb0d5314df0bec505708890 SHA256 b838af0304d41165557dff2538031edf8d14d5a221375aff4b9e404ef1cb261d
+AUX gnash-0.8.9-ffmpeg-detection.patch 780 RMD160 a7b02c2472b3bf2b8618e5d6d4203e8f30cc8aea SHA1 e6cfed32780546bc68acce66fb5da5fc64627585 SHA256 09bcb58f61d05a582206c82f789484471565f955e8daa6e852c62bca87624353
 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
 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 7866 RMD160 967a825f88423a693609a08f126d5a5a0a25ff46 SHA1 938ab5d9fedc2e5defa9c11a432ae392616447c2 SHA256 60d8e886d6e59f7446b139a6671a278ab5c3dc950008f7f696dd25ecc0aa5eaf
-MISC ChangeLog 23205 RMD160 1af6fb04312bbae1c6f426b3d66ed7f61e9f6d0e SHA1 8788a666f7e62c2532b22a107c899e2de30ab7d9 SHA256 5cc094464b577961f224992c8b5d4a14345c51f2d0e3e9c3e35c0bde5cd5742d
+EBUILD gnash-0.8.9.ebuild 7890 RMD160 8583a32dfb80eedace012ed24b306f16e556c5fb SHA1 3a59e9cdf0205efd8f91cca397bc876beb913e39 SHA256 f6ae401f07903a9f666dae21124e9f9eb844d90511a911d01a5916ba0bf3602d
+MISC ChangeLog 23410 RMD160 943a95a61cb8a418a2a0bd7bf49d39938b3912c0 SHA1 7a1a34c960ac96609fe147c68696bd97d645a3c6 SHA256 b9fa51914b2b5b6f30c2485a72c9dee030ea3d16b88175b6b725bd09d8114c72
 MISC metadata.xml 993 RMD160 d73282f5aae1806f9ce96c3ff940edb5ccf0543e SHA1 516d1694124004a75fde6e2a359b6dd0937905cd SHA256 9f38cad096d48ef2a5f6a8b862df7c54e428474589430966b68535c150447f07
diff --git a/www-plugins/gnash/files/gnash-0.8.9-ffmpeg-detection.patch b/www-plugins/gnash/files/gnash-0.8.9-ffmpeg-detection.patch
new file mode 100644
index 000000000000..73e478f40ed9
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-ffmpeg-detection.patch
@@ -0,0 +1,22 @@
+From f05022aca2c14022a942d36a22764fae4b8f00c0 Mon Sep 17 00:00:00 2001
+From: Brad Smith <brad@comstyle.com>
+Date: Sun, 03 Apr 2011 10:56:27 +0000
+Subject: Fix newer FFmpeg detection with pkg-config.
+
+---
+diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
+index 2a3d3fb..42c7555 100644
+--- a/macros/ffmpeg.m4
++++ b/macros/ffmpeg.m4
+@@ -70,6 +70,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
+           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
+             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; 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
+--
+cgit v0.8.3.4
diff --git a/www-plugins/gnash/gnash-0.8.9.ebuild b/www-plugins/gnash/gnash-0.8.9.ebuild
index 94dc3bde3063..ea6ae0cfff4d 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.2 2011/03/27 12:03:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.3 2011/04/07 23:53:30 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -23,7 +23,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi video_cards_intel"
+IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
 
 # gnash fails if obsolete boost is installed, bug #334259
 RDEPEND=">=dev-libs/boost-1.41.0
@@ -147,6 +147,9 @@ src_prepare() {
 	# Use external dejagnu for tests, bug #321017
 	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
 
+	# Fix detection of recent ffmpeg
+	epatch "${FILESDIR}"/${PN}-0.8.9-ffmpeg-detection.patch
+
 	# Fix building on ppc64, bug #342535
 	use ppc64 && append-flags -mminimal-toc
 
@@ -229,7 +232,6 @@ src_configure() {
 		$(use_enable ssh) \
 		$(use_enable ssl) \
 		$(use_enable test testsuite) \
-		$(use_enable video_cards_intel i810-lod-bias) \
 		--enable-gui=${gui} \
 		--enable-extensions=${myext} \
 		--enable-renderer=${renderers} \