Switch to bundled ffmpeg for compatibility reasons. See also bug #331661 by Anthony Parsons <ant@specialops.ath.cx>. We are still getting some crashes there. Removed older broken version.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 35 insertions, 16 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7a7aaca3053d..c15bf49064eb 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.150 2010/08/08 18:41:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.151 2010/08/10 01:28:34 phajdan.jr Exp $
+
+*chromium-6.0.472.25-r1 (10 Aug 2010)
+
+  10 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-6.0.472.22.ebuild, +chromium-6.0.472.25-r1.ebuild:
+  Switch to bundled ffmpeg for compatibility reasons. See also bug #331661
+  by Anthony Parsons <ant@specialops.ath.cx>. We are still getting some
+  crashes there. Removed older broken version.
 
   08 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-6.0.472.25.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 637ea05f83d2..eb8abdcceb40 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,12 +7,11 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.375.125.tar.bz2 163277364 RMD160 89a5e3656287ba89b2a24b6b9b9832a74530c8fe SHA1 7377d2acbef0b2823406c9c0a5b4e39e47aab5f3 SHA256 a3f957bfd4c7418782b0b15aca8b1ca46a2c84bb0d258965f4709fab7290fd94
 DIST chromium-6.0.472.14.tar.bz2 123294791 RMD160 8e35457ae212d88bc6fc251258ae6387490a606f SHA1 4b4343ff01eca34a5cfc7b2a0bb3056de1bed451 SHA256 8b628f73ce525cb0268a86586d3227edecc4cb89e2234ffde4f1960471f7cc74
-DIST chromium-6.0.472.22.tar.bz2 123552673 RMD160 1df7f938e939c0905fe640645169ed03ac4ccb45 SHA1 8be234d313de955815b99287aff8a75dbd9caea7 SHA256 c525e627343724c3c6f7b25de2910576d78fdc0fe162f8bfea171186c7efe91e
 DIST chromium-6.0.472.25.tar.bz2 123670988 RMD160 58826f025c884929c0420544b9f5fdbe698994d0 SHA1 76a3447dbefd860063a79333ec270d72cab9c30f SHA256 c62e619a68d90f593ee9dae5833c027318080652f690b2102510162782a4feaa
 EBUILD chromium-5.0.375.125.ebuild 5387 RMD160 dd089fb5b4332c0503a45d260c3ae3f0a805acd7 SHA1 4f49d131c499100aa36264a20b668021a1e0eec9 SHA256 4f470d73f600a78f72221c9378b7b2fe22bb87a678f257539cc022f75436c4b0
 EBUILD chromium-6.0.472.14.ebuild 6430 RMD160 d354a6f3829833a36fd3784466643869196bcd10 SHA1 4e39ca239bd350dcb237a9e9326434da5e454fcb SHA256 bec6780af7328b5691bfe4bfbb82f8836d06dff3487d8c8c9aa8f4877f61c491
-EBUILD chromium-6.0.472.22.ebuild 6260 RMD160 d5740bd3cba7ddd1446938a69ca74db722d358d7 SHA1 4c5c69401aab4845e32e957d3c88c9c4da32f622 SHA256 d07827b976afb90532ea241fc73318b008b8a193ddde1132e4393db92d6b30cc
+EBUILD chromium-6.0.472.25-r1.ebuild 6678 RMD160 cb459d4fb62f15db895c35198efe22d37df4171d SHA1 8ccc7bbd0dd6ed7f67251486142da678ebabbcf8 SHA256 d84af0ebe85b97ccef5f02ef0d74008a7c8a1259685e794fba778a03e6db0496
 EBUILD chromium-6.0.472.25.ebuild 6982 RMD160 c6370ff0745a7a934ddec943a21d411e0c773434 SHA1 b38197fec6aefa747882318e385671f1a4fbaeae SHA256 a81a034dbf52ff0e70ade48463810f907482c1626c0002ba57226caa4b96164e
 EBUILD chromium-9999.ebuild 8798 RMD160 b294242e183e7af53ab5ce16553c8aed4bb642fd SHA1 30d9231624ac41ff1e5f050a87149f3621acf3d8 SHA256 cd23fcac5f3d285ef9d93a4fbbf9bdcadffb1e46fd9f5025c0b779f01b3f9ca5
