CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vlc: Fix build with flac-1.3.0

Browse Source 
* 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>
This commit is contained in:
Martin Jansa 2014-02-23 02:38:05 +01:00
parent 0a089a36ff
commit 8089aa4518
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch Normal file
View File

@ -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>

1
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb
View File

@ -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"