summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-02-23 02:38:05 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-24 10:10:25 +0100
commit8089aa451827cb791c7d795b9899dc152d1ceb66 (patch)
tree2976b80bd02290d3aa5fefb8f01a5461d331f9a8 /meta-multimedia/recipes-multimedia
parent0a089a36ff22f8a8e425de15b25a853bf92bfd15 (diff)
downloadmeta-openembedded-8089aa451827cb791c7d795b9899dc152d1ceb66.tar.gz
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@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@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch21
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb1
2 files changed, 22 insertions, 0 deletions
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 000000000..8278a3e93
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch
@@ -0,0 +1,21 @@
1flac-1.3.0 removed FLAC from pkg-config's includedir, so the user of flac.pc is supposed to
2include the headers with FLAC/ prefix now.
3
4Upstream-Status: Pending
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7
8diff -uNr vlc-1.1.11.orig/modules/codec/flac.c vlc-1.1.11/modules/codec/flac.c
9--- vlc-1.1.11.orig/modules/codec/flac.c 2014-02-23 01:29:56.337515018 +0000
10+++ vlc-1.1.11/modules/codec/flac.c 2014-02-23 01:29:04.477514993 +0000
11@@ -38,8 +38,8 @@
12 #include <vlc_codec.h>
13 #include <vlc_aout.h>
14
15-#include <stream_decoder.h>
16-#include <stream_encoder.h>
17+#include <FLAC/stream_decoder.h>
18+#include <FLAC/stream_encoder.h>
19
20 #include <vlc_block_helper.h>
21 #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 b381e4682..368db591a 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
7 7
8SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch" 8SRC_URI += "file://0001-V4L2-mark-horizontal-and-vertical-center-controls-ob.patch"
9SRC_URI += "file://0002-fix-build-with-newer-freetype.patch" 9SRC_URI += "file://0002-fix-build-with-newer-freetype.patch"
10SRC_URI += "file://0003-fix-build-with-newer-flac-1.3.0.patch"
10 11
11PR = "r4" 12PR = "r4"
12 13