Allow H.264 codec with our system ffmpeg, patch from Alt Linux in bug #302098

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

6 files changed, 227 insertions, 6 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6a974635550c..6ae344b8142b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,15 @@
 # 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.41 2010/01/22 21:38:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.42 2010/01/24 23:40:49 voyageur Exp $
+
+*chromium-4.0.266.0-r1 (24 Jan 2010)
+
+  24 Jan 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +chromium-4.0.266.0-r1.ebuild, chromium-4.0.295.0.ebuild,
+  chromium-4.0.302.2.ebuild,
+  +files/chromium-20100122-ubuntu-html5-video-mimetypes.patch:
+  Allow H.264 codec with our system ffmpeg, patch from Alt Linux in bug
+  #302098
 
 *chromium-4.0.302.2 (22 Jan 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index efebab949497..d69d1856343f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,4 @@
+AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
@@ -6,9 +7,10 @@ DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63e
 DIST chromium-4.0.295.0.tar.bz2 152197504 RMD160 6465221e9e34c700efabbccaa5757bacf2295a9e SHA1 457c79a72b90a1fe0037db6503b66a55c5c2a4e5 SHA256 d78a7cb0cdf6914fd9f87786a9fa792944a2446ce8b5a6124bedcddd2d3a4cb9
 DIST chromium-4.0.302.2.tar.bz2 153073484 RMD160 d275f05b7d628bb0948eb287a19eecde012b0127 SHA1 c9940df87f2f2941f28606fc57f764e165d36504 SHA256 5528e637e8521d01093d69f0e7e880dd898941616caa6d7a361d467031d0b62d
 EBUILD chromium-4.0.249.43.ebuild 4329 RMD160 c376ce69855d3b3b34df647689c72a2161170ecb SHA1 3aa0961adabedb34855736d0bda03b70b2258fbf SHA256 230bac6158556b40f8b0cf4e7ae50ae0180c581c171807c71fd27cb69b8871de
+EBUILD chromium-4.0.266.0-r1.ebuild 4831 RMD160 6ceda56ee7257eed3bba6303f4e049e65d5e4ea5 SHA1 d630c65b92d661a98c001e07575b3be14ed6696a SHA256 9ea79440161bcee800b72320927edce534c31601ce64e91ac1efec9f8ed8f460
 EBUILD chromium-4.0.266.0.ebuild 4596 RMD160 9e975c79949c3a24430c43390e2baf9350b9abad SHA1 42ebf7b5a4130cb32980235daefff6555206335e SHA256 53d361d33220915add11b5b0c391a5507dc82cf83d2abf104132e05f4dea2ee2
-EBUILD chromium-4.0.295.0.ebuild 4486 RMD160 d8a9372d1d84c332b22b74114323c149eb15e099 SHA1 8016c1f3692427504d8e52b24a348e78fb5faf91 SHA256 1f1ed1203d285754041add21ec9e2a2146bca5564163581c491e34a159dcf58a
-EBUILD chromium-4.0.302.2.ebuild 4489 RMD160 79cb9c0e2da0dfb6d7059c0ab621f09393a5133e SHA1 4b007cc7d37c45f5865b92fd5e5a2328dab5d224 SHA256 6f4666aafed7f5f3a7c563763aa05f0845ec8e30b0a2f7a639bec9f249c6e2d2
+EBUILD chromium-4.0.295.0.ebuild 4718 RMD160 5c1df7729eaa0cd6f9d4bc803578a47e7faa6605 SHA1 3adc5ea7da24e6f4c2e8c9f73f1aafb50d520696 SHA256 1c9781ec47d71ce60576e329da2d1243bda4a7cbc75e477a982c3311977f9b6a
+EBUILD chromium-4.0.302.2.ebuild 4718 RMD160 fc2a3d7c5d4c761a58323cec802fb1d8755846a9 SHA1 eb5d5037971a5ccb918667dab05042b2c8fdbca7 SHA256 3c2a3a96748b2bae1a7c0cbcb3fa441136a5304ec205572882d8b9b8050cc3ff
 EBUILD chromium-9999.ebuild 6175 RMD160 a5c0078c49a35a0b69fe49087f3fa7f2d41e8085 SHA1 156f77395d60ab728f411b25768556b701ab97d9 SHA256 9d4ce427d9255ad1cb64cee929515357da82e55f0016c9e6acc4aeec4bda19fb
-MISC ChangeLog 9077 RMD160 8a69cead2f54f9913910e816852cc157757c626f SHA1 83d35c0e36fb8eb8b7e07e0bdb84a85eac425b88 SHA256 e50bb479854582f39667b1105c261ffd68ec4ce92725366d47ffa07483013c52
+MISC ChangeLog 9403 RMD160 c31f60813ad1d47c2e891a3872cfe973798c72cf SHA1 0ba7721766381a4a885b756f0b610a78c8fb1fca SHA256 9688387d3df3aba7983e17369e585720531e04d78ba6012fb0a0c2c72641b4f9
 MISC metadata.xml 578 RMD160 a6e635fb90171f5698b32ef0ed36747f921f8aed SHA1 f72cfb81f43187583315e032db709083742aeb41 SHA256 9f3586e43f40a626d328c426b96966ac7e91d04095c71d16a1573bef60e46fa1
diff --git a/www-client/chromium/chromium-4.0.266.0-r1.ebuild b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
new file mode 100644
index 000000000000..b711fc75e6fa
--- /dev/null
+++ b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
@@ -0,0 +1,154 @@
+# 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-4.0.266.0-r1.ebuild,v 1.1 2010/01/24 23:40:49 voyageur Exp $
+
+EAPI="2"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+ffmpeg"
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	>=gnome-base/gconf-2.24.0
+	media-fonts/corefonts
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/jpeg
+	media-libs/libpng
+	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14.7
+	x11-misc/xdg-utils
+	|| (
+		x11-themes/gnome-icon-theme
+		x11-themes/tango-icon-theme
+		x11-themes/xfce4-icon-theme
+	)"
+#	dev-db/sqlite:3
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23"
+
+src_prepare() {
+	# Gentoo uses .kde4, not .kde
+	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
+	# would be better
+	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
+		|| die "kde proxy sed failed"
+	# Changing this in ~/include.gypi does not work
+	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
+	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
+	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
+	# Add configuration flag to use system libevent
+	epatch "${FILESDIR}"/${PN}-use_system_libevent-1.4.13.patch
+	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+
+	# Disable prefixing to allow linking against system zlib
+	sed -e '/^#include "mozzconf.h"$/d' \
+		-i third_party/{,WebKit/WebCore/platform/image-decoders}/zlib/zconf.h \
+		|| die "zlib sed failed"
+}
+
+src_configure() {
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	# CFLAGS/LDFLAGS
+	mkdir -p "${S}"/.gyp
+	cat << EOF > "${S}"/.gyp/include.gypi
+{
+	'target_defaults': {
+		'cflags': [ '${CFLAGS// /','}' ],
+		'ldflags': [ '${LDFLAGS// /','}' ],
+	},
+}
+EOF
+	export HOME="${S}"
+
+	# Configuration options (system libraries)
+	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
+	# -Duse_system_sqlite=1 : http://crbug.com/22208
+	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
+
+	# Sandbox paths
+	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	if [[ "$ABI" == "amd64" ]] ; then
+		myconf="${myconf} -Dtarget_arch=x64"
+	fi
+
+	if [[ "$ABI" == "x86" ]] ; then
+		myconf="${myconf} -Dtarget_arch=ia32"
+	fi
+
+	if use arm; then
+		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dv8_use_snapshot=false -Dlinux_use_tcmalloc=0"
+	fi
+
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
+		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
+	fi
+
+	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
+}
+
+src_compile() {
+	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
+		rootdir="${S}" \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		|| die "compilation failed"
+}
+
+src_install() {
+	# Chromium does not have "install" target in the build system.
+	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
+
+	dodir ${CHROMIUM_HOME}
+
+	exeinto ${CHROMIUM_HOME}
+	doexe out/Release/chrome
+	doexe out/Release/chrome_sandbox
+	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
+	doexe out/Release/xdg-settings
+	doexe "${FILESDIR}"/chromium-launcher.sh
+
+	insinto ${CHROMIUM_HOME}
+	doins out/Release/chrome.pak
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	# chrome.1 is for chromium --help
+	newman out/Release/chrome.1 chrome.1
+	newman out/Release/chrome.1 chromium.1
+
+	if use ffmpeg; then
+		# 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}
+		dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
+		dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
+	fi
+
+	# Plugins symlink
+	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+
+	newicon out/Release/product_logo_48.png ${PN}-browser.png
+	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
+	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
+	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
+		|| die "desktop file sed failed"
+}
diff --git a/www-client/chromium/chromium-4.0.295.0.ebuild b/www-client/chromium/chromium-4.0.295.0.ebuild
index 80955b504e63..4cc9f6ce9213 100644
--- a/www-client/chromium/chromium-4.0.295.0.ebuild
+++ b/www-client/chromium/chromium-4.0.295.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-4.0.295.0.ebuild,v 1.2 2010/01/18 19:41:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.295.0.ebuild,v 1.3 2010/01/24 23:40:49 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -41,12 +41,16 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
+	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
+	# would be better
 	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
 		|| die "kde proxy sed failed"
 	# Changing this in ~/include.gypi does not work
 	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
+	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
diff --git a/www-client/chromium/chromium-4.0.302.2.ebuild b/www-client/chromium/chromium-4.0.302.2.ebuild
index 0ef5e785a076..16d67429316f 100644
--- a/www-client/chromium/chromium-4.0.302.2.ebuild
+++ b/www-client/chromium/chromium-4.0.302.2.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-4.0.302.2.ebuild,v 1.1 2010/01/22 21:38:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild,v 1.2 2010/01/24 23:40:49 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -41,12 +41,16 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
+	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
+	# would be better
 	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
 		|| die "kde proxy sed failed"
 	# Changing this in ~/include.gypi does not work
 	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
+	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
diff --git a/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch b/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
new file mode 100644
index 000000000000..f4e534a16603
--- /dev/null
+++ b/www-client/chromium/files/chromium-20100122-ubuntu-html5-video-mimetypes.patch
@@ -0,0 +1,48 @@
+---
+ net/base/mime_util.cc |    4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: src/net/base/mime_util.cc
+===================================================================
+--- src.orig/net/base/mime_util.cc
++++ src/net/base/mime_util.cc
+@@ -183,39 +183,35 @@
+ // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type
+ // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php
+ static const char* const supported_media_types[] = {
+   // Ogg.
+   "video/ogg",
+   "audio/ogg",
+   "application/ogg",
+ 
+-#if defined(GOOGLE_CHROME_BUILD)
+   // MPEG-4.
+   "video/mp4",
+   "video/x-m4v",
+   "audio/mp4",
+   "audio/x-m4a",
+ 
+   // MP3.
+   "audio/mp3",
+   "audio/x-mp3",
+   "audio/mpeg",
+-#endif
+ };
+ 
+ // List of supported codecs when passed in with <source type="...">.
+ //
+ // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
+ // for more information.
+ static const char* const supported_media_codecs[] = {
+-#if defined(GOOGLE_CHROME_BUILD)
+   "avc1",
+   "mp4a",
+-#endif
+   "theora",
+   "vorbis",
+ };
+ 
+ // Note: does not include javascript types list (see supported_javascript_types)
+ static const char* const supported_non_image_types[] = {
+   "text/html",
+   "text/xml",