[SCM] mplayer/master: Add upstream patch to fix FTBFS with ffmpeg 3.4

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sun Oct 22 10:45:04 UTC 2017


The following commit has been merged in the master branch:
commit 55ad84e0c2720e8484dc07e83c2436ba675642f5
Author: James Cowgill <jcowgill at debian.org>
Date:   Sun Oct 22 00:27:33 2017 +0100

    Add upstream patch to fix FTBFS with ffmpeg 3.4
    
    Closes: #879461

diff --git a/debian/patches/0102_svn37932_ffmpeg3.4.patch b/debian/patches/0102_svn37932_ffmpeg3.4.patch
new file mode 100644
index 0000000..598e33e
--- /dev/null
+++ b/debian/patches/0102_svn37932_ffmpeg3.4.patch
@@ -0,0 +1,21 @@
+Description: vo_vdpau: Explicitly include header vdpau_x11.h
+ The include from inside libavcodec/vdpau.h was removed in FFmpeg
+ commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42
+ .
+ This fixes the FTBFS with ffmpeg 3.4
+Author: Alexander Strasser <eclipse7 at gmx.net>
+Origin: upstream, commit:37932
+Bug-Debian: https://bugs.debian.org/834135
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/libvo/vo_vdpau.c
++++ b/libvo/vo_vdpau.c
+@@ -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/debian/patches/series b/debian/patches/series
index 43264b0..55885ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@
 0002_mplayer_debug_printf.patch
 0100_svn37857_CVE-2016-4352.patch
 0101_svn37875_fix-crash-with-screenshot-filter.patch
+0102_svn37932_ffmpeg3.4.patch
 0200_fix_spelling_error_in_binary.patch
 0201_PATH_MAX_HURD.patch

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list