From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 62553158090 for ; Wed, 18 May 2022 02:09:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43894E084A; Wed, 18 May 2022 02:09:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 157B7E084A for ; Wed, 18 May 2022 02:09:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89DA634173D for ; Wed, 18 May 2022 02:09:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB9B9389 for ; Wed, 18 May 2022 02:09:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652839731.4bfec4188daa52de0eb9d27c483fec11dfed3540.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mkvtoolnix/mkvtoolnix-9999.ebuild X-VCS-Directories: media-video/mkvtoolnix/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4bfec4188daa52de0eb9d27c483fec11dfed3540 X-VCS-Branch: master Date: Wed, 18 May 2022 02:09:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18d980b1-d3cc-4323-80e7-48836d2ad156 X-Archives-Hash: 983a92a1f983b018c2c8c83048d435d0 commit: 4bfec4188daa52de0eb9d27c483fec11dfed3540 Author: Sam James gentoo org> AuthorDate: Wed May 18 02:08:46 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 18 02:08:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfec418 media-video/mkvtoolnix: sync live ebuild Bug: https://bugs.gentoo.org/844097 Signed-off-by: Sam James gentoo.org> media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 48 +++++++++++++++------------ 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 6bb7e14ab307..e228b9bbe6b3 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic multiprocessing qmake-utils xdg @@ -19,36 +19,37 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" LICENSE="GPL-2" SLOT="0" -IUSE="dbus debug dvd nls pch test" +IUSE="dbus debug dvd gui nls pch 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.66:= - >=dev-libs/libebml-1.4.0:= - >=dev-libs/libfmt-6.1.0:= - dev-libs/libpcre2:= - dev-libs/pugixml:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.2:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= - sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtconcurrent:5 - dev-qt/qtmultimedia:5 + gui? ( + 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 + >=dev-cpp/nlohmann_json-3.9.1 + >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest ) " BDEPEND=" @@ -62,16 +63,20 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch ) +PATCHES=( + "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch +) src_prepare() { - xdg_src_prepare + default + if [[ ${PV} == *9999 ]]; then ./autogen.sh || die fi - # https://bugs.gentoo.org/692018 - sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die eautoreconf @@ -80,16 +85,17 @@ src_prepare() { } src_configure() { - # bug 692322, use system dev-libs/utfcpp + # 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 gui) --disable-qt6 --enable-qt5 - --with-qmake=$(qt5_get_bindir)/qmake + --with-qmake="$(qt5_get_bindir)"/qmake $(use_with dvd dvdread) $(use_with nls gettext) $(usex nls "" --with-po4a-translate=false)