summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-04-28 13:12:18 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-04-28 13:12:18 +0000
commit4a4e74e036e6d0cdb00bf948c94cd9441c1aa581 (patch)
tree969eb87e3ced205f9fc9252883a2ee301d133607
parentFix dependency problem wrt bug 315471, and improve python related code wrt bu... (diff)
downloadhistorical-4a4e74e036e6d0cdb00bf948c94cd9441c1aa581.tar.gz
historical-4a4e74e036e6d0cdb00bf948c94cd9441c1aa581.tar.bz2
historical-4a4e74e036e6d0cdb00bf948c94cd9441c1aa581.zip
Version bump for dev channel release. Remove old.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
-rw-r--r--www-client/chromium/ChangeLog8
-rw-r--r--www-client/chromium/Manifest6
-rw-r--r--www-client/chromium/chromium-5.0.375.23.ebuild (renamed from www-client/chromium/chromium-5.0.371.0.ebuild)39
3 files changed, 29 insertions, 24 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 248afe4ac5b6..a46ee872bf55 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
# 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.90 2010/04/26 11:43:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.91 2010/04/28 13:12:17 phajdan.jr Exp $
+
+*chromium-5.0.375.23 (28 Apr 2010)
+
+ 28 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-5.0.371.0.ebuild, +chromium-5.0.375.23.ebuild:
+ Version bump for dev channel release. Remove old.
26 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org>
+files/chromium-gcc45.patch, chromium-5.0.342.9.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fe1c5d99d5b4..f8922b8d0243 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -9,11 +9,11 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506
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.23.tar.bz2 161814334 RMD160 139573ba251c4e1a99b0649091b0d52b9553322e SHA1 78bdf22b065bc7da56534f1f0d5d1356694fb260 SHA256 145341c01f81bd64f6ff3e9f762c1aff46206f714d81b3fab7ef8bd178e00140
DIST chromium-5.0.375.9.tar.bz2 248611435 RMD160 5fdf9ed277f0464ec4b925b3047658cca4d2120a SHA1 3277a872eb8ffe04b61f301136c9600671be15e7 SHA256 13cf5a64a414c2b3cec33735efbac0c23131607fcd37d5b9bb9ec1c9ec8481bd
EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
-EBUILD chromium-5.0.371.0.ebuild 6705 RMD160 4ecace29d830d36ea0eeca02272ba74258883f31 SHA1 f117fb77b34f0c7ccace47e04dfa06952f10e9f8 SHA256 df746bacaba24d923acd017f3f576b5c8775bfc72aae9cd9198bb4ef8152a12b
+EBUILD chromium-5.0.375.23.ebuild 6441 RMD160 79a90ad24594d2c3c17f170b7e6e9b60c31eefaa SHA1 9e08e2fa6a19919425c0b8e25f48ab5d91825b09 SHA256 e6e2f4d46f0a9a26825d3bcf9ef0a226ecc5eafc576dcddc4698f6563c93e40f
EBUILD chromium-5.0.375.9.ebuild 6589 RMD160 1888aebc34e494b2bd640a970dbad4da615f4613 SHA1 3e1b189006d98fbfb677cad8db0da5743ff82180 SHA256 5bcc45d7f187ab3cc5ac247f4d2e6d604ce80f7069b71e2e0467a9fab7797f3a
EBUILD chromium-9999.ebuild 8193 RMD160 49ca85aa7d1d01051cfd64a58c33aa270c5f88b1 SHA1 442c6f5a07e7666811ea05d4abd8b06b7e4ec7cd SHA256 778737030ac7d8a12597a71199ab7aaea6cae96f2939365002316590261f9e20
-MISC ChangeLog 20734 RMD160 176422d23ec382b4c1da71d474e38e13c5eb1fcd SHA1 e1240e48dcca453f6e991ef99467330512e02816 SHA256 36f719ca6af371c1137fddb19f563ce32cafdd4cf6e7fea9f4cd14d276b67b24
+MISC ChangeLog 20939 RMD160 cdfcb00f7fbd616ee98e2b076bba694665f6ca3a SHA1 84f8b6880b7cd02f8ee68323876ae35e0be92d61 SHA256 cc30c23159ac94ab1f194f2ff1cda5fd87e1bc65463e3417faff15fa176bfdba
MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.371.0.ebuild b/www-client/chromium/chromium-5.0.375.23.ebuild
index 5a8b2bbd57f8..cfb81bfc304f 100644
--- a/www-client/chromium/chromium-5.0.371.0.ebuild
+++ b/www-client/chromium/chromium-5.0.375.23.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-5.0.371.0.ebuild,v 1.5 2010/04/13 18:03:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.23.ebuild,v 1.1 2010/04/28 13:12:18 phajdan.jr Exp $
EAPI="2"
inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist +plugins-symlink"
+IUSE="mp3 +plugins-symlink x264"
RDEPEND="app-arch/bzip2
>=dev-libs/libevent-1.4.13
@@ -23,18 +23,20 @@ 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"
# dev-db/sqlite:3
DEPEND="${RDEPEND}
+ dev-lang/perl
>=dev-util/gperf-3.0.3
>=dev-util/pkgconfig-0.23
sys-devel/flex"
RDEPEND+="
|| (
x11-themes/gnome-icon-theme
+ x11-themes/oxygen-molecule
x11-themes/tango-icon-theme
x11-themes/xfce4-icon-theme
)
@@ -69,29 +71,18 @@ 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_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
+ epatch "${FILESDIR}"/${PN}-drop_sse2-r0.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
@@ -107,6 +98,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