| 1 |
commit: 0a85ce77f844148c527fc81a1e661567d75dd238 |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 16:37:03 2017 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 17:19:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a85ce77 |
| 7 |
|
| 8 |
www-client/chromium: add system-libvpx USE flag |
| 9 |
|
| 10 |
This addresses bug #598264 by Andreas Steinmetz. |
| 11 |
|
| 12 |
www-client/chromium/chromium-57.0.2986.0.ebuild | 12 +++++++++--- |
| 13 |
www-client/chromium/metadata.xml | 1 + |
| 14 |
2 files changed, 10 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/chromium/chromium-57.0.2986.0.ebuild b/www-client/chromium/chromium-57.0.2986.0.ebuild |
| 17 |
index 771fbdb..c643438 100644 |
| 18 |
--- a/www-client/chromium/chromium-57.0.2986.0.ebuild |
| 19 |
+++ b/www-client/chromium/chromium-57.0.2986.0.ebuild |
| 20 |
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} |
| 21 |
LICENSE="BSD" |
| 22 |
SLOT="0" |
| 23 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 24 |
-IUSE="component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +tcmalloc widevine" |
| 25 |
+IUSE="component-build cups gconf gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine" |
| 26 |
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
| 27 |
|
| 28 |
# Native Client binaries are compiled with different set of flags, bug #452066. |
| 29 |
@@ -50,7 +50,7 @@ COMMON_DEPEND=" |
| 30 |
media-libs/libexif:= |
| 31 |
media-libs/libjpeg-turbo:= |
| 32 |
media-libs/libpng:= |
| 33 |
- media-libs/libvpx:=[svc] |
| 34 |
+ system-libvpx? ( media-libs/libvpx:=[svc] ) |
| 35 |
media-libs/speex:= |
| 36 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 37 |
system-ffmpeg? ( >=media-video/ffmpeg-3:= ) |
| 38 |
@@ -319,6 +319,10 @@ src_prepare() { |
| 39 |
if ! use system-ffmpeg; then |
| 40 |
keeplibs+=( third_party/ffmpeg ) |
| 41 |
fi |
| 42 |
+ if ! use system-libvpx; then |
| 43 |
+ keeplibs+=( third_party/libvpx ) |
| 44 |
+ keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
| 45 |
+ fi |
| 46 |
|
| 47 |
# Remove most bundled libraries. Some are still needed. |
| 48 |
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
| 49 |
@@ -353,7 +357,6 @@ src_configure() { |
| 50 |
icu |
| 51 |
libjpeg |
| 52 |
libpng |
| 53 |
- libvpx |
| 54 |
libwebp |
| 55 |
libxml |
| 56 |
libxslt |
| 57 |
@@ -365,6 +368,9 @@ src_configure() { |
| 58 |
if use system-ffmpeg; then |
| 59 |
gn_system_libraries+=( ffmpeg ) |
| 60 |
fi |
| 61 |
+ if use system-libvpx; then |
| 62 |
+ gn_system_libraries+=( libvpx ) |
| 63 |
+ fi |
| 64 |
build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
| 65 |
|
| 66 |
# Optional dependencies. |
| 67 |
|
| 68 |
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml |
| 69 |
index c2a73f8..bed144b 100644 |
| 70 |
--- a/www-client/chromium/metadata.xml |
| 71 |
+++ b/www-client/chromium/metadata.xml |
| 72 |
@@ -16,6 +16,7 @@ |
| 73 |
<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag> |
| 74 |
<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag> |
| 75 |
<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> |
| 76 |
+ <flag name="system-libvpx">Use system libvpx instead of the bundled one</flag> |
| 77 |
<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag> |
| 78 |
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag> |
| 79 |
</use> |
Archives