[gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/files/, media-video/mplayer/

[Alexis Ballier]

commit:     549f9b5f320c3e0032551e0da821d1151ea764df
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 12:13:40 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 12:13:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=549f9b5f

media-video/mplayer: backport upstream patch fixing vdpau build with latest ffmpeg, bug #625650

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch | 19 +++++++++++++++++++
 media-video/mplayer/mplayer-1.3.0-r3.ebuild           |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
new file mode 100644
index 00000000000..ae21941a8aa
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -0,0 +1,19 @@
+r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines
+
+vo_vdpau: Explicitly include header vdpau_x11.h
+
+The include from inside libavcodec/vdpau.h was removed in FFmpeg
+commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
+
+Index: libvo/vo_vdpau.c
+===================================================================
+--- libvo/vo_vdpau.c	(revision 37931)
++++ libvo/vo_vdpau.c	(revision 37932)
+@@ -34,6 +34,7 @@
+ 
+ #include <stdio.h>
+ #include <strings.h>
++#include <vdpau/vdpau_x11.h>
+ 
+ #include "config.h"
+ #include "sub/ass_mp.h"

diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index d1900e1ba1d..9283124a63f 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -185,6 +185,8 @@ REQUIRED_USE="
 	xvmc? ( xv )"
 RESTRICT="faac? ( bindist )"
 
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog