[SCM] vlc/master: Fix FTBFS with FLAC 1.3, Closes: #712687

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 89ddb5324278e3afa34cc472a426e8aab686da1f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 19 07:38:01 2013 +0200

    Fix FTBFS with FLAC 1.3, Closes: #712687

diff --git a/debian/patches/fix-ftbfs-flac-1.3.patch b/debian/patches/fix-ftbfs-flac-1.3.patch
new file mode 100644
index 0000000..fea3183
--- /dev/null
+++ b/debian/patches/fix-ftbfs-flac-1.3.patch
@@ -0,0 +1,35 @@
+From: Nicolas Chauvet <kwizart at gmail.com>
+Date: Wed, 2 Jan 2013 21:44:33 +0000 (+0100)
+Subject: Fix build with unreleased FLAC 1.3.x
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=607065b410b4768372c204ccdbbca200230fff25
+
+Fix build with unreleased FLAC 1.3.x
+
+The issue was initialy reported here:
+http://bugzilla.redhat.com/891123
+
+FLAC upstream has always expected to include <FLAC/ suffix
+for included headers as shown in examples/c/decode/file/main.c
+
+The FLAC suffix will not be be made available in the flac.pc
+for the next release:
+http://lists.xiph.org/pipermail/flac-dev/2012-April/003355.html
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+
+diff --git a/modules/codec/flac.c b/modules/codec/flac.c
+index 4cfbfa9..543e8bb 100644
+--- a/modules/codec/flac.c
++++ b/modules/codec/flac.c
+@@ -37,8 +37,8 @@
+ #include <vlc_plugin.h>
+ #include <vlc_codec.h>
+ 
+-#include <stream_decoder.h>
+-#include <stream_encoder.h>
++#include <FLAC/stream_decoder.h>
++#include <FLAC/stream_encoder.h>
+ 
+ #include <vlc_block_helper.h>
+ #include <vlc_bits.h>
diff --git a/debian/patches/series b/debian/patches/series
index 55abf38..8abc0ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 v4l-kfreebsd.patch
 link-binaries-with-c++.patch
+fix-ftbfs-flac-1.3.patch

-- 
VLC media player packaging