From dfc62a0088281385d4f93ef0955d97214dea8788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 27 Aug 2018 14:08:47 +0200 Subject: [PATCH] mkvtoolnix: use system libs; enable cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/mkvtoolnix/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index e10057be53f..21b7b845d7a 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,12 +1,13 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=26.0.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt" hostmakedepends="autoconf docbook-xsl libxslt pkg-config ruby" -makedepends="boost-devel cmark-devel file-devel libflac-devel libmatroska-devel - libvorbis-devel qt5-multimedia-devel qt5-tools-devel" +makedepends="boost-devel cmark-devel file-devel json-c++ + libflac-devel libmatroska-devel libvorbis-devel pugixml-devel + qt5-multimedia-devel qt5-tools-devel" short_desc="Create, alter and inspect Matroska videos" maintainer="Jürgen Buchmüller " license="GPL-2.0-only" @@ -14,7 +15,10 @@ homepage="https://www.bunkus.org/videotools/mkvtoolnix/" changelog="https://mkvtoolnix.download/doc/NEWS.md" distfiles="${homepage}/sources/${pkgname}-${version}.tar.xz" checksum=d51e63c356f9f0c92cc0b01ff6e78253954c74186be6ef4c40c5690d18fda7e0 -nocross="Fails due to dependency chain eigen -> jack -> pulseaudio" + +if [ "$CROSS_BUILD" ]; then + configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr" +fi pre_configure() { ./autogen.sh