Mike Gilbert avatar Mike Gilbert committed 9d7175c

chromium: Merge gentoo 1.94

(Portage version: 2.2_rc92/hg/Linux x86_64, signed Manifest commit with key EA4843A4)

Comments (0)

Files changed (5)

www-client/chromium/ChangeLog

 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Oct 2010; Mike Gilbert <floppymaster@gmail.com>
+  +files/chromium-gecko-mediaplayer-r0.patch, chromium-9999.ebuild,
+  metadata.xml:
+  Merge gentoo 1.94
+
   09 Oct 2010; Mike Gilbert <floppymaster@gmail.com>
   +files/chromium-system-icu-r0.patch, chromium-9999.ebuild:
   Merge gentoo 1.92

www-client/chromium/Manifest

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
 AUX chromium-launcher.sh 1167 RMD160 923a9db7cf75be312bd61835e8d566bbc4587852 SHA1 672a873daa68e68ca7196b8e6064a109288df3ff SHA256 01377b3accfa4eb65979c300a3179f93963dbb3a494ec73f51e59e90954e2115
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-EBUILD chromium-9999.ebuild 6746 RMD160 45f2fc94ef9f95ae58ee0dd3eba89004b446079b SHA1 e9a434d11a7c43d73b8081df9f37fe3706ee0e73 SHA256 2115fd7299300762d30ba500c794388c7beedc93af27fde19170d17ef882bb01
-MISC ChangeLog 1551 RMD160 f3dda188752e462c53f7fbf9a86d1cacb2b98df8 SHA1 4f8504817c1be40ec84eb9ce4cd4688a31860a82 SHA256 335bac6194b6631290c445a8bb58aedc93856b46457ddb3ca6e5f610b3042504
-MISC metadata.xml 502 RMD160 ef8975a54855a32ddeea0e632d2e3197d280235e SHA1 87f58e7a582b7eb649fc39447c9e823004ff8c6f SHA256 ed6bf447fce562d098ecd8308fa407252dac87932dc347570419f5f38c4720ce
+EBUILD chromium-9999.ebuild 7395 RMD160 213ba6a8fbc8ca9e5ac8ef7daa2594722b54fe4a SHA1 33ca04897d993b6c7d3f877ff28b50f5eee298c8 SHA256 80b0d3c95d86e304c64580213af55270e3ec0c4541aa2b83316446378e8b161d
+MISC ChangeLog 1709 RMD160 c65ce81b41695b1382523b43d794f3158f9d114a SHA1 270e24ca7bebb353610b027c8d89c2fbd0b2f107 SHA256 130a0b23952820a06a2cca40620a290f8254d991fe641967e253ccc48f66df6f
+MISC metadata.xml 516 RMD160 55abec043e516fad54cc6c9f5aff0d1ac6aba738 SHA1 9cb50bcd2f1e7f0dc6e257fcab3b24f0f0f90f0c SHA256 b2f497aa9d3ab3deb4cbd25eedc3037df449349a3506f1af7e3de9730c522b8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyydMUACgkQC77qH+pIQ6QTkAD+PJ/J3ko0ZpnrCuBmhW+3s3o7
-jJ11oHJY1FCOLc4r+k8A/1/XVcbcPPKRyu9IIjZwDttG7d2hxLfmxcUTDRISi1Tb
-=0YDS
+iF4EAREIAAYFAkyzloQACgkQC77qH+pIQ6SBbwD9F/kgZjc7668cNlgFvcgvhP9c
+C/2wepUY99VUOYD3uAQBAKnLcjJCt3JhI2f5Apgmmfvf3ekjNh5hKCuuiAqNcMVP
+=J2Hd
 -----END PGP SIGNATURE-----

www-client/chromium/chromium-9999.ebuild

 # 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.92 2010/10/07 15:20:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.94 2010/10/11 09:40:37 phajdan.jr Exp $
 
 EAPI="2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="cups gnome gnome-keyring system-sqlite"
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite"
 
 RDEPEND="app-arch/bzip2
 	system-sqlite? (
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-9999[threads]
+	>=media-video/ffmpeg-0.6_p25423[threads]
 	cups? ( >=net-print/cups-1.4.4 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	)
 	x11-apps/xmessage
 	x11-misc/xdg-utils
-	virtual/ttf-fonts"
+	virtual/ttf-fonts
+	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
 
 S=${ESVN_STORE_DIR}/${PN}/src
 
 		${EGCLIENT} config ${EGCLIENT_REPO_URI} || die "gclient: error creating config"
 	fi
 
+	einfo "Reverting patches"
+	svn revert src/webkit/glue/plugins/plugin_list_posix.cc
+
 	einfo "gclient sync start -->"
 	einfo "     repository: ${EGCLIENT_REPO_URI}"
 	${EGCLIENT} sync --nohooks || die
 	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
 }
 
+src_prepare() {
+	# Enable optional support for gecko-mediaplayer.
+	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch
+}
+
 src_configure() {
 	local myconf=""
 
 		-Duse_system_libxml=1
 		-Duse_system_zlib=1"
 
-	# The system-provided ffmpeg supports more codecs. Enable them in chromium.
-	myconf="${myconf} -Dproprietary_codecs=1"
-
 	if use system-sqlite; then
 		myconf+=" -Duse_system_sqlite=1"
 	fi
 		myconf+=" -Dv8_use_snapshot=0"
 	fi
 
+	if use gecko-mediaplayer; then
+		# Disable hardcoded blacklist for gecko-mediaplayer.
+		# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
+		# the browser to hang. We can handle the situation via dependencies,
+		# thus making it possible to use gecko-mediaplayer.
+		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"

www-client/chromium/files/chromium-gecko-mediaplayer-r0.patch

+--- webkit/glue/plugins/plugin_list.cc_posix.orig	2010-10-09 11:05:44.000000000 +0200
++++ webkit/glue/plugins/plugin_list_posix.cc	2010-10-09 11:06:35.000000000 +0200
+@@ -89,7 +89,9 @@
+ bool IsBlacklistedPlugin(const FilePath& path) {
+   const char* kBlackListedPlugins[] = {
+     "nppdf.so",           // Adobe PDF
++#ifndef GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
+     "gecko-mediaplayer",  // Gecko Media Player
++#endif  // GENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
+   };
+   std::string filename = path.BaseName().value();
+   for (size_t i = 0; i < arraysize(kBlackListedPlugins); i++) {

www-client/chromium/metadata.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>floppymaster@gmail.com</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<herd>chromium</herd>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
+		<flag name="gecko-mediaplayer">Allow the browser to load
+			<pkg>www-plugins/gecko-mediaplayer</pkg></flag>
 		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
 			installation with secure-delete enabled</flag>
 	</use>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.