[oe-commits] Martin Jansa : vlc: Fix build with flac-1.3.0

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 493b9ad805141814504870c148840aee483b9ea0
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=493b9ad805141814504870c148840aee483b9ea0

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Feb 23 02:38:05 2014 +0100

vlc: Fix build with flac-1.3.0

* vlc was broken again since flac was upgraded in oe-core:
  commit 85ac4d82c77e3cab6a5867e4ec110ba07023838b
  Author: Cristian Iorga <cristian.iorga at intel.com>
  Date:   Wed Feb 12 18:42:32 2014 +0200
  Subject: flac: upgrade to 1.3.0

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../vlc/0003-fix-build-with-newer-flac-1.3.0.patch  | 21 +++++++++++++++++++++
 .../recipes-multimedia/vlc/vlc_1.1.11.bb            |  1 +
 2 files changed, 22 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch
new file mode 100644
index 0000000..8278a3e
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch
@@ -0,0 +1,21 @@
+flac-1.3.0 removed FLAC from pkg-config's includedir, so the user of flac.pc is supposed to
+include the headers with FLAC/ prefix now.
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+
+diff -uNr vlc-1.1.11.orig/modules/codec/flac.c vlc-1.1.11/modules/codec/flac.c
+--- vlc-1.1.11.orig/modules/codec/flac.c	2014-02-23 01:29:56.337515018 +0000
++++ vlc-1.1.11/modules/codec/flac.c	2014-02-23 01:29:04.477514993 +0000
+@@ -38,8 +38,8 @@
+ #include <vlc_codec.h>
+ #include <vlc_aout.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/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
index b381e46..368db59 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
@@ -7,6 +7,7 @@ require vlc.inc
 
 SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
 SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
+SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
 
 PR = "r4"