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 01B5C1582EF for ; Fri, 21 Feb 2025 13:03:04 +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)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E297C3430D2 for ; Fri, 21 Feb 2025 13:03:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 36191110474; Fri, 21 Feb 2025 13:02:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 bobolink.gentoo.org (Postfix) with ESMTPS id 2C308110474 for ; Fri, 21 Feb 2025 13:02:48 +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 D44793430BB for ; Fri, 21 Feb 2025 13:02:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AD5D2743 for ; Fri, 21 Feb 2025 13:02:45 +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: <1740142854.5bd12e5b7fffb1b5be09d38b6605de570ac3fe3e.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: 5bd12e5b7fffb1b5be09d38b6605de570ac3fe3e X-VCS-Branch: master Date: Fri, 21 Feb 2025 13:02:45 +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: ed32fb35-2eb6-4cf6-b0cb-d6a6ce4302b6 X-Archives-Hash: 667a2caf863b7c84317b03b2bb50bc18 commit: 5bd12e5b7fffb1b5be09d38b6605de570ac3fe3e Author: Alfred Wingate protonmail com> AuthorDate: Wed Jan 15 20:32:00 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 21 13:00:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd12e5b media-video/mkvtoolnix: update live Explicitly complain if toolchain doesn't match with qtbase. Readd dbus use flag as its an upstream switch now. Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Sam James gentoo.org> media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 31 ++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 6731cce63b2d..838bf63b2a3d 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# 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 xdg +inherit autotools flag-o-matic multiprocessing prefix qmake-utils toolchain-funcs xdg if [[ ${PV} == *9999 ]] ; then inherit git-r3 @@ -27,7 +27,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" LICENSE="GPL-2" SLOT="0" -IUSE="debug dvd gui 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 @@ -38,7 +38,7 @@ RDEPEND=" >=dev-libs/libebml-1.4.5:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11 - >=dev-qt/qtbase-6.2:6[dbus] + >=dev-qt/qtbase-6.2:6[dbus?] media-libs/flac:= >=media-libs/libmatroska-1.7.1:= media-libs/libogg @@ -50,7 +50,6 @@ RDEPEND=" >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets] >=dev-qt/qtmultimedia-6.2:6 >=dev-qt/qtsvg-6.2:6 - media-libs/libglvnd ) " DEPEND="${RDEPEND} @@ -73,6 +72,27 @@ 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 @@ -97,6 +117,7 @@ src_configure() { append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp local myeconfargs=( + $(use_enable dbus) $(use_enable debug) $(usex pch "" --disable-precompiled-headers) $(use_enable gui)