From 50720aacfd1583a03691a97af0d09ecd2ddd4ac2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Sat, 22 May 2010 18:42:12 +0000 Subject: [PATCH] Version bump for beta channel release. Remove old. Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- www-client/chromium/ChangeLog | 10 +++- www-client/chromium/Manifest | 8 ++-- ...5.29.ebuild => chromium-5.0.375.53.ebuild} | 46 ++++--------------- .../chromium/files/chromium-drop_sse2.patch | 44 ------------------ .../chromium-supported-media-mime-types.patch | 38 --------------- 5 files changed, 21 insertions(+), 125 deletions(-) rename www-client/chromium/{chromium-5.0.375.29.ebuild => chromium-5.0.375.53.ebuild} (79%) delete mode 100644 www-client/chromium/files/chromium-drop_sse2.patch delete mode 100644 www-client/chromium/files/chromium-supported-media-mime-types.patch diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index eff36d789d6f..844c8b47c813 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.100 2010/05/21 09:10:13 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.101 2010/05/22 18:42:11 phajdan.jr Exp $ + +*chromium-5.0.375.53 (22 May 2010) + + 22 May 2010; Pawel Hajdan jr + -files/chromium-drop_sse2.patch, -chromium-5.0.375.29.ebuild, + +chromium-5.0.375.53.ebuild, + -files/chromium-supported-media-mime-types.patch: + Version bump for beta channel release. Remove old. *chromium-6.0.408.1 (21 May 2010) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index e80bebafb61a..83baa2d8c5ba 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,18 +1,16 @@ AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df -AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6 AUX chromium-launcher.sh 1097 RMD160 6a35819d6ae463d1614ecd5976fe8aeae1a3519e SHA1 93b8259fe9ddf6914faa9a4cdbaf451a97031228 SHA256 9d16e2afe508c33aa987001a0442696eaefd5cf91e7a6c9eeb900bc9824390c9 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.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db0dce42bdf3 SHA1 1484a1295853e7a021278e897b11f845603e5e04 SHA256 26616b68fb69257216d8d229669246704c8401c97409e5e5b13394a50f4e3f1b DIST chromium-5.0.375.38.tar.bz2 163360507 RMD160 fcb75ca4aa61e81378c45005601bd292a6ae19c8 SHA1 557df642958846a25e92fe00e1fe46e7d78adc05 SHA256 26912fdf57e32b2d859af45631a6797bb83af42d62b4cc94c3625382712d8ac2 +DIST chromium-5.0.375.53.tar.bz2 163075844 RMD160 17844dbe2f3a3ecd32272ce56d3c6a3d551469e1 SHA1 ba9718c3baf6ae297bb2acb89274c6cc25400e7a SHA256 56559ffc21cb7481a21f7464444b58accfbdcb5c08e9b0a6b649410c5a18796c DIST chromium-6.0.401.1.tar.bz2 170937577 RMD160 7d4218faf521e0c7d08719f8e9d8685939cc94ea SHA1 ceeb841185872adc0b62cbac9e8e595e7ebf634a SHA256 44cdf122a4b4d9a09e771cdcb74cc3d54dd1f6cf5773d5988e0653eb8fc404db DIST chromium-6.0.408.1.tar.bz2 171427450 RMD160 53940a407744860e2c16bf5f468ea5b2dc523d5d SHA1 1df3bfa36a78d9f3d0295839511c253fbc4c4526 SHA256 31c93349f79df3a501d7a1a2dc650dcf949c05a32b95d20c01aaf70d2e8f77df -EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e EBUILD chromium-5.0.375.38.ebuild 5440 RMD160 f51212584075bf894458925729b9beaced45a941 SHA1 4ef358d10c68640cc13f52368cccc27f29f02659 SHA256 fa002da09aa98a98c6c27e7e1ba02d82fabe44fb7f0c811a35c6376224b7dd45 +EBUILD chromium-5.0.375.53.ebuild 5440 RMD160 b9d3ea58b0316a9e76ffc654f8abdff6545d0a2b SHA1 c004d85fe7c55645a23508d0baa1fc8dd6dd0f15 SHA256 24f77fba5d7dea0a0a6bea4d5a21671aac631dd7420ee6dc4abac9ec7048578c EBUILD chromium-6.0.401.1.ebuild 5276 RMD160 f49259b1cdf9821a4933a44dded75410e5422a05 SHA1 8870657017ae63d11e8c8d0610d9ce847182486c SHA256 6eafbfe4babbf3600a4d7d0cad069789e9bc4688228d76e9649013f6f9453729 EBUILD chromium-6.0.408.1.ebuild 5027 RMD160 09ab14447ce7a1fefc021e4c0027eedf0fb6aff1 SHA1 f146211adaf1f5c1503f8beea843af6c4da5d95d SHA256 dd66f79c39247514a8cd4e4d53a03d5bc3549b3954f10ea2619f14e157dd26f7 EBUILD chromium-9999.ebuild 6780 RMD160 837998ec6dc028d7cb8ac40080806f0e0d603917 SHA1 3b19bbb5238d207e5dd0d8530049490c8d09b685 SHA256 aaaf5d2ee9ec2f95167c5e8dcc3576e6597bbbc4b52f577bf3d1b2833f43e2ca -MISC ChangeLog 23327 RMD160 588d6c03fb2cc0c739bee8b6089af8498e36eabc SHA1 5af7a9669664b41c04f55df3b5460404943ecfe6 SHA256 eb22d72ab38aa747d75c8b9c718e36fa56e09dbc75a06d940af9f2e47a757384 +MISC ChangeLog 23619 RMD160 307e80d1ee5bc64ca01475373ac5cca5cf30dddd SHA1 1e7d21d8e05be54e3dbf66591153e0a9441dc7c1 SHA256 047c201b2f6a8f0b91128e2c61171bb277f1ae7de1449cbd063fa47d9abf9343 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5 diff --git a/www-client/chromium/chromium-5.0.375.29.ebuild b/www-client/chromium/chromium-5.0.375.53.ebuild similarity index 79% rename from www-client/chromium/chromium-5.0.375.29.ebuild rename to www-client/chromium/chromium-5.0.375.53.ebuild index e537341fb037..cb1a2e7a1ba9 100644 --- a/www-client/chromium/chromium-5.0.375.29.ebuild +++ b/www-client/chromium/chromium-5.0.375.53.ebuild @@ -1,9 +1,10 @@ # 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.29.ebuild,v 1.1 2010/05/04 14:51:53 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.53.ebuild,v 1.1 2010/05/22 18:42:11 phajdan.jr Exp $ EAPI="2" -inherit eutils flag-o-matic multilib portability toolchain-funcs + +inherit eutils flag-o-matic multilib pax-utils toolchain-funcs DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/" @@ -12,7 +13,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="mp3 +plugins-symlink x264" +IUSE="+plugins-symlink" RDEPEND="app-arch/bzip2 >=dev-libs/libevent-1.4.13 @@ -23,7 +24,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[mp3=,threads,x264=] + >=media-video/ffmpeg-0.5_p21602[threads] sys-libs/zlib >=x11-libs/gtk+-2.14.7 x11-libs/libXScrnSaver" @@ -40,6 +41,7 @@ RDEPEND+=" x11-themes/tango-icon-theme x11-themes/xfce4-icon-theme ) + x11-apps/xmessage x11-misc/xdg-utils virtual/ttf-fonts" @@ -50,35 +52,12 @@ RDEPEND+=" !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() { # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 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 + # Allow supporting more media types. + epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch # Fix build failure with libpng-1.4, bug 310959. epatch "${FILESDIR}"/${PN}-libpng-1.4.patch @@ -90,14 +69,6 @@ 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 || die "cflags mkdir failed" cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed" @@ -165,6 +136,7 @@ src_install() { dodir ${CHROMIUM_HOME} exeinto ${CHROMIUM_HOME} + pax-mark m out/Release/chrome doexe out/Release/chrome doexe out/Release/chrome_sandbox fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox diff --git a/www-client/chromium/files/chromium-drop_sse2.patch b/www-client/chromium/files/chromium-drop_sse2.patch deleted file mode 100644 index bece9acb837a..000000000000 --- a/www-client/chromium/files/chromium-drop_sse2.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- - build/common.gypi | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -Index: src/build/common.gypi -=================================================================== ---- src.orig/build/common.gypi -+++ src/build/common.gypi -@@ -386,25 +386,26 @@ - # - # -mfpmath=sse -msse2 makes the compiler use SSE instructions - # which keep floating-point values in SSE registers in its - # native precision (32-bit for single precision, and 64-bit for - # double precision values). This means the floating-point value - # used during computation does not change depending on how the - # compiler optimized the code, since the value is always kept - # in its specified precision. -- 'conditions': [ -- ['branding=="Chromium"', { -- 'cflags': [ -- '-march=pentium4', -- '-msse2', -- '-mfpmath=sse', -- ], -- }], -- ], -+ # Disabled: see http://code.google.com/p/chromium/issues/detail?id=9007 -+ # 'conditions': [ -+ # ['branding=="Chromium"', { -+ # 'cflags': [ -+ # '-march=pentium4', -+ # '-msse2', -+ # '-mfpmath=sse', -+ # ], -+ # }], -+ # ], - 'cflags': [ - '-m32', - ], - 'ldflags': [ - '-m32', - ], - }], - ], diff --git a/www-client/chromium/files/chromium-supported-media-mime-types.patch b/www-client/chromium/files/chromium-supported-media-mime-types.patch deleted file mode 100644 index 793de3d29847..000000000000 --- a/www-client/chromium/files/chromium-supported-media-mime-types.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 . -@@ -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", - }; -- 2.26.2