[SCM] xbmc/master: Use VDPAU in Libav hacks only when VDPAU support is enabled

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 58f43c7cbf9ae45e3734484ca198ab959757f400
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Oct 8 15:19:47 2014 +0200

    Use VDPAU in Libav hacks only when VDPAU support is enabled
    
    Fixes FTBFS on arches without VDPAU.

diff --git a/debian/patches/0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch b/debian/patches/0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch
new file mode 100644
index 0000000..778cdc6
--- /dev/null
+++ b/debian/patches/0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch
@@ -0,0 +1,26 @@
+From dccd6d3bec1ce8f13f771f5d21b7413f8b465836 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Wed, 8 Oct 2014 15:17:17 +0200
+Subject: [PATCH] Use VDPAU in Libav hacks only when VDPAU support is enabled
+
+---
+ lib/xbmc-libav-hacks/libav_hacks.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h
+index a840b31..a193ecf 100644
+--- a/lib/xbmc-libav-hacks/libav_hacks.h
++++ b/lib/xbmc-libav-hacks/libav_hacks.h
+@@ -29,7 +29,9 @@ extern "C" {
+ #include <libavresample/avresample.h>
+ #include <libavformat/avformat.h>
+ #include <libavfilter/avfilter.h>
++#ifdef HAVE_LIBVDPAU
+ #include <libavcodec/vdpau.h>
++#endif
+ #ifdef __cplusplus
+ }
+ #endif
+-- 
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 42bb414..bc3c1d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
 0006-Define-AV_CODEC_ID_SUBRIP-to-AV_CODEC_ID_TEXT-in-lib.patch
 0007-Enable-using-external-ffmpeg-in-.-configure.patch
 0008-Setup-AVVDPAUContext-with-API-calls-instead-of-using.patch
+0009-Use-VDPAU-in-Libav-hacks-only-when-VDPAU-support-is-.patch
 03-privacy.patch
 04-differentiate-from-vanilla-XBMC.patch
 05-Fix-GLES-with-X11.patch

-- 
xbmc packaging