projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07e1d5a)
Version bump for dev channel release. Remove old.
authorPaweł Hajdan <phajdan.jr@gentoo.org>
Fri, 5 Aug 2011 23:33:53 +0000 (23:33 +0000)
committerPaweł Hajdan <phajdan.jr@gentoo.org>
Fri, 5 Aug 2011 23:33:53 +0000 (23:33 +0000)
Package-Manager: portage-2.1.10.3/cvs/Linux i686

www-client/chromium/ChangeLog patch | blob | history
www-client/chromium/Manifest patch | blob | history
www-client/chromium/chromium-14.0.835.18.ebuild [moved from www-client/chromium/chromium-14.0.825.0-r1.ebuild with 90% similarity] patch | blob | history

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 9a28bfc9fc4d61b22f27dd7acb5524a232eeba26..6f497987c73d873f5ca90030fef3cd29b4280eb5 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.409 2011/08/05 21:10:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.410 2011/08/05 23:33:53 phajdan.jr Exp $
+
+*chromium-14.0.835.18 (05 Aug 2011)
+
+  05 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-14.0.825.0-r1.ebuild, +chromium-14.0.835.18.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-13.0.782.109 (05 Aug 2011)
 *chromium-13.0.782.107-r1 (05 Aug 2011)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1701f78d150f0df49d54e0cd073495bbc101880f..3bcdfc922ed9ef7c202be3db7d205aa23f1c32aa 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,21 +20,21 @@ AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf207
 DIST chromium-12.0.742.112.tar.bz2 151384207 RMD160 13d9092d79a324852b60e42979218f989000cad1 SHA1 181be3b00386d70e7cc8db88c4e782960a8d4e30 SHA256 b19ea97a7def45c9052ead5ad9f171a3ea1df29c17a5d237e0b78bdfdcefdfb2
 DIST chromium-13.0.782.107.tar.bz2 155319932 RMD160 30b592cb0db7128673682eb9d5bb0bc9bc4b83e8 SHA1 e4b6f33799dc92ea9145afa099d74cfe8f0de481 SHA256 4dcccc29d4da6eb154c2d419ff8637ee190203e15cc85051294f06ac3db9fa04
 DIST chromium-13.0.782.109.tar.bz2 155320890 RMD160 4a42afd1eb7a9f97c4d8207fdf4e2b96b632d8f4 SHA1 2e5df16b074501c851524f2b9c1fa25705740fe4 SHA256 9e0292c5d94eac534fc5078c92547a4f8c0c59e5a8474ea7a39000515c347971
-DIST chromium-14.0.825.0.tar.bz2 202446439 RMD160 7ddecf1714910e2780a683e547ac409cf65bb7ff SHA1 998488b13966be72764442509d915613bb4949d8 SHA256 d4e12b545cb52ec9074a9278eb7e9fbd35f1460b4a5fcd1443616e5dfea12269
 DIST chromium-14.0.835.15.tar.bz2 160030122 RMD160 580b75168420a837c3b03dd6c02bad4d7514583b SHA1 bdc6da9bc3327b61d18e65c940630976adb51d78 SHA256 bb2ddc904474c37ed9d033c000c3f6fc9a80442dbd464aef9b4a5647a0e817c5
+DIST chromium-14.0.835.18.tar.bz2 160339983 RMD160 e035aaf88dc8e096f7f525f40d8a6b261c6d6d55 SHA1 5f122977a5efe457909c5a70bd3522f6c4b35a01 SHA256 a020f02dbdc4d8e0eb97285078a32f25ac0c4d4eaa0ea4227e3cbe7dfd5316e0
 EBUILD chromium-12.0.742.112.ebuild 12047 RMD160 ab3c47a41ff2d69f7d53eab715c9151ed848ea1d SHA1 37012697cc4a0f29558614ebd5aadf476781ee37 SHA256 ebf99c4485e6e19eeeca8fcfefe5de7864497c1d6a3d4fb6c40076bfa9beee33
 EBUILD chromium-13.0.782.107-r1.ebuild 13212 RMD160 489bfd4bfc552a5df0f8026a97f4412543a635b2 SHA1 ab1d0d9fdda75b3ec91edb88573664d6983ec15e SHA256 145464570bc15e0ac962b625d84324738d44af5bdc4437ee2b28e7cb5266166c
 EBUILD chromium-13.0.782.107.ebuild 13205 RMD160 240b7b4a96e9626897b267d755858fea6bbb41fb SHA1 cf1d8bae483997a42490abf9d716d71852a7a817 SHA256 63284a4f6be456c4e9ae80b0ad6e92d3dce61d2a7bb040c2edcf1e48e24032b3
 EBUILD chromium-13.0.782.109.ebuild 13210 RMD160 78efa41ab0bc8ea9adb199993bce1fd6547b52ce SHA1 1047105b295d04fa6d24a439c7d0a7fb55982db1 SHA256 52a93acdabc063b90d19c166ef07397c21356d4762435875bfa14d50fe33d6ae
