vlc: Add PACKAGECONFIG for jack
PATCH 1/2 vlc: Add PACKAGECONFIG for jack
Signed-off-by Martin Jansa <[email protected]>
--- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 1 + 1 file changed, 1 insertion(+)
meta-multimedia/recipes-multimedia/vlc/vlc.inc +1 -0
@@ -70,6 +70,7 @@ PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" do_configure() { cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/
Signature · 1 line
1.8.5.3
PATCH 2/2 vlc: Fix build with flac-1.3.0
* vlc was broken again since flac was upgraded in oe-core:
commit 85ac4d82c77e3cab6a5867e4ec110ba07023838b
Author: Cristian Iorga <[email protected]>
Date: Wed Feb 12 18:42:32 2014 +0200
Subject: flac: upgrade to 1.3.0
Signed-off-by Martin Jansa <[email protected]>
--- .../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(+) create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch
meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-build-with-newer-flac-1.3.0.patch new file +21 -0
@@ -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 <[email protected]> + +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>
meta-multimedia/recipes-multimedia/vlc/vlc_1.1.11.bb +1 -0
@@ -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"
Signature · 1 line
1.8.5.3