summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-10-23 14:13:40 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-10-23 14:13:45 +0200
commit549f9b5f320c3e0032551e0da821d1151ea764df (patch)
tree6cff061135338b415f8e30f1a74122a37e3fef46
parentnet-libs/libtorrent-rasterbar: Stable on amd64 (diff)
downloadgentoo-549f9b5f320c3e0032551e0da821d1151ea764df.tar.gz
gentoo-549f9b5f320c3e0032551e0da821d1151ea764df.tar.bz2
gentoo-549f9b5f320c3e0032551e0da821d1151ea764df.zip
media-video/mplayer: backport upstream patch fixing vdpau build with latest ffmpeg, bug #625650
Package-Manager: Portage-2.3.12, Repoman-2.3.3
-rw-r--r--media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch19
-rw-r--r--media-video/mplayer/mplayer-1.3.0-r3.ebuild2
2 files changed, 21 insertions, 0 deletions
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 000000000000..ae21941a8aa1
--- /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 d1900e1ba1d8..9283124a63f6 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