-EBUILD chromium-14.0.825.0-r1.ebuild 12956 RMD160 6f362ecdcc62cd1bfaac1fb669aad0aa58753263 SHA1 89eda9a0db738d2b4af22f7f299db2ba8ce3bf33 SHA256 aa73336d33777a800be609466595da3ab6b780f03e77ed562e06c8958a263198
 EBUILD chromium-14.0.835.15.ebuild 13068 RMD160 70608b666a9b7bd78df5ebd2fae84039b434fe89 SHA1 985869a16c914c29493fbf46b8abb1656dafd21d SHA256 08ad00084e6e036393cb8a72b37d0b567a791227dd44d4f88db4d805e5fa39d7
+EBUILD chromium-14.0.835.18.ebuild 13068 RMD160 fb42c4db6d658ddf1f58648ab1e89af829eff4e5 SHA1 a662291cb20f2c42529bce4f3350ef022bb48d3c SHA256 e54d7f5db17e435931b1369cd6dcc0bdf778e8aa4a41360dabb3d41cee61750d
 EBUILD chromium-9999-r1.ebuild 14995 RMD160 9299839ad84cf7660c67d6603e34b5701deacc9d SHA1 5df500c71fde454100ed7ca3c6e87ed6a5b89f55 SHA256 e4a607c50b9a1dd23ebd4e52c69e87faa614e87f76b7dbb993a6d643c83af734
-MISC ChangeLog 91311 RMD160 72a75995a81cc63a334cc88f7f939b02a0d75d3a SHA1 b67cfc3bfe11fc0cf2f19a5db32e27363f3fb7a8 SHA256 e037db8d09c80ddd4b6c6feaa68a7d62c4400980fe53ebcc760d19fc1e3e6b53
+MISC ChangeLog 91520 RMD160 615de283d72b9e5b3ebdef7ceaf50bbb34a767a6 SHA1 f0561272d512731bd6bcb20b2058466ea5e16e38 SHA256 9a5897b51eba6660cce039320e3ad7e5b5265fe226fbc421ad860e5509c75b93
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk48XHUACgkQuUQtlDBCeQIj5ACdFJKIoBbj+ZA2Rswo8/89jSld
-QhEAniAZx6QWwyOkqNx4lu4JcpkodAtk
-=Q+yk
+iEYEAREKAAYFAk48fe0ACgkQuUQtlDBCeQL9SQCeMvCi6vAcXx0eE0sr8Mm9m8eL
+TBEAoILvQQHBMDNAqrgdfA8ITCpNEysg
+=WeF0
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-14.0.825.0-r1.ebuild b/www-client/chromium/chromium-14.0.835.18.ebuild
similarity index 90%
rename from www-client/chromium/chromium-14.0.825.0-r1.ebuild
rename to www-client/chromium/chromium-14.0.835.18.ebuild
index 76d65d5a19798ece630bb2d63c1c33613e023b9f..ff22b654272ea995223f4303d83044498454b8f5 100644 (file)
--- a/www-client/chromium/chromium-14.0.825.0-r1.ebuild
+++ b/www-client/chromium/chromium-14.0.835.18.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-14.0.825.0-r1.ebuild,v 1.1 2011/07/20 21:39:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.835.18.ebuild,v 1.1 2011/08/05 23:33:53 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -38,12 +38,11 @@ RDEPEND="app-arch/bzip2
        media-libs/flac
        virtual/jpeg
        media-libs/libpng
-       >=media-libs/libvpx-0.9.5
        >=media-libs/libwebp-0.1.2
        media-libs/speex
+       media-sound/pulseaudio
        cups? ( >=net-print/cups-1.3.11 )
        sys-libs/zlib
-       >=virtual/ffmpeg-0.6.90[threads]
        x11-libs/gtk+:2
        x11-libs/libXinerama
        x11-libs/libXScrnSaver
