Back to system ffmpeg, bug #371931 by Ambroz Bizjak.

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

4 files changed, 41 insertions, 38 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8fc7afa9f6b8..cf68bdc8abf6 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.403 2011/07/20 12:02:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.404 2011/07/20 21:39:37 phajdan.jr Exp $
+
+*chromium-14.0.825.0-r1 (20 Jul 2011)
+
+  20 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-14.0.814.0.ebuild, +chromium-14.0.825.0-r1.ebuild,
+  chromium-9999-r1.ebuild:
+  Back to system ffmpeg, bug #371931 by Ambroz Bizjak.
 
   20 Jul 2011; Fabian Groffen <grobian@gentoo.org>
   chromium-13.0.782.41-r1.ebuild, chromium-14.0.825.0.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a337c140f494..4182b36a8d17 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
@@ -18,20 +18,19 @@ AUX chromium.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543b
 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
 DIST chromium-12.0.742.112.tar.bz2 151384207 RMD160 13d9092d79a324852b60e42979218f989000cad1 SHA1 181be3b00386d70e7cc8db88c4e782960a8d4e30 SHA256 b19ea97a7def45c9052ead5ad9f171a3ea1df29c17a5d237e0b78bdfdcefdfb2
 DIST chromium-13.0.782.41.tar.bz2 155160413 RMD160 1af03144ed095c86690d315ed6fe5d242e537530 SHA1 bf6c6e583e35a10ad2d7d2ccd37fa581f701573f SHA256 ab0bd105a6ff4dd4eee80f9834710dab4ec419d143539161c3b5905a12fce65a
-DIST chromium-14.0.814.0.tar.bz2 201797447 RMD160 1faf919cfdb4f52ef386db55bdfaa6c0bb8100eb SHA1 223f7ac1015779c60edab89816c3a6b3967c9880 SHA256 4432bd0fec023ca701adce135c71f4248b3b1f83e41730fe110725cfcf8225f6
 DIST chromium-14.0.825.0.tar.bz2 202446439 RMD160 7ddecf1714910e2780a683e547ac409cf65bb7ff SHA1 998488b13966be72764442509d915613bb4949d8 SHA256 d4e12b545cb52ec9074a9278eb7e9fbd35f1460b4a5fcd1443616e5dfea12269
 EBUILD chromium-12.0.742.112.ebuild 12047 RMD160 ab3c47a41ff2d69f7d53eab715c9151ed848ea1d SHA1 37012697cc4a0f29558614ebd5aadf476781ee37 SHA256 ebf99c4485e6e19eeeca8fcfefe5de7864497c1d6a3d4fb6c40076bfa9beee33
 EBUILD chromium-13.0.782.41-r1.ebuild 13207 RMD160 c68ac42bafae17e01891de37a3d788762cd1c4bc SHA1 0a15d3ceed62db17ef4cab95aee060a13520f487 SHA256 be6eef7a6c6138b0eebcf165c39fe092ec0ff0e5488292573c051d7afb4ab38f
 EBUILD chromium-13.0.782.41.ebuild 12867 RMD160 0bcdef36bf296578eaf695119bd201a6d9d42d52 SHA1 3522f88aff71cc44b8a898f70ec8764662439443 SHA256 71c849f01eb4c7f052f497705ce3141be9f51bfa1a9a190f5b564dea45aecb09
-EBUILD chromium-14.0.814.0.ebuild 13007 RMD160 9ce5d042ffc200e698725b83b9e48c5befbc4c86 SHA1 bba766b58828b518ffe4d0a4277c62e462b19aaf SHA256 4904f004583c96763656e08c18138b8eed5bb23c3521fbfbf20919368bea7a60
+EBUILD chromium-14.0.825.0-r1.ebuild 12956 RMD160 6f362ecdcc62cd1bfaac1fb669aad0aa58753263 SHA1 89eda9a0db738d2b4af22f7f299db2ba8ce3bf33 SHA256 aa73336d33777a800be609466595da3ab6b780f03e77ed562e06c8958a263198
 EBUILD chromium-14.0.825.0.ebuild 13091 RMD160 e7da0ddcdaff742120952b44987bd2d551f43735 SHA1 64b2dd14c219a878ebef2ea64f9a18d744fae89e SHA256 443dfc6227d6811936c1dbe380ec13f508fe97815685d461426832e68f516c2e
