Version bump for dev channel release. Remove old.

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

5 files changed, 48 insertions, 17 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 33ae185f92ee..0debd8b36c8f 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.200 2010/10/11 09:40:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.201 2010/10/13 14:13:33 phajdan.jr Exp $
+
+*chromium-8.0.552.0 (13 Oct 2010)
+
+  13 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-system-icu-r1.patch, -chromium-7.0.544.0-r1.ebuild,
+  +chromium-8.0.552.0.ebuild, chromium-9999.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-7.0.544.0-r2 (11 Oct 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 48952f429e6c..d1ff4d1189c6 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,6 +4,7 @@ AUX chromium-launcher.sh 1143 RMD160 3bc84b886104acdf993e27e1e05218b730bbead1 SH
 AUX chromium-make-3.82-compatibility-r0.patch 867 RMD160 d6fd01bcd32460678e1503ca9fbeb78ed16e8213 SHA1 9964cbe8063140312dd1217327f3648dfaf71284 SHA256 339f8022d0a2ff733d779ba8c4a3cf09a28633afccc0106d86289ef497f2f401
 AUX chromium-plugins-path-r0.patch 1043 RMD160 698a8562c866e046b1adf8553894ee08afb53a10 SHA1 0c41adad38478c4a12970af774e782ebb208a048 SHA256 3ba3bf1c3184fb2a0c7f493947d620fd1678efdd3661ac36be3d1cb00146d108
 AUX chromium-system-icu-r0.patch 705 RMD160 88ace1e61e1da871fec979e23b0242e8e5ba6cd2 SHA1 40af48ef29ff8bd533181bf0c172cc67b3237157 SHA256 5e5b884e499b4dc97563bb4cb87ea770542cd044b99f26c7f82e38b89b40de69
+AUX chromium-system-icu-r1.patch 735 RMD160 d3fabb98c3de79afd87f4dad2fd842eac31b0167 SHA1 6f2d38dcd26dbd948237a3a6185e2dfff753fb5a SHA256 f37bcb4938d7600a1c56fd6494fa8680ff19749a3a50df82b5c88b8c996e2185
 AUX chromium-system-sqlite-r0.patch 1802 RMD160 7e796e63a2415b98b7192f466481ea00d86d5ddf SHA1 13bb913c620b813f5a5436864a002374b2da9b7b SHA256 c34e65648c1593d3c693db643d342c192056d2bf5c19b45129ac29ea2862ccf0
 AUX chromium-system-ssl-r0.patch 460 RMD160 50a5a212ed859d9987d2c59bc1d2a6c2e56a7bad SHA1 b1336a7a42b784515ea45bcfe4480580f4345b97 SHA256 374897ac710e37e8ff63de78a751d4078aeb438845541ce294291ab58687984b
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
@@ -12,12 +13,13 @@ DIST chromium-6.0.472.63.tar.bz2 123990097 RMD160 7931846fd581f76ba2039f82b64156
 DIST chromium-7.0.517.24.tar.bz2 132373901 RMD160 c2251d3bf0ef8df0c16fb35e9b645e9049dd137c SHA1 39616cf5e224b2b742600f3f237b43a37ac5275f SHA256 5b7d0d0c577841d0d54799de377338813d118ceb3781135ed426a3eed6173c72
 DIST chromium-7.0.517.36.tar.bz2 132903248 RMD160 df508769cdd50a061531f8d7387c03e7ad85ef04 SHA1 9fad31d9204e5530faad17a649c97e9ee56d2cbe SHA256 93e8d2982dc14eba6f1c6e5c851679ebbd562769443ce228eaa29f2e84d02248
 DIST chromium-7.0.544.0.tar.bz2 148954341 RMD160 1a5dd420c42cf35f5982d35746a6b563c3f919c8 SHA1 03e3380da1a6e7bcbdfb71576334bd2100369d04 SHA256 a4d1753c44ba8bf898fb3ce7e52389333453c55b7e244c9f702088ff0a693672
+DIST chromium-8.0.552.0.tar.bz2 134766822 RMD160 ab65406596ea0d04547c41e9212497da07ddb1d0 SHA1 a6fe50ffb372daf13698ea85d8ae2f43d7ca3027 SHA256 643710a66640c6f393a217c2736a4ade882b3d6f3c69e1deb5b52b46eba92eeb
 EBUILD chromium-6.0.472.62.ebuild 6869 RMD160 4f789a1c899d639aed4f69a831dcd932ec690903 SHA1 07c983a01ba282fe0f9684c3a264de81e4623a16 SHA256 14d395f2840efe6d81b5f4225284af9084087c4ac429fcdbb0ddd05a3a0f9ffd
 EBUILD chromium-6.0.472.63.ebuild 6875 RMD160 868088280a7e82a3016c6feee15c61ea8e4b3237 SHA1 9f2a03a0592b51530595f35f24eea41b48a3a275 SHA256 54b9433c933f4faa90e1057baa29dd461e639931d2cacdb963996ed28f7e995c
 EBUILD chromium-7.0.517.24.ebuild 6611 RMD160 6a276a416a19c3a78a33112c25c87aed7bdd4a0b SHA1 508ad38752f50ce75efafea8e18fef052a8ba978 SHA256 7f941e6775455807469bf28cb1a3069a270e098c2f1ed248c084f47521d6a2c2
 EBUILD chromium-7.0.517.36.ebuild 6611 RMD160 11af550adfeb2e2dab6fb5ee2247bf52458ed43c SHA1 72a8bb8d6dd74de4290c3d08d4f0908969694f04 SHA256 dd32a37a19a669afcb5a669405aa004e92a20d5db8b09cd0aac0efac090adbe5
-EBUILD chromium-7.0.544.0-r1.ebuild 7187 RMD160 31e2975f7276e8587d100f0ad9b780f646816f6a SHA1 e9468d2b3cd7c232867f2d82d2788b4007bb1859 SHA256 f723752ea03dd91b90f7ce1fd140dfd7770900a3a5f66c0fef1c33e568c02a33
 EBUILD chromium-7.0.544.0-r2.ebuild 7600 RMD160 4e30b02693752b828e51ac1783c45b3fd4a366b1 SHA1 e119fc2bc5c11e94ffd272fab5ba034c06940b45 SHA256 f888cf80d72f1e08a48400a157d94ada91444b2427dd9a19f298c764899b5aec
-EBUILD chromium-9999.ebuild 9178 RMD160 5d3d414593bc06cd0b6777b5e1171723dd0f9d3b SHA1 8d009e4449637d38afbe280392632121a7e7daf7 SHA256 51fa3f688bdadebfab49b7c69f2e9029cf8bdcb6659418130f7d9eca64db7916
-MISC ChangeLog 44229 RMD160 e537b31bc678835073fac18ade96bf55e089c5fd SHA1 f07bfd91d01b442014ab7894d2e8b8fb803d5a74 SHA256 ac6f08adbac823f5b5f7f1c2635bc25b6e33fa3a1e0900279bf7ac0bedd6ff88
+EBUILD chromium-8.0.552.0.ebuild 7431 RMD160 a06204be8960808e6111852a0af8a1710c089c4d SHA1 d363563a0de6f31ca3683f18da7ce20e13847314 SHA256 3fc3bc258939727123fbc06daa75a0052259ab99405b8b89417683d75c830800
+EBUILD chromium-9999.ebuild 9139 RMD160 001ff2d49c84968243c4ca33c82fdac6eb3af83f SHA1 08cd6b5fa2b7f8ed96b40c947f3937fdfc6c992a SHA256 2e89a70b8d4821905d61fbe0d7bed64d15c758d6bce8d87434c30b2f592af532
+MISC ChangeLog 44494 RMD160 1a671a9ec25389d13b329601498c7d330871a039 SHA1 49628e644855edd448ff2d33a68285bbcbee1aef SHA256 ad03db9091e0767bcd03faa4570872427a0aabc1006427cf172368cd0907bb4d
 MISC metadata.xml 516 RMD160 55abec043e516fad54cc6c9f5aff0d1ac6aba738 SHA1 9cb50bcd2f1e7f0dc6e257fcab3b24f0f0f90f0c SHA256 b2f497aa9d3ab3deb4cbd25eedc3037df449349a3506f1af7e3de9730c522b8b
diff --git a/www-client/chromium/chromium-7.0.544.0-r1.ebuild b/www-client/chromium/chromium-8.0.552.0.ebuild
index fc983226cc50..5a693da3f773 100644
--- a/www-client/chromium/chromium-7.0.544.0-r1.ebuild
+++ b/www-client/chromium/chromium-8.0.552.0.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-7.0.544.0-r1.ebuild,v 1.1 2010/10/09 14:00:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-8.0.552.0.ebuild,v 1.1 2010/10/13 14:13:33 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
+	>=media-video/ffmpeg-0.6_p25423[threads]
 	cups? ( >=net-print/cups-1.4.4 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
@@ -65,20 +66,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Small fixes to the system-provided sqlite support,
-	# to be upstreamed.
-	epatch "${FILESDIR}"/${PN}-system-sqlite-r0.patch
-
 	# Small fix to the system-provided icu support,
 	# to be upstreamed.
-	epatch "${FILESDIR}"/${PN}-system-icu-r0.patch
+	epatch "${FILESDIR}"/${PN}-system-icu-r1.patch
 
 	# Enable optional support for gecko-mediaplayer.
 	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-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/icu"
 	remove_bundled_lib "third_party/jemalloc"
 	remove_bundled_lib "third_party/lcov"
@@ -93,6 +89,7 @@ src_prepare() {
 	remove_bundled_lib "third_party/pyftpdlib"
 	remove_bundled_lib "third_party/simplejson"
 	remove_bundled_lib "third_party/tlslite"
+	# TODO: also remove third_party/ffmpeg (needs to be compile-tested).
 	# TODO: also remove third_party/zlib. For now the compilation fails if we
 	# remove it (minizip-related).
 
@@ -110,11 +107,11 @@ src_configure() {
 	myconf+=" -Ddisable_sse2=1"
 
 	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (http://crbug.com/50678).
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl (need to consult upstream).
 	myconf+="
 		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=1
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
@@ -160,6 +157,10 @@ src_configure() {
 		append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
 	fi
 
+	# Our system ffmpeg should support more codecs than the bundled one
+	# for Chromium.
+	myconf+=" -Dproprietary_codecs=1"
+
 	# Use target arch detection logic from bug #296917.
 	local myarch="$ABI"
 	[[ $myarch = "" ]] && myarch="$ARCH"
@@ -219,8 +220,11 @@ src_install() {
 	newman out/Release/chrome.1 chrome.1 || die
 	newman out/Release/chrome.1 chromium.1 || die
 
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
+	# Chromium looks for these in its folder
+	# See media_posix.cc and base_paths_linux.cc
+	dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
+	dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
+	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
 
 	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png || die
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index c314986c4dc9..d8e4659244d0 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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-9999.ebuild,v 1.94 2010/10/11 09:40:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.95 2010/10/13 14:13:33 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -113,14 +113,13 @@ pkg_setup() {
 src_prepare() {
 	# Small fix to the system-provided icu support,
 	# to be upstreamed.
-	epatch "${FILESDIR}"/${PN}-system-icu-r0.patch
+	epatch "${FILESDIR}"/${PN}-system-icu-r1.patch
 
 	# Enable optional support for gecko-mediaplayer.
 	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-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/icu"
 	remove_bundled_lib "third_party/jemalloc"
 	remove_bundled_lib "third_party/lcov"
diff --git a/www-client/chromium/files/chromium-system-icu-r1.patch b/www-client/chromium/files/chromium-system-icu-r1.patch
new file mode 100644
index 000000000000..289e78d7ded8
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-icu-r1.patch
@@ -0,0 +1,19 @@
+--- webkit/glue/plugins/pepper_private.cc.orig	2010-10-13 13:22:28.000000000 +0200
++++ webkit/glue/plugins/pepper_private.cc	2010-10-13 13:22:56.000000000 +0200
+@@ -6,6 +6,8 @@
+ 
+ #include "webkit/glue/plugins/pepper_private.h"
+ 
++#include "unicode/usearch.h"
++
+ #include "app/resource_bundle.h"
+ #include "base/utf_string_conversions.h"
+ #include "grit/webkit_resources.h"
+@@ -13,7 +15,6 @@
+ #include "skia/ext/platform_canvas.h"
+ #include "third_party/ppapi/c/pp_resource.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
+-#include "third_party/icu/public/i18n/unicode/usearch.h"
+ #include "webkit/glue/webkit_glue.h"
+ #include "webkit/glue/plugins/pepper_image_data.h"
+ #include "webkit/glue/plugins/pepper_plugin_delegate.h"