www-client/chromium: build fix with ffmpeg-2.x

Thanks to aballier for the patch.

Package-Manager: portage-2.3.0_p22

diff --git a/www-client/chromium/chromium-54.0.2840.6.ebuild b/www-client/chromium/chromium-54.0.2840.6.ebuild
index 049142922f0d44f06550563d2ec0aa4d639b27cc..5c2881a5bfa72d7d868b9a7291feb6d931a15503 100644 (file)
--- a/www-client/chromium/chromium-54.0.2840.6.ebuild
+++ b/www-client/chromium/chromium-54.0.2840.6.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND="
        media-libs/libvpx:=[svc]
        media-libs/speex:=
        pulseaudio? ( media-sound/pulseaudio:= )
-       system-ffmpeg? ( >=media-video/ffmpeg-3.0.1:= )
+       system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
        sys-apps/dbus:=
        sys-apps/pciutils:=
        >=sys-libs/libcap-2.22:=
@@ -163,6 +163,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-system-ffmpeg-r3.patch"
        "${FILESDIR}/${PN}-system-jinja-r13.patch"
        "${FILESDIR}/${PN}-widevine-r1.patch"
+       "${FILESDIR}/chromium-54-ffmpeg2compat.patch"
 )
 
 pkg_pretend() {

diff --git a/www-client/chromium/files/chromium-54-ffmpeg2compat.patch b/www-client/chromium/files/chromium-54-ffmpeg2compat.patch
new file mode 100644 (file)
index 0000000..efe70fc
--- /dev/null
+++ b/www-client/chromium/files/chromium-54-ffmpeg2compat.patch
@@ -0,0 +1,27 @@
+Disable checks against macros that do not exist in ffmpeg-2.x
+
+Patch by aballier.
+
+--- a/media/ffmpeg/ffmpeg_common.cc
++++ b/media/ffmpeg/ffmpeg_common.cc
+@@ -786,7 +786,9 @@ TEST_PRIMARY(SMPTE170M);
+ TEST_PRIMARY(SMPTE240M);
+ TEST_PRIMARY(FILM);
+ TEST_PRIMARY(BT2020);
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(55,5,0)
+ TEST_PRIMARY(SMPTEST428_1);
++#endif
+ 
+ TEST_TRANSFER(RESERVED0);
+ TEST_TRANSFER(BT709);
+@@ -804,8 +806,10 @@ TEST_TRANSFER(BT1361_ECG);
+ TEST_TRANSFER(IEC61966_2_1);
+ TEST_TRANSFER(BT2020_10);
+ TEST_TRANSFER(BT2020_12);
++#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(55,5,0)
+ TEST_TRANSFER(SMPTEST2084);
+ TEST_TRANSFER(SMPTEST428_1);
++#endif
+ 
+ TEST_COLORSPACE(RGB);
+ TEST_COLORSPACE(BT709);