-EBUILD chromium-9999-r1.ebuild 15033 RMD160 ea9cf6c527c34ab26dafef0dfcc4bd15ed3baddb SHA1 626f2f3acb9345db57a21bb71d8c11a5bbea7ce0 SHA256 6b77424e45d72a1206a9b0aa1e537a1c3915707f6511769815cd8ce87c9c0341
-MISC ChangeLog 89653 RMD160 6408153dbb20aa28a199c2d5b8e08a32bca070a1 SHA1 9128fd4ecb96613a9f6fc6028aee2db6ecac596a SHA256 67765d9f7d90e4c922bf024715cb7a8e654e2641bd2d4b4dd8980717b9a73057
+EBUILD chromium-9999-r1.ebuild 14895 RMD160 1d3ca187a74852a4fc2288455243574dd8de736a SHA1 7ed63bc76a5dd5309721dd136105000107c9b8fd SHA256 36ddc7ed3ae091d224fbd581124edc9f0a83fb7b1e414c1da6744ddb1cdd00e1
+MISC ChangeLog 89896 RMD160 7e82b6259a34a6f28738f95c1a0650b0ac88d979 SHA1 5ab5581235c059bf47a5b471bfd9751b96fe5718 SHA256 70b7c5de20ae145f42d50480984af807314878408b26175cc904742845f10114
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (SunOS)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4mw+0ACgkQX3X2B8XHTok/FwCfSAMJ/AnkK1PmMU6KNcfDdWNT
-H34AoIFtRKWz6lJBkoqRhfcGZI+MuM8H
-=Qmcc
+iEYEAREKAAYFAk4nSyYACgkQuUQtlDBCeQIxOQCfZ294unR1xR0VaNQPxptv4KLg
+x3YAn1qsz3Fyxde2DrdS1wiQ+6+mXzwF
+=VCqR
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-14.0.814.0.ebuild b/www-client/chromium/chromium-14.0.825.0-r1.ebuild
index 71ca03349185..76d65d5a1979 100644
--- a/www-client/chromium/chromium-14.0.814.0.ebuild
+++ b/www-client/chromium/chromium-14.0.825.0-r1.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-client/chromium/chromium-14.0.814.0.ebuild,v 1.2 2011/07/18 17:12:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.825.0-r1.ebuild,v 1.1 2011/07/20 21:39:37 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring kerberos xinerama"
+IUSE="cups gnome gnome-keyring kerberos"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -43,18 +43,18 @@ RDEPEND="app-arch/bzip2
 	media-libs/speex
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
+	>=virtual/ffmpeg-0.6.90[threads]
 	x11-libs/gtk+:2
+	x11-libs/libXinerama
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-lang/yasm
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	>=sys-devel/bison-2.4.3
 	sys-devel/flex
 	>=sys-devel/make-3.81-r2
-	x11-libs/libXinerama
 	test? (
 		dev-python/pyftpdlib
 		dev-python/simplejson
@@ -62,7 +62,6 @@ DEPEND="${RDEPEND}
 	)"
 RDEPEND+="
 	kerberos? ( virtual/krb5 )
-	xinerama? ( x11-libs/libXinerama )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -116,6 +115,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #374903 - ICU 4.8 compatibility
+	epatch "${FILESDIR}/${PN}-icu-compatibility-r0.patch"
+
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
 
@@ -152,6 +154,7 @@ src_prepare() {
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/zlib/contrib/minizip/*' \
 		-delete || die
 
@@ -168,12 +171,12 @@ src_configure() {
 	myconf+=" -Ddisable_sse2=1"
 
 	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (bug #71931). That makes yasm unneeded.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	myconf+="
 		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=1
 		-Duse_system_flac=1
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
@@ -184,7 +187,6 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_vpx=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
 		-Duse_system_zlib=1"
 
 	# Optional dependencies.
@@ -207,8 +209,7 @@ src_configure() {
 
 	# Our system ffmpeg should support more codecs than the bundled one
 	# for Chromium.
-	# TODO: uncomment when bug #371931 is fixed.
-	# myconf+=" -Dproprietary_codecs=1"
+	myconf+=" -Dproprietary_codecs=1"
 
 	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
@@ -356,12 +357,11 @@ src_install() {
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
-	# TODO: uncomment when bug #371931 is fixed.
-	#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
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
+	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
+	#doexe out/Release/ffmpegsumo_nolink || die
+	#doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	for SIZE in 16 22 24 32 48 64 128 256 ; do
@@ -374,7 +374,7 @@ src_install() {
 	make_desktop_entry chromium-browser "Chromium" chromium-browser \
 		"Network;WebBrowser"
 		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
 	# Install GNOME default application entry (bug #303100).
 	if use gnome; then
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 12ee106f01a6..854f08bf68d1 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.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-client/chromium/chromium-9999-r1.ebuild,v 1.38 2011/07/20 12:02:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.39 2011/07/20 21:39:37 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -44,13 +44,13 @@ RDEPEND="app-arch/bzip2
 	media-libs/speex
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
+	>=virtual/ffmpeg-0.6.90[threads]
 	x11-libs/gtk+:2
 	x11-libs/libXinerama
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
 	dev-lang/perl
-	dev-lang/yasm
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	>=sys-devel/bison-2.4.3
@@ -194,12 +194,12 @@ src_configure() {
 	myconf+=" -Ddisable_sse2=1"
 
 	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (bug #71931). That makes yasm unneeded.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	myconf+="
 		-Duse_system_bzip2=1
+		-Duse_system_ffmpeg=1
 		-Duse_system_flac=1
 		-Duse_system_icu=1
 		-Duse_system_libevent=1
@@ -210,7 +210,6 @@ src_configure() {
 		-Duse_system_speex=1
 		-Duse_system_vpx=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
 		-Duse_system_zlib=1"
 
 	# Optional dependencies.
@@ -233,8 +232,7 @@ src_configure() {
 
 	# Our system ffmpeg should support more codecs than the bundled one
 	# for Chromium.
-	# TODO: uncomment when bug #371931 is fixed.
-	# myconf+=" -Dproprietary_codecs=1"
+	myconf+=" -Dproprietary_codecs=1"
 
 	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
@@ -388,12 +386,11 @@ src_install() {
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
-	# TODO: uncomment when bug #371931 is fixed.
-	#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
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
+	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
+	#doexe out/Release/ffmpegsumo_nolink || die
+	#doexe out/Release/libffmpegsumo.so || die
 
 	# Install icons and desktop entry.
 	for SIZE in 16 22 24 32 48 64 128 256 ; do