| 1 |
commit: b416f243b74873bcf423578d07023157cdd5436e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 28 19:21:58 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 28 19:22:41 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b416f243 |
| 7 |
|
| 8 |
www-client/chromium: use bundled opus with bundled ffmpeg |
| 9 |
|
| 10 |
The bundled ffmpeg configure script has a hard-coded path to the |
| 11 |
bundled opus headers. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1 |
| 14 |
|
| 15 |
www-client/chromium/chromium-60.0.3112.78.ebuild | 8 +++----- |
| 16 |
www-client/chromium/chromium-61.0.3163.13.ebuild | 8 +++----- |
| 17 |
2 files changed, 6 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-client/chromium/chromium-60.0.3112.78.ebuild b/www-client/chromium/chromium-60.0.3112.78.ebuild |
| 20 |
index 88f7fd88405..41b2bf0fc8d 100644 |
| 21 |
--- a/www-client/chromium/chromium-60.0.3112.78.ebuild |
| 22 |
+++ b/www-client/chromium/chromium-60.0.3112.78.ebuild |
| 23 |
@@ -46,9 +46,8 @@ COMMON_DEPEND=" |
| 24 |
media-libs/libpng:= |
| 25 |
system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
| 26 |
>=media-libs/openh264-1.6.0:= |
| 27 |
- media-libs/opus:= |
| 28 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 29 |
- system-ffmpeg? ( >=media-video/ffmpeg-3:= ) |
| 30 |
+ system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) |
| 31 |
sys-apps/dbus:= |
| 32 |
sys-apps/pciutils:= |
| 33 |
virtual/udev |
| 34 |
@@ -319,7 +318,7 @@ src_prepare() { |
| 35 |
third_party/yasm/run_yasm.py |
| 36 |
) |
| 37 |
if ! use system-ffmpeg; then |
| 38 |
- keeplibs+=( third_party/ffmpeg ) |
| 39 |
+ keeplibs+=( third_party/ffmpeg third_party/opus ) |
| 40 |
fi |
| 41 |
if ! use system-libvpx; then |
| 42 |
keeplibs+=( third_party/libvpx ) |
| 43 |
@@ -381,14 +380,13 @@ src_configure() { |
| 44 |
libwebp |
| 45 |
libxslt |
| 46 |
openh264 |
| 47 |
- opus |
| 48 |
re2 |
| 49 |
snappy |
| 50 |
yasm |
| 51 |
zlib |
| 52 |
) |
| 53 |
if use system-ffmpeg; then |
| 54 |
- gn_system_libraries+=( ffmpeg ) |
| 55 |
+ gn_system_libraries+=( ffmpeg opus ) |
| 56 |
fi |
| 57 |
if use system-libvpx; then |
| 58 |
gn_system_libraries+=( libvpx ) |
| 59 |
|
| 60 |
diff --git a/www-client/chromium/chromium-61.0.3163.13.ebuild b/www-client/chromium/chromium-61.0.3163.13.ebuild |
| 61 |
index 472aa46d7cc..59c5286f83f 100644 |
| 62 |
--- a/www-client/chromium/chromium-61.0.3163.13.ebuild |
| 63 |
+++ b/www-client/chromium/chromium-61.0.3163.13.ebuild |
| 64 |
@@ -46,9 +46,8 @@ COMMON_DEPEND=" |
| 65 |
media-libs/libpng:= |
| 66 |
system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
| 67 |
>=media-libs/openh264-1.6.0:= |
| 68 |
- media-libs/opus:= |
| 69 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 70 |
- system-ffmpeg? ( >=media-video/ffmpeg-3:= ) |
| 71 |
+ system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) |
| 72 |
sys-apps/dbus:= |
| 73 |
sys-apps/pciutils:= |
| 74 |
virtual/udev |
| 75 |
@@ -321,7 +320,7 @@ src_prepare() { |
| 76 |
third_party/yasm/run_yasm.py |
| 77 |
) |
| 78 |
if ! use system-ffmpeg; then |
| 79 |
- keeplibs+=( third_party/ffmpeg ) |
| 80 |
+ keeplibs+=( third_party/ffmpeg third_party/opus ) |
| 81 |
fi |
| 82 |
if ! use system-icu; then |
| 83 |
keeplibs+=( third_party/icu ) |
| 84 |
@@ -388,14 +387,13 @@ src_configure() { |
| 85 |
libwebp |
| 86 |
libxslt |
| 87 |
openh264 |
| 88 |
- opus |
| 89 |
re2 |
| 90 |
snappy |
| 91 |
yasm |
| 92 |
zlib |
| 93 |
) |
| 94 |
if use system-ffmpeg; then |
| 95 |
- gn_system_libraries+=( ffmpeg ) |
| 96 |
+ gn_system_libraries+=( ffmpeg opus ) |
| 97 |
fi |
| 98 |
if use system-icu; then |
| 99 |
gn_system_libraries+=( icu ) |
Archives