[SCM] xbmc/master: Fix FTBFS with packaged FFmpeg

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e21c1cc0e3626b1315d41a4d06ded239c792bdf2
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Oct 25 00:38:59 2014 +0200

    Fix FTBFS with packaged FFmpeg
    
    Closes: #766680

diff --git a/debian/patches/11-fix-vdpau-include.patch b/debian/patches/11-fix-vdpau-include.patch
new file mode 100644
index 0000000..cca68ea
--- /dev/null
+++ b/debian/patches/11-fix-vdpau-include.patch
@@ -0,0 +1,39 @@
+Description: Include libavcodec/vdpau.h as C library
+ This fixes a linking failure with av_vdpau_alloc_context.
+
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2014-10-24>
+
+--- xbmc-13.2+dfsg1.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
++++ xbmc-13.2+dfsg1/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
+@@ -43,7 +43,6 @@
+ #include "DllAvUtil.h"
+ #include "DVDVideoCodec.h"
+ #include "DVDVideoCodecFFmpeg.h"
+-#include "libavcodec/vdpau.h"
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #define GLX_GLXEXT_PROTOTYPES
+@@ -52,7 +51,6 @@
+ #include "DllAvUtil.h"
+ #include "DVDVideoCodec.h"
+ #include "DVDVideoCodecFFmpeg.h"
+-#include "libavcodec/vdpau.h"
+ #include "threads/CriticalSection.h"
+ #include "threads/SharedSection.h"
+ #include "settings/VideoSettings.h"
+@@ -62,6 +60,14 @@
+ #include "utils/ActorProtocol.h"
+ #include <list>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++#include "libavcodec/vdpau.h"
++#ifdef __cplusplus
++}
++#endif
++
+ using namespace Actor;
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 64c7994..3857f59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@
 07-use-system-groovy.patch
 08-armel.patch
 09-use-correct-ftgl.h
+11-fix-vdpau-include.patch                                                                           

-- 
xbmc packaging