MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 14:56:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvtoolnix: fix Boost build, update to 8.4.0, allow Qt5 GUI

Browse Source 
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 latest version, allow to use Qt5 if present,
and adapt configure steps accordingly.

Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Manuel Bachmann 2015-10-12 12:44:33 +02:00 committed by Martin Jansa
parent 9d5b4c712f
commit 251106ac79
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb
View File

@ -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 = "8.4.0+git${SRCPV}"
SRCREV_mkvtoolnix = "7f63ea48ee474754a95838f37aba8f6118c94a65"
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"
@ -20,24 +27,27 @@ inherit autotools-brokensep gettext
RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
PACKAGECONFIG ??= ""
PACKAGECONFIG ??= "flac ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac"
PACKAGECONFIG[qt5] = "--enable-qt --with-moc=${STAGING_BINDIR_NATIVE}/qt5/moc --with-uic=${STAGING_BINDIR_NATIVE}/qt5/uic --with-rcc=${STAGING_BINDIR_NATIVE}/qt5/rcc,--disable-qt,qtbase"
EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
"
FILES_${PN} += "${datadir}"
# 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
}
# Yeah, no makefile
do_compile() {
${S}/drake ${PARALLEL_MAKE}
LC_ALL="en_US.UTF-8" ${S}/drake ${PARALLEL_MAKE}
}
do_install() {
${S}/drake install DESTDIR=${D}
LC_ALL="en_US.UTF-8" ${S}/drake install DESTDIR=${D}
}
# | In file included from src/common/utf8_codecvt_facet.cpp:22:0: