www-client/chromium: use bundled opus with bundled ffmpeg

The bundled ffmpeg configure script has a hard-coded path to the
bundled opus headers.

Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1

diff --git a/www-client/chromium/chromium-60.0.3112.78.ebuild b/www-client/chromium/chromium-60.0.3112.78.ebuild
index 88f7fd884057488d0cf7cb88ead5dff6f217d01a..41b2bf0fc8ddebcb5d959832656c0fd33cc9bb2b 100644 (file)
--- a/www-client/chromium/chromium-60.0.3112.78.ebuild
+++ b/www-client/chromium/chromium-60.0.3112.78.ebuild
@@ -46,9 +46,8 @@ COMMON_DEPEND="
        media-libs/libpng:=
        system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
        >=media-libs/openh264-1.6.0:=
-       media-libs/opus:=
        pulseaudio? ( media-sound/pulseaudio:= )
-       system-ffmpeg? ( >=media-video/ffmpeg-3:= )
+       system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= )
        sys-apps/dbus:=
        sys-apps/pciutils:=
        virtual/udev
@@ -319,7 +318,7 @@ src_prepare() {
                third_party/yasm/run_yasm.py
        )
        if ! use system-ffmpeg; then
-               keeplibs+=( third_party/ffmpeg )
+               keeplibs+=( third_party/ffmpeg third_party/opus )
        fi
        if ! use system-libvpx; then
                keeplibs+=( third_party/libvpx )
@@ -381,14 +380,13 @@ src_configure() {
                libwebp
                libxslt
                openh264
-               opus
                re2
                snappy
                yasm
                zlib
        )
        if use system-ffmpeg; then
-               gn_system_libraries+=( ffmpeg )
+               gn_system_libraries+=( ffmpeg opus )
        fi
        if use system-libvpx; then
                gn_system_libraries+=( libvpx )

diff --git a/www-client/chromium/chromium-61.0.3163.13.ebuild b/www-client/chromium/chromium-61.0.3163.13.ebuild
index 472aa46d7cc45e723acbaa30bc3b4bfc4c03056a..59c5286f83f59caf6b39ef7ad6baa65ac0bed8bb 100644 (file)
--- a/www-client/chromium/chromium-61.0.3163.13.ebuild
+++ b/www-client/chromium/chromium-61.0.3163.13.ebuild
@@ -46,9 +46,8 @@ COMMON_DEPEND="
        media-libs/libpng:=
        system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
        >=media-libs/openh264-1.6.0:=
-       media-libs/opus:=
        pulseaudio? ( media-sound/pulseaudio:= )
-       system-ffmpeg? ( >=media-video/ffmpeg-3:= )
+       system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= )
        sys-apps/dbus:=
        sys-apps/pciutils:=
        virtual/udev
@@ -321,7 +320,7 @@ src_prepare() {
                third_party/yasm/run_yasm.py
        )
        if ! use system-ffmpeg; then
-               keeplibs+=( third_party/ffmpeg )
+               keeplibs+=( third_party/ffmpeg third_party/opus )
        fi
        if ! use system-icu; then
                keeplibs+=( third_party/icu )
@@ -388,14 +387,13 @@ src_configure() {
                libwebp
                libxslt
                openh264
-               opus
                re2
                snappy
                yasm
                zlib
        )
        if use system-ffmpeg; then
-               gn_system_libraries+=( ffmpeg )
+               gn_system_libraries+=( ffmpeg opus )
        fi
        if use system-icu; then
                gn_system_libraries+=( icu )