diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-23 02:38:05 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-24 10:10:25 +0100 |
| commit | 8089aa451827cb791c7d795b9899dc152d1ceb66 (patch) | |
| tree | 2976b80bd02290d3aa5fefb8f01a5461d331f9a8 /meta-multimedia | |
| parent | 0a089a36ff22f8a8e425de15b25a853bf92bfd15 (diff) | |
| download | meta-openembedded-contrib-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')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch | 21 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb | 1 |
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 0000000000..8278a3e936 --- /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@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 b381e4682d..368db591a7 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" |