-MISC ChangeLog 32970 RMD160 7badab9bfe9ff9978fde1662536263ad548658c8 SHA1 70665ddddbd55d46fb7cb648736fa04256cc08a7 SHA256 f5c87d94a16672acb36e6b1cbcd09ef09ddb518f208826a017c0109add9ba00f
+MISC ChangeLog 33322 RMD160 d03473ae3ea6c822d886e99cdd935ab65e3f730a SHA1 7faac6ebe780b04f59546c379f0c55bb25263de0 SHA256 912b41c355697a8714c900f7550714564c30a60245bab8607148f2cac14f2da2
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
diff --git a/www-client/chromium/chromium-6.0.472.22.ebuild b/www-client/chromium/chromium-6.0.472.25-r1.ebuild
index d19ba5f36efe..39d6e2dd71d1 100644
--- a/www-client/chromium/chromium-6.0.472.22.ebuild
+++ b/www-client/chromium/chromium-6.0.472.25-r1.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-client/chromium/chromium-6.0.472.22.ebuild,v 1.1 2010/08/06 03:08:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.1 2010/08/10 01:28:34 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -23,7 +23,6 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	media-video/ffmpeg[threads]
 	cups? ( >=net-print/cups-1.4.4 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
@@ -60,16 +59,21 @@ remove_bundled_lib() {
 }
 
 src_prepare() {
-	# Disable VP8 until we have a recent enough system-provided ffmpeg.
-	epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch
-
-	# Workaround for upstream bug http://crbug.com/50678.
-	epatch "${FILESDIR}"/${PN}-ffmpeg-compatibility-r0.patch
-
 	remove_bundled_lib "third_party/bzip2"
+	remove_bundled_lib "third_party/codesighs"
+	remove_bundled_lib "third_party/cros"
+	remove_bundled_lib "third_party/jemalloc"
+	remove_bundled_lib "third_party/lcov"
 	remove_bundled_lib "third_party/libevent"
 	remove_bundled_lib "third_party/libjpeg"
 	remove_bundled_lib "third_party/libpng"
+	remove_bundled_lib "third_party/lzma_sdk"
+	remove_bundled_lib "third_party/molokocacao"
+	remove_bundled_lib "third_party/ocmock"
+	remove_bundled_lib "third_party/py"
+	remove_bundled_lib "third_party/pyftpdlib"
+	remove_bundled_lib "third_party/simplejson"
+	remove_bundled_lib "third_party/tlslite"
 	# TODO: also remove third_party/libxml and third_party/libxslt when
 	# http://crbug.com/29333 is fixed.
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
@@ -87,21 +91,18 @@ src_configure() {
 	fi
 
 	# Use system-provided libraries.
+	# TODO: use_system_ffmpeg (http://crbug.com/50678).
 	# TODO: use_system_libxml (http://crbug.com/29333).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl when we have a recent enough system NSS.
 	myconf="${myconf}
 		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_zlib=1"
 
-	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
-	myconf="${myconf} -Dproprietary_codecs=1"
-
 	# The dependency on cups is optional, see bug #324105.
 	if use cups; then
 		myconf="${myconf} -Duse_cups=1"
@@ -109,6 +110,14 @@ src_configure() {
 		myconf="${myconf} -Duse_cups=0"
 	fi
 
+	if use gnome; then
+		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
+	else
+		# TODO: we should also disable code trying to dlopen
+		# gnome-keyring in that case.
+		myconf="${myconf} -Dlinux_link_gnome_keyring=0"
+	fi
+
 	# Enable sandbox.
 	myconf="${myconf}
 		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
@@ -188,6 +197,9 @@ src_install() {
 	newman out/Release/chrome.1 chrome.1
 	newman out/Release/chrome.1 chromium.1
 
+	doexe out/Release/ffmpegsumo_nolink || die
+	doexe out/Release/libffmpegsumo.so || die
+
 	# Use system plugins by default.
 	dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins"