| 1 |
commit: 80775cd2358df410e08290b212f6035baff69d85 |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 7 20:24:46 2015 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 7 20:25:31 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80775cd2 |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump (47.0.2526.6); add system-ffmpeg USE flag |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
www-client/chromium/Manifest | 2 +- |
| 13 |
...0.2516.0.ebuild => chromium-47.0.2526.6.ebuild} | 42 +++++++++++++--------- |
| 14 |
www-client/chromium/metadata.xml | 1 + |
| 15 |
3 files changed, 28 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 18 |
index 53fd1ca..836fcdc 100644 |
| 19 |
--- a/www-client/chromium/Manifest |
| 20 |
+++ b/www-client/chromium/Manifest |
| 21 |
@@ -2,5 +2,5 @@ DIST chromium-45.0.2454.101-lite.tar.xz 242364644 SHA256 014720920ad049e354aa190 |
| 22 |
DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665 |
| 23 |
DIST chromium-46.0.2490.22-lite.tar.xz 261632508 SHA256 23a7448cfca032c240262a8d5760f23d9e89bf783ef54467353297856620edb6 SHA512 8d4f8c4cb2c7a4c3c9fb557b4fb2d34c5d7313a82c84fce340254ae59b5fcbc21b2d7b7723d8dd3f7b717175ac12e87373d0889397f01ce189c5718a7deb6de4 WHIRLPOOL dc1fee05d0acc46f9842281e475d1f9d006216c8d8e264ea3eecee63eb14054ff94ed6dd15e6d690305b08670516888a3361f5a3be8f0189c41472d77f0172bb |
| 24 |
DIST chromium-46.0.2490.42-lite.tar.xz 261753316 SHA256 8d24a64af63f88d2654141f2db843dbd6a58c3de5a44b31a34e64813080d9501 SHA512 58681cbc0a99b5c299ea1d17bd8a1681c1c14297fd8d30155b7d1234536791b89f0202de1787c79ff03d978ddc270dc3d9f26fc2fb9cf0aa2a60bd7bf1b9571e WHIRLPOOL 8331c494bdfe793f9a777b30c316321ff40a67d3212f56f12b90568b21dc7f1f9273b0a82e38cdf74387335724047103ec85280320c6965f778e8d18190c7313 |
| 25 |
-DIST chromium-47.0.2516.0-lite.tar.xz 269320024 SHA256 ce90b6e6c99e661853946c992fdc8d88a3676a5f8cad318f887bee1950fb6da8 SHA512 47a62cd7013921ab46f00416cf4442c4550b1b38090ecc502c194e1f2822e07586e35ccb252f04968f4e2e8359bd472c2e12c7af71f2ba41be97839c1bae6941 WHIRLPOOL 877085833ea36f5ddd560563c1a90f31233b3fc81c5ee5ece7c8d50d16fdb979c42a8a7f86595e260632b134164f79eb7d260ee2be4a7b57abfc3a8b06417a5b |
| 26 |
DIST chromium-47.0.2522.1-lite.tar.xz 303952732 SHA256 f20a0ffc2c9c1e0c6bbe546967fe281bf3367402154744838da624ec54d65d54 SHA512 afcf1379bff6cef3d71781fc83014496d191baa3f7eb0934da775ed2ac85cc9ff5ef18556abfe8204452ebccfd31ff1d37108df66b53f270e6863f82bb987097 WHIRLPOOL 6c6d10c5331dc3559887fd5e2e3adcab1261414fd6a94bfa740d671ca684f2d467ad804501d586d45c24fbf62b0d72a906dc11d4edab484a96bd65deb672990d |
| 27 |
+DIST chromium-47.0.2526.6-lite.tar.xz 302688196 SHA256 c794fa33f97b0ab9b77a9438d8ba86cd1311d18241acd53a6f23df058f051279 SHA512 838ca886e78e03e53bc8c6c9d0bd89d04004a8befc5021cc13cc1ac0b30620cac88d543353518a413ea94be503fcb64c0810b8bd24c706afa64c5e4425e4827e WHIRLPOOL ee7636c223d63bd46f65da05839af4da369445afe427eefb268066a86c5819385c75cdc1abb8ec9506defe631b0e1ef29b6e71a1d8d7331edc63c3be3a90a82a |
| 28 |
|
| 29 |
diff --git a/www-client/chromium/chromium-47.0.2516.0.ebuild b/www-client/chromium/chromium-47.0.2526.6.ebuild |
| 30 |
similarity index 94% |
| 31 |
rename from www-client/chromium/chromium-47.0.2516.0.ebuild |
| 32 |
rename to www-client/chromium/chromium-47.0.2526.6.ebuild |
| 33 |
index e8acf4a..293c378 100644 |
| 34 |
--- a/www-client/chromium/chromium-47.0.2516.0.ebuild |
| 35 |
+++ b/www-client/chromium/chromium-47.0.2526.6.ebuild |
| 36 |
@@ -18,9 +18,9 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} |
| 37 |
|
| 38 |
LICENSE="BSD hotwording? ( no-source-code )" |
| 39 |
SLOT="0" |
| 40 |
-KEYWORDS="~amd64 ~arm ~x86" |
| 41 |
-IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine" |
| 42 |
-RESTRICT="proprietary-codecs? ( bindist )" |
| 43 |
+KEYWORDS="~amd64 ~x86" |
| 44 |
+IUSE="cups gnome gnome-keyring gtk3 hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" |
| 45 |
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
| 46 |
|
| 47 |
# Native Client binaries are compiled with different set of flags, bug #452066. |
| 48 |
QA_FLAGS_IGNORED=".*\.nexe" |
| 49 |
@@ -57,6 +57,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= |
| 50 |
>=media-libs/libwebp-0.4.0:= |
| 51 |
media-libs/speex:= |
| 52 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 53 |
+ system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) |
| 54 |
sys-apps/dbus:= |
| 55 |
sys-apps/pciutils:= |
| 56 |
>=sys-libs/libcap-2.22:= |
| 57 |
@@ -192,13 +193,20 @@ src_prepare() { |
| 58 |
# touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die |
| 59 |
# fi |
| 60 |
|
| 61 |
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch" |
| 62 |
epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" |
| 63 |
epatch "${FILESDIR}/chromium-widevine-r1.patch" |
| 64 |
|
| 65 |
epatch_user |
| 66 |
|
| 67 |
+ local conditional_bundled_libraries="" |
| 68 |
+ if ! use system-ffmpeg; then |
| 69 |
+ conditional_bundled_libraries+=" third_party/ffmpeg" |
| 70 |
+ fi |
| 71 |
+ |
| 72 |
# Remove most bundled libraries. Some are still needed. |
| 73 |
build/linux/unbundle/remove_bundled_libraries.py \ |
| 74 |
+ ${conditional_bundled_libraries} \ |
| 75 |
'base/third_party/dmg_fp' \ |
| 76 |
'base/third_party/dynamic_annotations' \ |
| 77 |
'base/third_party/icu' \ |
| 78 |
@@ -235,7 +243,6 @@ src_prepare() { |
| 79 |
'third_party/devscripts' \ |
| 80 |
'third_party/dom_distiller_js' \ |
| 81 |
'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ |
| 82 |
- 'third_party/ffmpeg' \ |
| 83 |
'third_party/fips181' \ |
| 84 |
'third_party/flot' \ |
| 85 |
'third_party/google_input_tools' \ |
| 86 |
@@ -335,6 +342,7 @@ src_configure() { |
| 87 |
# TODO: use_system_sqlite (http://crbug.com/22208). |
| 88 |
myconf+=" |
| 89 |
-Duse_system_bzip2=1 |
| 90 |
+ -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) |
| 91 |
-Duse_system_flac=1 |
| 92 |
-Duse_system_harfbuzz=1 |
| 93 |
-Duse_system_icu=1 |
| 94 |
@@ -491,19 +499,21 @@ src_configure() { |
| 95 |
export TMPDIR="${WORKDIR}/temp" |
| 96 |
mkdir -p -m 755 "${TMPDIR}" || die |
| 97 |
|
| 98 |
- local build_ffmpeg_args="" |
| 99 |
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
| 100 |
- build_ffmpeg_args+=" --disable-asm" |
| 101 |
- fi |
| 102 |
+ if ! use system-ffmpeg; then |
| 103 |
+ local build_ffmpeg_args="" |
| 104 |
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
| 105 |
+ build_ffmpeg_args+=" --disable-asm" |
| 106 |
+ fi |
| 107 |
|
| 108 |
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
| 109 |
- einfo "Configuring bundled ffmpeg..." |
| 110 |
- pushd third_party/ffmpeg > /dev/null || die |
| 111 |
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
| 112 |
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
| 113 |
- chromium/scripts/copy_config.sh || die |
| 114 |
- chromium/scripts/generate_gyp.py || die |
| 115 |
- popd > /dev/null || die |
| 116 |
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
| 117 |
+ einfo "Configuring bundled ffmpeg..." |
| 118 |
+ pushd third_party/ffmpeg > /dev/null || die |
| 119 |
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
| 120 |
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
| 121 |
+ chromium/scripts/copy_config.sh || die |
| 122 |
+ chromium/scripts/generate_gyp.py || die |
| 123 |
+ popd > /dev/null || die |
| 124 |
+ fi |
| 125 |
|
| 126 |
third_party/libaddressinput/chromium/tools/update-strings.py || die |
| 127 |
|
| 128 |
|
| 129 |
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml |
| 130 |
index 2208094..b4aa59b 100644 |
| 131 |
--- a/www-client/chromium/metadata.xml |
| 132 |
+++ b/www-client/chromium/metadata.xml |
| 133 |
@@ -9,6 +9,7 @@ |
| 134 |
<flag name="hotwording">Enable voice-recognition support (Ok Google)</flag> |
| 135 |
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag> |
| 136 |
<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag> |
| 137 |
+ <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> |
| 138 |
<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag> |
| 139 |
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag> |
| 140 |
</use> |
Archives