[oe] [PATCH][meta-multimedia] mkvtoolnix: fix Boost 1.58 build, update to 7.9.0

Manuel Bachmann manuel.bachmann at iot.bzh
Sat Oct 3 16:40:51 UTC 2015


mkvtoolnix does not compile with newest Boost 1.58, mostly
due to the following bugs :
https://github.com/mbunkus/mkvtoolnix/issues/1172
https://github.com/mbunkus/mkvtoolnix/issues/1176

Update to the version immediately subsequent to their
fixes, and adapt configure steps accordingly.

Signed-off-by: Manuel Bachmann <manuel.bachmann at iot.bzh>
---
 meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb
index dd613b3..223b4ed 100644
--- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb
+++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = "curl boost expat zlib libebml libmatroska libogg libvorbis bzip2 lzo file ruby-native"
 
-PV = "7.1.0+git${SRCPV}"
-SRCREV = "0c89ff941bfdd9f3378312f293a84f13cf3e2a96"
+PV = "7.9.0+git${SRCPV}"
+SRCREV = "1a8b23b1e82ed180a5aaeb43537f2426be252985"
 SRC_URI = "git://github.com/mbunkus/mkvtoolnix.git"
 
 S = "${WORKDIR}/git"
@@ -28,7 +28,9 @@ EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
 
 # remove some hardcoded searchpaths
 do_configure_prepend() {
-    sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ${S}/ac/ebml.m4
+    sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ${S}/ac/qt5.m4
+    git submodule init
+    git submodule update
 }
 
 # Yeah, no makefile
-- 
1.8.3.1




More information about the Openembedded-devel mailing list