diff options
| -rw-r--r-- | www-client/chromium/ChangeLog | 10 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 7 | ||||
| -rw-r--r-- | www-client/chromium/chromium-5.0.375.3.ebuild | 206 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 35 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-supported-media-mime-types.patch | 38 |
5 files changed, 274 insertions, 22 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index ddd051e0a5ef..9450c25cdcb1 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.84 2010/04/14 13:05:53 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.85 2010/04/14 18:47:37 phajdan.jr Exp $ + +*chromium-5.0.375.3 (14 Apr 2010) + + 14 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> + +chromium-5.0.375.3.ebuild, chromium-9999.ebuild, + +files/chromium-supported-media-mime-types.patch: + Version bump for dev channel release. Add USE flags for mp3 and x264 + support, depending on the system ffmpeg. 14 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> -chromium-5.0.342.7.ebuild, chromium-5.0.342.9.ebuild, diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index fd18a727f194..db5044daf709 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -3,11 +3,14 @@ AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e +AUX chromium-supported-media-mime-types.patch 1016 RMD160 9b3fad22b90e4bea62e343c807349b1a7fce66f5 SHA1 5308bf7b3d0a0743031b089f4931c75c6696e46b SHA256 b396a3104d2dd3cfa8b9489072b565429d11634c0fce453861455b6b829c3ea3 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903 DIST chromium-5.0.371.0.tar.bz2 165863288 RMD160 9b0e195db6049fbca1fd9f3ebd64846bb3978984 SHA1 6f188628ff55519eea4b644afc5f7c4e24716e33 SHA256 92f21bcc8adf2e2136727188aa170530467004d073fbad8ab8e4dcb1f1ea226d +DIST chromium-5.0.375.3.tar.bz2 311290995 RMD160 ef9b85b57827e3cf39027576fc890f700a8ccda2 SHA1 8d76584d0d0d7a2c03e30e043cc0de7ce4c8fedf SHA256 4212f5480d4f268d0297b5e3f5605bc008ffbc4c3da730afb83af0fd3965bd7c EBUILD chromium-5.0.342.9.ebuild 6477 RMD160 501a5608b94501dbea4124afccc18ddfff4009bd SHA1 0a6ebcfc916645985431f1392c0f70373bd3dd47 SHA256 ca181e9d8051eaec05efe26b0dc87fd30e00eb1bd8d3dc2252df6d8238a6cf43 EBUILD chromium-5.0.371.0.ebuild 6705 RMD160 4ecace29d830d36ea0eeca02272ba74258883f31 SHA1 f117fb77b34f0c7ccace47e04dfa06952f10e9f8 SHA256 df746bacaba24d923acd017f3f576b5c8775bfc72aae9cd9198bb4ef8152a12b -EBUILD chromium-9999.ebuild 8458 RMD160 9e7583c0474b9b835421888030a99e16d7b83032 SHA1 c7558f2c1d697213e47fad7ff515f9a68a8b4de7 SHA256 2ffe1f4ff960a79a177cf2151daaa27db3b894bbfd353dbc2b83914fd251e811 -MISC ChangeLog 19349 RMD160 ee63a646751301f9c2e9cf111a67aae789b65893 SHA1 3f365cf8c8f0c66bc6596aaad60fb945b05610ff SHA256 e2256e9726cf5fea3cea0922d1cb861f9382ff942f451f09d57d708eb4e28bea +EBUILD chromium-5.0.375.3.ebuild 6393 RMD160 d7d5a67365d53d8180247fab3172557a39585968 SHA1 0978755af68a504f8729e86eef9ec34e78b45e9a SHA256 dcc12f33060be679f0c12de07ef0dab75408c8e4652faba4d23dc8503c074b78 +EBUILD chromium-9999.ebuild 8146 RMD160 d7010cb1dc20c7538e001a2e618318122c03898a SHA1 03493ef38c0d66cf7b380fcf7c2a937787405b17 SHA256 f42535aaecc3ed11124820027cc437661d3e68d3a7b60b36cd7da628dd2b7c16 +MISC ChangeLog 19658 RMD160 d04eaea625730c95d1009d7254138066cce3e0d8 SHA1 e549bc4c4ab3072338821fb2f051adf87360ffd4 SHA256 93c367d75b1263ea846d3bf8f5b89e41795e92033ce92ede8e4a942bc5588ace MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5 diff --git a/www-client/chromium/chromium-5.0.375.3.ebuild b/www-client/chromium/chromium-5.0.375.3.ebuild new file mode 100644 index 000000000000..fa85d13cc643 --- /dev/null +++ b/www-client/chromium/chromium-5.0.375.3.ebuild @@ -0,0 +1,206 @@ +# 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-5.0.375.3.ebuild,v 1.1 2010/04/14 18:47:37 phajdan.jr Exp $ + +EAPI="2" +inherit eutils flag-o-matic multilib portability toolchain-funcs + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="mp3 +plugins-symlink x264" + +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-libs/alsa-lib-1.0.19 + media-libs/jpeg:0 + media-libs/libpng + >=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=] + sys-libs/zlib + >=x11-libs/gtk+-2.14.7 + x11-libs/libXScrnSaver" +# dev-db/sqlite:3 +DEPEND="${RDEPEND} + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + sys-devel/flex" +RDEPEND+=" + || ( + x11-themes/gnome-icon-theme + x11-themes/tango-icon-theme + x11-themes/xfce4-icon-theme + ) + x11-misc/xdg-utils + virtual/ttf-fonts" + +# Incompatible system plugins: +# www-plugins/gecko-mediaplayer, bug #309231. +RDEPEND+=" + plugins-symlink? ( + !www-plugins/gecko-mediaplayer[gnome] + )" + +pkg_setup() { + if [[ "${ROOT}" == "/" ]]; then + # Prevent user problems like bug 299777. + if ! grep -q /dev/shm <<< $(get_mounts); then + eerror "You don't have tmpfs mounted at /dev/shm." + eerror "${PN} isn't going to work in that configuration." + eerror "Please uncomment the /dev/shm entry in /etc/fstab," + eerror "run 'mount /dev/shm' and try again." + die "/dev/shm is not mounted" + fi + if [ `stat -c %a /dev/shm` -ne 1777 ]; then + eerror "/dev/shm does not have correct permissions." + eerror "${PN} isn't going to work in that configuration." + eerror "Please run chmod 1777 /dev/shm and try again." + die "/dev/shm has incorrect permissions" + fi + fi + + elog "${PN} might crash occasionally. To get more useful backtraces" + elog "and submit better bug reports, please read" + elog "http://www.gentoo.org/proj/en/qa/backtraces.xml" +} + +src_prepare() { + # 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 supporting more media types provided system ffmpeg supports them. + epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch + + # Fix build failure with libpng-1.4, bug 310959. + epatch "${FILESDIR}"/${PN}-libpng-1.4.patch + + # Disable prefixing to allow linking against system zlib + sed -e '/^#include "mozzconf.h"$/d' \ + -i third_party/zlib/zconf.h \ + || die "zlib sed failed" +} + +src_configure() { + export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser + + # Fails to build on arm if we don't do this + use arm && append-flags -fno-tree-sink + + if use mp3 ; then + append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED + fi + + if use x264 ; then + append-cflags -DGENTOO_CHROMIUM_H264_ENABLED + fi + + # 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_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=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" + + # Disable the V8 snapshot. It breaks the build on hardened (bug #301880), + # and the performance gain isn't worth it. + myconf="${myconf} -Dv8_use_snapshot=0" + + # Use target arch detection logic from bug #296917. + local myarch="$ABI" + [[ $myarch = "" ]] && myarch="$ARCH" + + if [[ $myarch = amd64 ]] ; then + myconf="${myconf} -Dtarget_arch=x64" + elif [[ $myarch = x86 ]] ; then + myconf="${myconf} -Dtarget_arch=ia32" + elif [[ $myarch = arm ]] ; then + myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" + else + die "Failed to determine target arch, got '$myarch'." + 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 + + # 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} + + # Plugins symlink, optional wrt bug #301911 + if use plugins-symlink; then + dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins + fi + + # Icon and desktop entry + 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" + # Gnome default application entry + dodir /usr/share/gnome-control-center/default-apps + insinto /usr/share/gnome-control-center/default-apps + doins "${FILESDIR}"/chromium.xml +} diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index 2207fa8d828a..b6df6704871b 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.42 2010/04/13 18:03:30 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.43 2010/04/14 18:47:37 phajdan.jr Exp $ EAPI="2" inherit eutils flag-o-matic multilib portability subversion toolchain-funcs @@ -14,7 +14,7 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="bindist +plugins-symlink" +IUSE="mp3 +plugins-symlink x264" RDEPEND="app-arch/bzip2 >=dev-libs/libevent-1.4.13 @@ -25,7 +25,7 @@ RDEPEND="app-arch/bzip2 >=media-libs/alsa-lib-1.0.19 media-libs/jpeg:0 media-libs/libpng - >=media-video/ffmpeg-0.5_p21602[threads] + >=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=] sys-libs/zlib >=x11-libs/gtk+-2.14.7 x11-libs/libXScrnSaver" @@ -71,13 +71,6 @@ pkg_setup() { elog "${PN} might crash occasionally. To get more useful backtraces" elog "and submit better bug reports, please read" elog "http://www.gentoo.org/proj/en/qa/backtraces.xml" - - if ! use bindist; then - einfo - elog "You may not redistribute this build to any users on your network" - elog "or the internet." - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi } src_unpack() { @@ -124,19 +117,15 @@ src_unpack() { } 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 - if ! use bindist; then - # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg - epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch - fi + + # Allow supporting more media types provided system ffmpeg supports them. + epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch + # Fix build failure with libpng-1.4, bug 310959. epatch "${FILESDIR}"/${PN}-libpng-1.4.patch @@ -151,6 +140,14 @@ src_configure() { # Fails to build on arm if we don't do this use arm && append-flags -fno-tree-sink + if use mp3 ; then + append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED + fi + + if use x264 ; then + append-cflags -DGENTOO_CHROMIUM_H264_ENABLED + fi + # CFLAGS/LDFLAGS mkdir -p "${S}"/.gyp cat << EOF > "${S}"/.gyp/include.gypi diff --git a/www-client/chromium/files/chromium-supported-media-mime-types.patch b/www-client/chromium/files/chromium-supported-media-mime-types.patch new file mode 100644 index 000000000000..793de3d29847 --- /dev/null +++ b/www-client/chromium/files/chromium-supported-media-mime-types.patch @@ -0,0 +1,38 @@ +--- src/net/base/mime_util.cc.orig 2010-04-14 17:22:50.000000000 +0200 ++++ src/net/base/mime_util.cc 2010-04-14 17:25:13.000000000 +0200 +@@ -189,18 +189,20 @@ + "audio/ogg", + "application/ogg", + +-#if defined(GOOGLE_CHROME_BUILD) ++#if defined(GENTOO_CHROMIUM_H264_ENABLED) + // MPEG-4. + "video/mp4", + "video/x-m4v", + "audio/mp4", + "audio/x-m4a", ++#endif // defined(GENTOO_CHROMIUM_H264_ENABLED) + ++#if defined(GENTOO_CHROMIUM_MP3_ENABLED) + // MP3. + "audio/mp3", + "audio/x-mp3", + "audio/mpeg", +-#endif ++#endif // defined(GENTOO_CHROMIUM_MP3_ENABLED) + }; + + // List of supported codecs when passed in with <source type="...">. +@@ -208,10 +210,10 @@ + // 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) ++#if defined(GENTOO_CHROMIUM_H264_ENABLED) + "avc1", + "mp4a", +-#endif ++#endif // defined(GENTOO_CHROMIUM_H264_ENABLED) + "theora", + "vorbis", + }; |