From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 0292A1581FD for ; Thu, 04 Sep 2025 20:48:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DAA69340DBF for ; Thu, 04 Sep 2025 20:48:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id DDD41110379; Thu, 04 Sep 2025 20:48:18 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D3FBB110379 for ; Thu, 04 Sep 2025 20:48:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AAB4340DC6 for ; Thu, 04 Sep 2025 20:48:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F153638B2 for ; Thu, 04 Sep 2025 20:48:16 +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: <1757018810.bac18a39535dd7a9ccdbd3cd1c67f0c6a2c61ffa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mkvtoolnix/Manifest media-video/mkvtoolnix/mkvtoolnix-94.0.ebuild X-VCS-Directories: media-video/mkvtoolnix/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bac18a39535dd7a9ccdbd3cd1c67f0c6a2c61ffa X-VCS-Branch: master Date: Thu, 04 Sep 2025 20:48:16 +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: 730092ab-5d48-4940-97e6-4aced4273c4d X-Archives-Hash: 39d75ee0970cbd517ac230de2be827ff commit: bac18a39535dd7a9ccdbd3cd1c67f0c6a2c61ffa Author: Alfred Wingate protonmail com> AuthorDate: Sun Jul 27 19:13:21 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 4 20:46:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac18a39 media-video/mkvtoolnix: add 94.0 Signed-off-by: Alfred Wingate protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43195 Signed-off-by: Sam James gentoo.org> media-video/mkvtoolnix/Manifest | 2 + media-video/mkvtoolnix/mkvtoolnix-94.0.ebuild | 161 ++++++++++++++++++++++++++ 2 files changed, 163 insertions(+) diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 5f0407dcd4fd..265b757f8f3e 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -4,3 +4,5 @@ DIST mkvtoolnix-92.0.tar.xz 11317576 BLAKE2B b865491267ffda14c7707d3620ba87d7a17 DIST mkvtoolnix-92.0.tar.xz.sig 833 BLAKE2B c4f924f881eb294babec20dc2e887c4633a5d669d1fc03d391175d54f4f91941e54ade48f217af73528a1a07aebeed7d0638e5c8420c2dfe43b9797be63b0668 SHA512 6710bebece8b10a877787e506c097e03c82c0ba6716ed72e87a1d193530be3a3ca38cac3015154d7f014c6b6dad312b57cb3c8944c97cc14b732314630461781 DIST mkvtoolnix-93.0.tar.xz 11423512 BLAKE2B a5bc9e01de4404f596dcbf897cffb59147df239d39b3519fd0d086d1d700d624ce08d094cc4d4393ccb8cb3ca364b36fe17db076e849f13e5b8596fffc035f65 SHA512 06fe3477caa663adb33ad38d0188929498109e8e11b669a7fd83898c72ae3bc19f1f54e91ad1d1f593e059213c476cf314f1ec6ff9d5d62fbbe047a7e11cc951 DIST mkvtoolnix-93.0.tar.xz.sig 833 BLAKE2B 78968f7b6c9a97029f7ddbbac81c3073df68225fa62b03d9e739f050a01ec234ea7b503a215d556f7dae93dbb4038b1d54e84a06d3bfe0a37d5521306c6ef701 SHA512 4a7cf98c32c8c61287d28b427b571c892a3d52ebe5406e173f39b2dc2c012828499cc5c7229e55fd5de529ceaeec4a7845c4420887fe25e725b57fc2744796cc +DIST mkvtoolnix-94.0.tar.xz 11708096 BLAKE2B 1ec535f56c8840594ba98d0ee0f1c2d0c2c4777a9358b98ebd9a32724aff5c62cb0c983653feeb939c7bf9ca94c13b51c745e6c46075cba6d90667bef94d9b75 SHA512 72b6c8f42ffe9c29032b412bf45371fbbd5a0db4f082bb5c0d3850ee378a42ec33515487565ec52232f1f30f3e9dac2778f5022caac616c718034ca79137b9ee +DIST mkvtoolnix-94.0.tar.xz.sig 833 BLAKE2B 584e806f696039641f1c9affc8981cc58165ca8f8991e2a37e34594cf8aa22781341fa625768927c6d4f89cdd1db658ad5f30a8407e2ec776d9c5bc6e27ebdb2 SHA512 47a1be7b3f9c564bdc61c2b26ece6fdcc07cb4e7793e6b8caf91373ae505bc20f363e8163cb5f94122a44bef3d3da84427b73bda888185e509ef601e2c91b84a diff --git a/media-video/mkvtoolnix/mkvtoolnix-94.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-94.0.ebuild new file mode 100644 index 000000000000..a42b70bea7da --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-94.0.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multiprocessing prefix qmake-utils toolchain-funcs xdg + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://codeberg.org/mbunkus/mkvtoolnix.git" + EGIT_SUBMODULES=() +else + inherit verify-sig + + SRC_URI=" + https://mkvtoolnix.download/sources/${P}.tar.xz + verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://codeberg.org/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug dvd gui nls pch test" +# bug #951192 +REQUIRED_USE="dbus? ( gui )" +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:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.5:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11 + >=dev-qt/qtbase-6.2:6[dbus?] + media-libs/flac:= + >=media-libs/libmatroska-1.7.1:= + media-libs/libogg + media-libs/libvorbis + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + gui? ( + app-text/cmark:0= + >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets] + >=dev-qt/qtmultimedia-6.2:6 + >=dev-qt/qtsvg-6.2:6 + ) +" +DEPEND="${RDEPEND} + >=dev-cpp/nlohmann_json-3.11.3 + >=dev-libs/utfcpp-3.1.2 + 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 + ) +" + +if [[ ${PV} != *9999 ]] ; then + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )" +fi + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + # bug #927497 + # the compiler used for qtbase affects what compiler arguments qmake will use + if tc-is-gcc; then + expected_spec="linux-g++" + elif tc-is-clang; then + expected_spec="linux-clang" + fi + + if [[ ${expected_spec} != $(qmake6 -query QMAKE_SPEC) ]]; then + if tc-is-gcc; then + eerror "Detected non-gcc qmake spec but current compiler is gcc." + elif tc-is-clang; then + eerror "Detected non-clang qmake spec but current compiler is clang." + fi + eerror "Compiler mismatch: dev-qt/qtbase:6 and ${CATEGORY}/${PN} have to use the same toolchain https://bugs.gentoo.org/927497" + fi + fi +} + +src_prepare() { + default + + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die + + # bug #928463 + hprefixify "${S}/ac/ax_docbook.m4" + + 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 dbus) + $(use_enable debug) + $(usex pch "" --disable-precompiled-headers) + $(use_enable gui) + $(use_with dvd dvdread) + $(use_with nls gettext) + #$(use_with nls po4a) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. + --with-qmake6="$(qt6_get_bindir)"/qmake + ) + + # Work around bug #904710. + use nls || export ac_cv_path_PO4A= + + 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 +}