On Sat, Oct 03, 2015 at 11:22:39PM +0200, Manuel Bachmann wrote: > 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 <[email protected]> > --- > meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb > b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb > index dd613b3..da10153 100644 > --- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb > +++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb > @@ -6,9 +6,16 @@ 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" > -SRC_URI = "git://github.com/mbunkus/mkvtoolnix.git" > +PV = "7.9.0+git${SRCPV}" > +SRCREV_mkvtoolnix = "1a8b23b1e82ed180a5aaeb43537f2426be252985" > +SRCREV_libebml = "04b34b0dbded40e0cec93cafa6a4f4c8e90c3206" > +SRCREV_libmatroska = "db5d627b5bf48516c9e0b540254c0d36595760c3" > +SRCREV_FORMAT = "mkvtoolnix" > +SRC_URI = " \ > + git://github.com/mbunkus/mkvtoolnix.git;name=mkvtoolnix \ > + > git://github.com/Matroska-Org/libebml.git;name=libebml;destsuffix=git/lib/libebml > \ > + > git://github.com/Matroska-Org/libmatroska.git;name=libmatroska;destsuffix=git/lib/libmatroska > \ > + " > > S = "${WORKDIR}/git" > > @@ -28,7 +35,7 @@ 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
It still fails in do_configure
configure:8231: checking for the Qt version
/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/moc uses
configure:8239: result: too old: 4.8.7
Can we use some PACKAGECONFIGs to disable qt{4,5}?
> }
>
> # Yeah, no makefile
> --
> 1.8.3.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> [email protected]
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
