diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2016-09-01 11:21:12 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2016-09-01 13:08:47 -0400 |
| commit | 934f744c0c3bb6ec10bb81289d7058ecbb96f474 (patch) | |
| tree | 1f2af2716731477ce8c314ff0853c7b9a0314fcf /www-client | |
| parent | dev-python/wcsaxes: version bump and fix xdg sandbox violation (diff) | |
| download | gentoo-934f744c0c3bb6ec10bb81289d7058ecbb96f474.tar.gz gentoo-934f744c0c3bb6ec10bb81289d7058ecbb96f474.tar.bz2 gentoo-934f744c0c3bb6ec10bb81289d7058ecbb96f474.zip | |
www-client/chromium: build fix with ffmpeg-2.x
Thanks to aballier for the patch.
Package-Manager: portage-2.3.0_p22
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/chromium-54.0.2840.6.ebuild | 3 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-54-ffmpeg2compat.patch | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/www-client/chromium/chromium-54.0.2840.6.ebuild b/www-client/chromium/chromium-54.0.2840.6.ebuild index 049142922f0d..5c2881a5bfa7 100644 --- 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 index 000000000000..efe70fc001e8 --- /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); |