Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www-client/chromium/ChangeLog12
-rw-r--r--www-client/chromium/Manifest16
-rw-r--r--www-client/chromium/chromium-12.0.742.91-r1.ebuild (renamed from www-client/chromium/chromium-12.0.742.77.ebuild)26
-rw-r--r--www-client/chromium/chromium-13.0.782.24-r1.ebuild (renamed from www-client/chromium/chromium-13.0.782.20.ebuild)21
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild19
5 files changed, 61 insertions, 33 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index c7929e8afdc4..019ebe43f96d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,16 @@
# 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.382 2011/06/16 12:34:25 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.383 2011/06/17 15:10:48 phajdan.jr Exp $
+
+*chromium-13.0.782.24-r1 (17 Jun 2011)
+*chromium-12.0.742.91-r1 (17 Jun 2011)
+
+ 17 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-12.0.742.77.ebuild, +chromium-12.0.742.91-r1.ebuild,
+ -chromium-13.0.782.20.ebuild, +chromium-13.0.782.24-r1.ebuild,
+ chromium-9999-r1.ebuild:
+ Switch back to bundled ffmpeg because of crashes, bug #371931 by Ambroz
+ Bizjak <ambrop7@gmail.com>. Drop ~arm because of yasm dependency. Remove old.
*chromium-13.0.782.24 (16 Jun 2011)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 831f91bcce78..873bd0508079 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,22 +13,20 @@ AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1c
AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
DIST chromium-11.0.696.71.tar.bz2 145183334 RMD160 5cd5753ae72ea984004869686e921274cbcdfe9f SHA1 464a97e2c56a2e9a7b922512b64a99085fcfa876 SHA256 25bb23912506e43e32bc817e99f8276c36fa2c6e367ee5fc552a34081bdb0985
-DIST chromium-12.0.742.77.tar.bz2 151256942 RMD160 41bc2a443db48c51e3359127da5fcf1c1fba310e SHA1 38b5e993aa9b358540b3eafb0407c256f30a5b0c SHA256 9820926daebd204537862cd206ff40d8da67395f8fd119bb9bec001700e409a1
DIST chromium-12.0.742.91.tar.bz2 151259660 RMD160 eb0389f815c638897cf556df5b58eed081cc872b SHA1 bb1f84c48cad0846d7e34f78c047ee71fe8a37b0 SHA256 41995c953436086f2227c55ee8f30a53c2464a7358824b9c629d3985e5a00409
-DIST chromium-13.0.782.20.tar.bz2 155097226 RMD160 1ea4fe83f10da73329c7186f30accb38b78b4e51 SHA1 02466b40f9aad326374aca1b31f3e869436aa851 SHA256 b0b91780881ae6a89694624c6c5d3d1de8b3f598ca99a4cb87fb07fdf7e55302
DIST chromium-13.0.782.24.tar.bz2 155090700 RMD160 5a2935ebbc4a199a48bf800076e2e5b1b332e7b5 SHA1 de55d958a31c89761fbeeb91be8d6f0415ecdab1 SHA256 5f9be1928ed40bf8dd64bb48756fda8ab3fc0eba9a8c903b5fe93d2b2f5bb15f
EBUILD chromium-11.0.696.71.ebuild 10572 RMD160 648e467be38dbdee3d0cddfdb2ae0db0cc4a5a68 SHA1 708a78a9a8bb4955acc14bc965e9d6b1687c665e SHA256 8dcea2b451b397e86498a2501937780b0a87321f4d1e4db2395b2fc784602ba6
-EBUILD chromium-12.0.742.77.ebuild 11565 RMD160 95e9a3549d4e08c077766bad9aaa2195d29847b1 SHA1 fe01ed034373984408314be7ea1224c3fb481d9c SHA256 50cc98382702b77ca5547a78098e7eada86376348ff32a957e5b953aec052bff
+EBUILD chromium-12.0.742.91-r1.ebuild 11928 RMD160 8b1a63fe9a42e93462dc18fbab985f2f53246b1f SHA1 7d14505a06ebbe9e336db00657a67adcf81dda4c SHA256 81650eaaba30fcc7681fe0a35afcbddebc725dc480225a05d2faeda83a545939
EBUILD chromium-12.0.742.91.ebuild 11700 RMD160 86851a5ec884e2b82213f5011d3a174ad964419a SHA1 f0ab0446d7dc46c83f68ba64bb20b9c4d220c03b SHA256 6be4c701f584284f518ddf7518f8251e3011c1982ea8426ca09d088f64e00e8b
-EBUILD chromium-13.0.782.20.ebuild 12326 RMD160 1c07596722ac1da88d2daf49306cb434ae2a170b SHA1 e9c264ca1ed1cbadb03ea5f847fea5851efc03a5 SHA256 0939537b51fb8db04c3ebb2b16f5759d76cb41fc63cf840094c4c53b6d2af0ed
+EBUILD chromium-13.0.782.24-r1.ebuild 12554 RMD160 2ef1fa2ab57a7965acdeea3eb74532e18df16911 SHA1 389f20391fd28d51180deefb3ced5c2216f2b850 SHA256 4189517f76d5885a6742b81ada6b816a969ba4751be06c6460c0ac3cdc4b0062
EBUILD chromium-13.0.782.24.ebuild 12326 RMD160 5b7d5ae8ae64cc9b81525612817c9c8c15af826b SHA1 552d7138dc62ed038e50ecf399198b5e7a626128 SHA256 c2cfc63080cc199f7e1af458927f7dc805d90604a9132bea92e039a7aa895c75
-EBUILD chromium-9999-r1.ebuild 14446 RMD160 435dadce85dc21440379e72375ca8be32432a277 SHA1 a4a573c0f1f71b8742794f0e2372ff00584b9222 SHA256 d1f5d8df7e7337ac898d4cca8c6e9301ac65fa87aead0d4ea60508912f9a90f3
-MISC ChangeLog 85003 RMD160 3ed643eb6f43f59bbc447fed07a2880eb6663ea4 SHA1 33a66495f5e709cbcbf09aaf6730d02908b8b875 SHA256 4530aa8ed654c6e857daea20d1f92f39020150f754d9ec381200a9d1024e9309
+EBUILD chromium-9999-r1.ebuild 14676 RMD160 f0c9ba924b094e35c33ccc1e64fc726dc89a9e56 SHA1 d6b675647764582df209cf890316d2d885115596 SHA256 0353094cd3a4572743593c5de592e0668c12ddb85fbf763d4f263d3883469fe2
+MISC ChangeLog 85449 RMD160 25f237056d4d5ab193d6b80cb633bc8bd43542ef SHA1 22b7ba97e93578d83fef3ac857e4a9a9a0e852df SHA256 20cbb4923fdbd38ea5b984bc0d06c0e5e74cae1e4500b42240b7aa17ed90c66b
MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk35+F8ACgkQuUQtlDBCeQLRGQCfZ4JJ3HED3aHzXKlzTGrckr5n
-hM8An0OhlU/E02QJWed2n1oK7Wr0XPge
-=dArz
+iEYEARECAAYFAk37bosACgkQuUQtlDBCeQLZ2gCggBcJaPShP/y2wIORV3rKo8dO
+XOAAnArLHsArOj7U7qNgQYVAehaSxaEV
+=+ex/
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-12.0.742.77.ebuild b/www-client/chromium/chromium-12.0.742.91-r1.ebuild
index d9ef4e68eb09..c10e1b59cf22 100644
--- a/www-client/chromium/chromium-12.0.742.77.ebuild
+++ b/www-client/chromium/chromium-12.0.742.91-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-12.0.742.77.ebuild,v 1.1 2011/06/03 08:01:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.742.91-r1.ebuild,v 1.1 2011/06/17 15:10:48 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -14,7 +14,7 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="cups gnome gnome-keyring kerberos xinerama"
RDEPEND="app-arch/bzip2
@@ -36,12 +36,12 @@ RDEPEND="app-arch/bzip2
cups? ( >=net-print/cups-1.3.11 )
sys-libs/pam
sys-libs/zlib
- >=virtual/ffmpeg-0.6.90[threads]
x11-libs/gtk+:2
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/flex
@@ -168,13 +168,13 @@ 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_flac=1
- -Duse_system_ffmpeg=1
-Duse_system_icu=1
-Duse_system_libevent=1
-Duse_system_libjpeg=1
@@ -184,6 +184,7 @@ 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.
@@ -206,7 +207,8 @@ src_configure() {
# Our system ffmpeg should support more codecs than the bundled one
# for Chromium.
- myconf+=" -Dproprietary_codecs=1"
+ # TODO: uncomment when bug #371931 is fixed.
+ # myconf+=" -Dproprietary_codecs=1"
# Use target arch detection logic from bug #354601.
case ${CHOST} in
@@ -266,6 +268,11 @@ src_test() {
die "locale ${mylocale} is not supported"
fi
+ # For more info see bug #370957.
+ if [[ $UID -eq 0 ]]; then
+ die "Tests must be run as non-root. Please use FEATURES=userpriv."
+ fi
+
# For more info see bug #350347.
LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
'--gtest_filter=-ICUStringConversionsTest.*'
@@ -304,9 +311,12 @@ src_install() {
# 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
+ # 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
# Install icons and desktop entry.
for SIZE in 16 22 24 32 48 64 128 256 ; do
diff --git a/www-client/chromium/chromium-13.0.782.20.ebuild b/www-client/chromium/chromium-13.0.782.24-r1.ebuild
index 7ee359330569..66588c391083 100644
--- a/www-client/chromium/chromium-13.0.782.20.ebuild
+++ b/www-client/chromium/chromium-13.0.782.24-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-13.0.782.20.ebuild,v 1.1 2011/06/14 09:46:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.782.24-r1.ebuild,v 1.1 2011/06/17 15:10:48 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -14,7 +14,7 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="cups gnome gnome-keyring kerberos xinerama"
# en_US is ommitted on purpose from the list below. It must always be available.
@@ -43,12 +43,12 @@ 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/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/flex
@@ -164,13 +164,13 @@ 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_flac=1
- -Duse_system_ffmpeg=1
-Duse_system_icu=1
-Duse_system_libevent=1
-Duse_system_libjpeg=1
@@ -180,6 +180,7 @@ 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.
@@ -202,7 +203,8 @@ src_configure() {
# Our system ffmpeg should support more codecs than the bundled one
# for Chromium.
- myconf+=" -Dproprietary_codecs=1"
+ # TODO: uncomment when bug #371931 is fixed.
+ # myconf+=" -Dproprietary_codecs=1"
local myarch="$(tc-arch)"
if [[ $myarch = amd64 ]] ; then
@@ -340,9 +342,12 @@ src_install() {
# 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
+ # 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
# Install icons and desktop entry.
for SIZE in 16 22 24 32 48 64 128 256 ; do
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 7d8bcfd3e875..515902c36fed 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.32 2011/06/10 16:44:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.33 2011/06/17 15:10:48 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -44,12 +44,12 @@ 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/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/flex
@@ -193,13 +193,13 @@ 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_flac=1
- -Duse_system_ffmpeg=1
-Duse_system_icu=1
-Duse_system_libevent=1
-Duse_system_libjpeg=1
@@ -209,6 +209,7 @@ 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.
@@ -231,7 +232,8 @@ src_configure() {
# Our system ffmpeg should support more codecs than the bundled one
# for Chromium.
- myconf+=" -Dproprietary_codecs=1"
+ # TODO: uncomment when bug #371931 is fixed.
+ # myconf+=" -Dproprietary_codecs=1"
local myarch="$(tc-arch)"
if [[ $myarch = amd64 ]] ; then
@@ -375,9 +377,12 @@ src_install() {
# 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
+ # 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
# Install icons and desktop entry.
for SIZE in 16 22 24 32 48 64 128 256 ; do