From ec76217369f71f99613272f2a6d947d8345e3ae6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 16 Jul 2013 09:22:23 +0000
Subject: main/vlc: build fix for flac-1.3

---
 main/vlc/APKBUILD       |  4 ++++
 main/vlc/flac-1.3.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 main/vlc/flac-1.3.patch

diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index d4e95c2b0a..6d20b3ca63 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -71,6 +71,7 @@ source="http://download.videolan.org/pub/videolan/$pkgname/$_pkgver/$pkgname-$_p
 	uclibc-inhibit-spawn.patch
 	uclibc-no-xscreensaver.patch
 	uclibc3.patch
+	flac-1.3.patch
 	vlc.trigger
 	"
 
@@ -223,14 +224,17 @@ md5sums="3b0e465b0990097b65abaf3e25589957  vlc-2.0.7.tar.xz
 28349b8239fdd6987fbe0ca2c758517f  uclibc-inhibit-spawn.patch
 b84c5a9121440b6a1dcf28792d783eb8  uclibc-no-xscreensaver.patch
 94f11ec8394775018222781a0c875444  uclibc3.patch
+f46cd60450e25f764c66b8713a8546b1  flac-1.3.patch
 350b30698eb784def7d19446eb1d6c81  vlc.trigger"
 sha256sums="243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314  vlc-2.0.7.tar.xz
 e645f2b7457aaa18d7215225a3db116dac6312f2853933d58330d6053fba969f  uclibc-inhibit-spawn.patch
 1ecd057c4f6cc02c9a98b48b96c03968d44a8a1d92cb6a62afe4dc48446614a1  uclibc-no-xscreensaver.patch
 6eaa71e580ea5357f10cc6ffb281d38b22b0e88f30915d028079c0c93a4bc32c  uclibc3.patch
+7b5c5a8e4198642f7da3210a038a1ac60b41b93439f0c582304ec2efb448b83e  flac-1.3.patch
 0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a  vlc.trigger"
 sha512sums="6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2  vlc-2.0.7.tar.xz
 2fa65852a18d4bf0cb0cfd92282b3242b7dfec6a5d1e4550fb8a119a444d174bf97781bd90a3ada31a37a0988e7332aa1692a84a6cf5f1f46747d5fd08d4421f  uclibc-inhibit-spawn.patch
 66765557f40ec5a48507c2c3a0f82a3245ac19a83b2aa5b4b4b66335b4ca12a3d359a0c9b7a981039fb9ecf842c97ec11633c9c2fa1834f2c7c98ac088a2c891  uclibc-no-xscreensaver.patch
 14a01f2cf686903c03c4f3b2783487baa0c4ccb89d570c7201f829b00a8e1a0531f7267f28364f6c5f5e52c694183b9b8d0f514f16803e7bace61b5d7cfacd50  uclibc3.patch
+359660a3cff988899f09b2f34b833280f2749bead81589d9a387e1e7ca4c1a5f595016c36e0da95c595e7f53e3c4bb30a56db6145640fabbc3556b20ef3a7c6d  flac-1.3.patch
 a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc  vlc.trigger"
diff --git a/main/vlc/flac-1.3.patch b/main/vlc/flac-1.3.patch
new file mode 100644
index 0000000000..001bd2d7e0
--- /dev/null
+++ b/main/vlc/flac-1.3.patch
@@ -0,0 +1,40 @@
+From patchwork Wed Jan  2 21:44:33 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: Fix build with unreleased FLAC 1.3.x
+Date: Wed, 02 Jan 2013 20:44:33 -0000
+From: Nicolas Chauvet <kwizart@gmail.com>
+X-Patchwork-Id: 889
+Message-Id: <1357163073-31548-1-git-send-email-kwizart@gmail.com>
+To: vlc-devel@videolan.org
+
+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
+
+---
+modules/codec/flac.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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>
-- 
cgit v1.2.3