From nobody Sun Oct 10 18:33:43 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F0E3417EC1C7; Sun, 10 Oct 2021 18:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HS9YM5xK1z3pc4; Sun, 10 Oct 2021 18:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6CFF12ACF; Sun, 10 Oct 2021 18:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19AIXhHB038174; Sun, 10 Oct 2021 18:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19AIXhf1038173; Sun, 10 Oct 2021 18:33:43 GMT (envelope-from git) Date: Sun, 10 Oct 2021 18:33:43 GMT Message-Id: <202110101833.19AIXhf1038173@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: c99e9e4cda9d - main - mail/thunderbird: fix build on powerpc64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c99e9e4cda9d22e208c199acad02d260fbe7117c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=c99e9e4cda9d22e208c199acad02d260fbe7117c commit c99e9e4cda9d22e208c199acad02d260fbe7117c Author: Piotr Kubaj AuthorDate: 2021-10-10 18:14:28 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-10 18:14:28 +0000 mail/thunderbird: fix build on powerpc64 12537 /wrkdirs/usr/ports/mail/thunderbird/work/thunderbird-91.2.0/dom/media/flac/FlacDecoder.cpp:21:20: error: no matching member function for call to 'SupportsMimeType' 12538 platform->SupportsMimeType("audio/flac"_ns, 12539 ~~~~~~~~~~^~~~~~~~~~~~~~~~ 12540 /wrkdirs/usr/ports/mail/thunderbird/work/.build/dist/include/PDMFactory.h:85:15: note: candidate function not viable: no known conversion from 'nullptr_t' to 'const mozilla::PDMFactory::MediaCodecsSupported' (aka 'const EnumSet') for 2nd argument 12541 static bool SupportsMimeType(const nsACString& aMimeType, 12542 ^ 12543 /wrkdirs/usr/ports/mail/thunderbird/work/.build/dist/include/PDMFactory.h:47:8: note: candidate function not viable: requires single argument 'aMimeType', but 2 arguments were provided 12544 bool SupportsMimeType(const nsACString& aMimeType) const; --- mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp b/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp index 247da71c362b..954b78f5bf37 100644 --- a/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp +++ b/mail/thunderbird/files/patch-dom_media_flac_FlacDecoder.cpp @@ -1,8 +1,6 @@ Enable FLAC on platforms without ffvpx like powerpc* -diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp -index 53fc3c9937f7..b23771ab80fa 100644 ---- dom/media/flac/FlacDecoder.cpp +--- dom/media/flac/FlacDecoder.cpp.orig 2021-04-15 19:44:28 UTC +++ dom/media/flac/FlacDecoder.cpp @@ -7,6 +7,7 @@ #include "FlacDecoder.h" @@ -12,15 +10,14 @@ index 53fc3c9937f7..b23771ab80fa 100644 namespace mozilla { -@@ -14,6 +15,11 @@ namespace mozilla { +@@ -14,6 +15,10 @@ namespace mozilla { bool FlacDecoder::IsEnabled() { #ifdef MOZ_FFVPX return StaticPrefs::media_flac_enabled(); +#elif defined(MOZ_FFMPEG) + RefPtr platform = new PDMFactory(); + return StaticPrefs::media_flac_enabled() && -+ platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), -+ /* DecoderDoctorDiagnostics* */ nullptr); ++ platform->SupportsMimeType("audio/flac"_ns); #else - // Until bug 1295886 is fixed. return false; + #endif