From 144eb6b46b41f5dec53c855f2b0b15ed68c1da63 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Wed, 30 Sep 2020 19:08:11 +0200 Subject: media-video/mkvtoolnix: bump to 50.0.0. Fix automagic on pandoc Closes: https://bugs.gentoo.org/692018 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Alexis Ballier --- media-video/mkvtoolnix/Manifest | 1 + media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild | 130 ++++++++++++++++++++++++ media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 4 + 3 files changed, 135 insertions(+) create mode 100644 media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index d97e82242434..c98e88454bfb 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -2,3 +2,4 @@ DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abe DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8 SHA512 dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018 SHA512 087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7 +DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437 SHA512 ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea diff --git a/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild new file mode 100644 index 000000000000..d84291b28039 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug dvd nls pch qt5 test" +RESTRICT="!test? ( test )" + +# check NEWS.md for build system changes entries for boost/libebml/libmatroska +# version requirement updates and other packaging info +RDEPEND=" + >=dev-libs/boost-1.60:= + >=dev-libs/libebml-1.4.0:= + >=dev-libs/libfmt-6.1.0:= + dev-libs/libpcre2:= + dev-libs/pugixml:= + media-libs/flac:= + >=media-libs/libmatroska-1.6.0:= + media-libs/libogg:= + media-libs/libvorbis:= + sys-apps/file + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + app-text/cmark:0= + dbus? ( dev-qt/qtdbus:5 ) + ) +" +DEPEND="${RDEPEND} + dev-cpp/nlohmann_json + dev-libs/utfcpp + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-ruby/rake + virtual/pkgconfig + nls? ( + sys-devel/gettext + app-text/po4a + ) +" + +PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) + +src_prepare() { + xdg_src_prepare + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # https://bugs.gentoo.org/692018 + sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die + + eautoreconf + + # remove bundled libs + rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die +} + +src_configure() { + # bug 692322, use system dev-libs/utfcpp + append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp + + local myeconfargs=( + $(use_enable debug) + $(usex pch "" --disable-precompiled-headers) + $(use_enable dbus) + $(use_enable qt5 qt) + $(use_with dvd dvdread) + $(use_with nls gettext) + $(usex nls "" --with-po4a-translate=false) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + ) + + if use qt5 ; then + # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 + myeconfargs+=( + --with-moc=$(qt5_get_bindir)/moc + --with-uic=$(qt5_get_bindir)/uic + --with-rcc=$(qt5_get_bindir)/rcc + --with-qmake=$(qt5_get_bindir)/qmake + ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + rake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + rake V=1 -j$(makeopts_jobs) tests:unit || die + rake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" rake -j$(makeopts_jobs) install || die + + einstalldocs + dodoc NEWS.md + doman doc/man/*.1 +} diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 7456a1ad02d0..d84291b28039 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -28,6 +28,7 @@ RDEPEND=" >=dev-libs/boost-1.60:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= + dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.0:= @@ -71,6 +72,9 @@ src_prepare() { ./autogen.sh || die fi + # https://bugs.gentoo.org/692018 + sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die + eautoreconf # remove bundled libs -- cgit v1.2.3-65-gdbad