| 1 |
commit: 36e9c59d0e3460ff7447736608aee6efcd709eef |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 24 22:23:25 2017 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 24 22:43:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e9c59d |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump (57.0.2987.8) |
| 9 |
|
| 10 |
www-client/chromium/Manifest | 2 +- |
| 11 |
...romium-57.0.2979.0.ebuild => chromium-57.0.2987.8.ebuild} | 12 +++++++++--- |
| 12 |
2 files changed, 10 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 15 |
index 3fc7a7f..eb69b2d 100644 |
| 16 |
--- a/www-client/chromium/Manifest |
| 17 |
+++ b/www-client/chromium/Manifest |
| 18 |
@@ -1,5 +1,5 @@ |
| 19 |
DIST chromium-55.0.2883.75.tar.xz 511256096 SHA256 5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55 SHA512 9830b02e05ebaf120b02b11114c67196ba5c7f2d5aa917b9e5f8516b1f0cce1abd8e752c379e8ac1f16c7b7e451341486d9356d47a1b77b72ab5117390ce16b9 WHIRLPOOL ab752b9e9a6c7a536424ac1384d9f0ad0f23dd40bbf6784e4185554602628e8e1f45acbb264fff33f7f00c8ee14f293bfaf23259d2db4f785c9c9c49e72b28eb |
| 20 |
DIST chromium-56.0.2924.59.tar.xz 513389580 SHA256 3b34c4cef3a5017556064d246b14b69a8bd2277d8908a6e8b63c014d501ebac2 SHA512 3ef43728e7ca9d5c1eb4b808bd8c0dbf37a3ee387c57d2826e39fed47ab6316e636b96fd2787c140601e87bd084df61093a85c5014e6151ca70c2e9619a1d52c WHIRLPOOL 4d2f8ee6e7c5b1f3455ba9c25518178990e725dafcc75a3049a6fd5ddb17dfdf3b325c78478b7b3ca62fe7712e8e58e0f5f0f0944d32d99dc0819f99293268c0 |
| 21 |
DIST chromium-56.0.2924.67.tar.xz 513502788 SHA256 564444bcdff78b3361c361d5c32ec4344be6acde58570e6739401395b6e42594 SHA512 a93d3cc343bf6b87aa222920e44485e43eaeb4cecf31999ab96113886432e986b530f929c8032e648938aeac5a957991995c795bc6760ce105a4419bb649961c WHIRLPOOL 18dc7b69a15bfb2fc0e990f4e07aa2e8e09d3f847b89b2e468a7752a40ded1e9095869cab913e39c0e363a1f1af1ec401c6fe1aa12cca71b66ab68c37e0ac746 |
| 22 |
-DIST chromium-57.0.2979.0.tar.xz 523638884 SHA256 b4ae30097c9fa52c366618e611ee2ee0dae35b742abbf9384099131b48357682 SHA512 cbf14fceacc5c559c27d2b8f22c2f1bc02207de0156b54b090f6f08106771349b5dcc04e3cd80021318098b5a9e7b00cf8a5f11414e97ee1e8a0c07da10c494f WHIRLPOOL 42f62f2d6de4cccdcad81370b545022daec08b9dd163639d81571e1c07f50e5f46e628e8194a8c51493ce416c1cdd0a572bf1f469d0089f612c3a22b33e2abe7 |
| 23 |
DIST chromium-57.0.2986.0.tar.xz 524087844 SHA256 3d6db744a750c0bffeda6f00aa1d2fd27efa6e0a44354a5d6be5fa2414095897 SHA512 1737c0e626d38277176f96cc3314c2b44226f020d1387ed6a31362763e37b13312a112af16c876fa99546f20f8649f0076dfe3280895272fd0f2dd9d57ae8deb WHIRLPOOL 988cf3f656082efbe6b78a74b7f9060d1f0e436dae72f250a0751eaeab2cd654c25d83c5b84fd1bd726346ce6bdbf1db98cdba69c1cab0c200d84c339685fc1f |
| 24 |
+DIST chromium-57.0.2987.8.tar.xz 521629532 SHA256 3fbdb631a03cf310ca7fab6783c0a2dabd02940330fdcb1a0bc3436bcca4ac36 SHA512 5c8a66873f79b4d986bb5fbcf1a66d02bd87c68e2fc061cd60a758cd207e8a16ce16b0ec01fcf62904c68f9b67b3c564e77e3208d962c977e3af84df9816f525 WHIRLPOOL c3d0ca9f31905292948f3594b7a84a12617407253054e3fb986d14b51277e1a8b7e1d834cfcea048c0b409f09595ef5f8ebd7dd06c20ef1be5d45b300cad3e7a |
| 25 |
|
| 26 |
diff --git a/www-client/chromium/chromium-57.0.2979.0.ebuild b/www-client/chromium/chromium-57.0.2987.8.ebuild |
| 27 |
similarity index 98% |
| 28 |
rename from www-client/chromium/chromium-57.0.2979.0.ebuild |
| 29 |
rename to www-client/chromium/chromium-57.0.2987.8.ebuild |
| 30 |
index 771fbdb..c643438 100644 |
| 31 |
--- a/www-client/chromium/chromium-57.0.2979.0.ebuild |
| 32 |
+++ b/www-client/chromium/chromium-57.0.2987.8.ebuild |
| 33 |
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} |
| 34 |
LICENSE="BSD" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 37 |
-IUSE="component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine" |
| 38 |
+IUSE="component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine" |
| 39 |
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
| 40 |
|
| 41 |
# Native Client binaries are compiled with different set of flags, bug #452066. |
| 42 |
@@ -50,7 +50,7 @@ COMMON_DEPEND=" |
| 43 |
media-libs/libexif:= |
| 44 |
media-libs/libjpeg-turbo:= |
| 45 |
media-libs/libpng:= |
| 46 |
- media-libs/libvpx:=[svc] |
| 47 |
+ system-libvpx? ( media-libs/libvpx:=[svc] ) |
| 48 |
media-libs/speex:= |
| 49 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 50 |
system-ffmpeg? ( >=media-video/ffmpeg-3:= ) |
| 51 |
@@ -319,6 +319,10 @@ src_prepare() { |
| 52 |
if ! use system-ffmpeg; then |
| 53 |
keeplibs+=( third_party/ffmpeg ) |
| 54 |
fi |
| 55 |
+ if ! use system-libvpx; then |
| 56 |
+ keeplibs+=( third_party/libvpx ) |
| 57 |
+ keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
| 58 |
+ fi |
| 59 |
|
| 60 |
# Remove most bundled libraries. Some are still needed. |
| 61 |
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
| 62 |
@@ -353,7 +357,6 @@ src_configure() { |
| 63 |
icu |
| 64 |
libjpeg |
| 65 |
libpng |
| 66 |
- libvpx |
| 67 |
libwebp |
| 68 |
libxml |
| 69 |
libxslt |
| 70 |
@@ -365,6 +368,9 @@ src_configure() { |
| 71 |
if use system-ffmpeg; then |
| 72 |
gn_system_libraries+=( ffmpeg ) |
| 73 |
fi |
| 74 |
+ if use system-libvpx; then |
| 75 |
+ gn_system_libraries+=( libvpx ) |
| 76 |
+ fi |
| 77 |
build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
| 78 |
|
| 79 |
# Optional dependencies. |
Archives