diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-01-21 09:13:16 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-01-21 09:14:17 +0000 |
| commit | 80298dc00cb3085d12578eb44ce5905c2fec71c3 (patch) | |
| tree | b2d7a3f990b24f550274ad0575225ea8e74538fc | |
| parent | dev-dotnet/libgdiplus: bump to 4.2, fixes #571610 (diff) | |
| parent | media-video/mpv: fix 0.15.0 build with vaapi USE wrt bug 572386 (diff) | |
| download | gentoo-80298dc00cb3085d12578eb44ce5905c2fec71c3.tar.gz gentoo-80298dc00cb3085d12578eb44ce5905c2fec71c3.tar.bz2 gentoo-80298dc00cb3085d12578eb44ce5905c2fec71c3.zip | |
Merge remote-tracking branch 'github/pr/696'.
Gentoo-Bug: 572386
Pull-Request: https://github.com/gentoo/gentoo/pull/696
| -rw-r--r-- | media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch | 23 | ||||
| -rw-r--r-- | media-video/mpv/mpv-0.15.0-r1.ebuild | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch b/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch new file mode 100644 index 000000000000..dc55c9814086 --- /dev/null +++ b/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch @@ -0,0 +1,23 @@ +commit a8abb53a5d00d023aa6cb753ccaa6810e1640338 +Author: wm4 <wm4@nowhere> +Date: Wed Jan 20 15:35:15 2016 +0100 + + vaapi: fix compilation on older FFmpeg/Libav + + They don't define FF_PROFILE_VP9_0. + + Fixes #2737. + +diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c +index edc95f5..313a901 100644 +--- a/video/decode/vaapi.c ++++ b/video/decode/vaapi.c +@@ -109,7 +109,7 @@ static const struct va_native_display disp_x11 = { + #endif + + #define HAS_HEVC VA_CHECK_VERSION(0, 38, 0) +-#define HAS_VP9 VA_CHECK_VERSION(0, 38, 1) ++#define HAS_VP9 (VA_CHECK_VERSION(0, 38, 1) && defined(FF_PROFILE_VP9_0)) + + #define PE(av_codec_id, ff_profile, vdp_profile) \ + {AV_CODEC_ID_ ## av_codec_id, FF_PROFILE_ ## ff_profile, \ diff --git a/media-video/mpv/mpv-0.15.0-r1.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild index ca974a9bd286..3bf763157e6a 100644 --- a/media-video/mpv/mpv-0.15.0-r1.ebuild +++ b/media-video/mpv/mpv-0.15.0-r1.ebuild @@ -163,6 +163,7 @@ src_prepare() { chmod +x "${S}"/waf || die epatch "${FILESDIR}/${P}-fix-null-pointer-dereference.patch" + epatch "${FILESDIR}/${P}-fix-vaapi-build-on-older-ffmpeg.patch" epatch_user } |