@@ -118,11 +117,8 @@ src_prepare() {
        # bug #374903 - ICU 4.8 compatibility
        epatch "${FILESDIR}/${PN}-icu-compatibility-r0.patch"
 
-       # Make sure we don't use bundled libvpx headers.
-       epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
-
-       # Fix build without libgcrypt, bug #373079.
-       epatch "${FILESDIR}/${PN}-libgcrypt-r0.patch"
+       # Fix build with system libevent, to be upstreamed.
+       epatch "${FILESDIR}/${PN}-system-libevent-r0.patch"
 
        # Remove most bundled libraries. Some are still needed.
        find third_party -type f \! -iname '*.gyp*' \
@@ -141,20 +137,23 @@ src_prepare() {
                \! -path 'third_party/leveldb/*' \
                \! -path 'third_party/libjingle/*' \
                \! -path 'third_party/libphonenumber/*' \
-               \! -path 'third_party/libvpx/libvpx.h' \
+               \! -path 'third_party/libvpx/*' \
                \! -path 'third_party/mesa/*' \
                \! -path 'third_party/modp_b64/*' \
                \! -path 'third_party/npapi/*' \
                \! -path 'third_party/openmax/*' \
                \! -path 'third_party/ots/*' \
                \! -path 'third_party/protobuf/*' \
+               \! -path 'third_party/sfntly/*' \
                \! -path 'third_party/skia/*' \
                \! -path 'third_party/speex/speex.h' \
                \! -path 'third_party/sqlite/*' \
                \! -path 'third_party/tcmalloc/*' \
                \! -path 'third_party/tlslite/*' \
                \! -path 'third_party/undoview/*' \
+               \! -path 'third_party/webgl_conformance/*' \
                \! -path 'third_party/webrtc/*' \
+               \! -path 'third_party/yasm/*' \
                \! -path 'third_party/zlib/contrib/minizip/*' \
                -delete || die
 
@@ -170,13 +169,17 @@ src_configure() {
        # additions, bug #336871.
        myconf+=" -Ddisable_sse2=1"
 
+       # Disable NaCl temporarily, this tarball doesn't have IRT.
+       myconf+=" -Ddisable_nacl=1"
+
        # Use system-provided libraries.
+       # TODO: use_system_ffmpeg
        # TODO: use_system_hunspell (upstream changes needed).
        # TODO: use_system_ssl (http://crbug.com/58087).
        # TODO: use_system_sqlite (http://crbug.com/22208).
+       # TODO: use_system_vpx
        myconf+="
                -Duse_system_bzip2=1
-               -Duse_system_ffmpeg=1
                -Duse_system_flac=1
                -Duse_system_icu=1
                -Duse_system_libevent=1
@@ -185,7 +188,6 @@ src_configure() {
                -Duse_system_libwebp=1
                -Duse_system_libxml=1
                -Duse_system_speex=1
-               -Duse_system_vpx=1
                -Duse_system_xdg_utils=1
                -Duse_system_zlib=1"
 
@@ -209,7 +211,7 @@ src_configure() {
 
        # Our system ffmpeg should support more codecs than the bundled one
        # for Chromium.
-       myconf+=" -Dproprietary_codecs=1"
+       # myconf+=" -Dproprietary_codecs=1"
 
        local myarch="$(tc-arch)"
        if [[ $myarch = amd64 ]] ; then
@@ -282,17 +284,17 @@ src_install() {
        fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 
        # Install Native Client files on platforms that support it.
-       insinto "${CHROMIUM_HOME}"
-       case "$(tc-arch)" in
-               amd64)
-                       doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
-                       doins out/Release/libppGoogleNaClPluginChrome.so || die
-               ;;
-               x86)
-                       doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
-                       doins out/Release/libppGoogleNaClPluginChrome.so || die
-               ;;
-       esac
+       # insinto "${CHROMIUM_HOME}"
+       # case "$(tc-arch)" in
+       #       amd64)
+       #               doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
+       #               doins out/Release/libppGoogleNaClPluginChrome.so || die
+       #       ;;
+       #       x86)
+       #               doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
+       #               doins out/Release/libppGoogleNaClPluginChrome.so || die
+       #       ;;
+       # esac
 
        newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 
@@ -357,11 +359,11 @@ 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
-       #doexe out/Release/ffmpegsumo_nolink || die
-       #doexe out/Release/libffmpegsumo.so || die
+       # 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
@@ -372,7 +374,7 @@ src_install() {
        local mime_types="text/html;text/xml;application/xhtml+xml;"
        mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
        make_desktop_entry chromium-browser "Chromium" chromium-browser \
-               "Network;WebBrowser"
+               "Network;WebBrowser" \
                "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
        sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
 
Unnamed repository; edit this file 'description' to name the repository.