Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Nov 2023 02:54:36 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 94d830e457f5 - main - www/firefox-esr: fix build on powerpc64*
Message-ID:  <202311140254.3AE2saHg013900@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=94d830e457f51b283ca24804c172135f72317bb3

commit 94d830e457f51b283ca24804c172135f72317bb3
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-11-13 10:30:25 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-11-14 02:54:33 +0000

    www/firefox-esr: fix build on powerpc64*
    
    In file included from Unified_cpp_dom_media_flac0.cpp:2:
    /wrkdirs/usr/ports/www/firefox-esr/work/firefox-115.4.0/dom/media/flac/FlacDecoder.cpp:21:10: error: value of type 'media::DecodeSupportSet' (aka 'EnumSet<mozilla::media::DecodeSupport, unsigned long>') is not contextually convertible to 'bool'
             platform->SupportsMimeType("audio/flac"_ns);
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    /wrkdirs/usr/ports/www/firefox-esr/work/firefox-115.4.0/dom/media/flac/FlacDecoder.cpp:20:44: error: invalid operands to binary expression ('StripAtomic<mozilla::RelaxedAtomicBool>' (aka 'bool') and 'media::DecodeSupportSet' (aka 'EnumSet<mozilla::media::DecodeSupport, unsigned long>'))
      return StaticPrefs::media_flac_enabled() &&
             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
    2 errors generated.
---
 www/firefox-esr/files/patch-dom_media_flac_FlacDecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/firefox-esr/files/patch-dom_media_flac_FlacDecoder.cpp b/www/firefox-esr/files/patch-dom_media_flac_FlacDecoder.cpp
index 954b78f5bf37..6dc197d9455e 100644
--- a/www/firefox-esr/files/patch-dom_media_flac_FlacDecoder.cpp
+++ b/www/firefox-esr/files/patch-dom_media_flac_FlacDecoder.cpp
@@ -17,7 +17,7 @@ Enable FLAC on platforms without ffvpx like powerpc*
 +#elif defined(MOZ_FFMPEG)
 +  RefPtr<PDMFactory> platform = new PDMFactory();
 +  return StaticPrefs::media_flac_enabled() &&
-+         platform->SupportsMimeType("audio/flac"_ns);
++         !platform->SupportsMimeType("audio/flac"_ns).isEmpty();
  #else
    return false;
  #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311140254.3AE2saHg013900>