commit:     f0a36facc56573707efebc07c743e0ed7e8ddd44
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 07:03:26 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 07:04:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a36fac

www-client/firefox: fix 109 webrtc build on ppc64le

Bug: https://bugs.gentoo.org/891389
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...bmo-1775202-ppc64-webrtc-missing-conditions-109.patch | 16 ++++++++++++++++
 www-client/firefox/firefox-109.0.ebuild                  |  7 +++++++
 2 files changed, 23 insertions(+)

diff --git 
a/www-client/firefox/files/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
 
b/www-client/firefox/files/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
new file mode 100644
index 000000000000..1203476cf3b4
--- /dev/null
+++ 
b/www-client/firefox/files/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
@@ -0,0 +1,16 @@
+diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
+index 8579f8bb3622..d9ca79d4fcb8 100644
+--- a/third_party/libwebrtc/moz.build
++++ b/third_party/libwebrtc/moz.build
+@@ -520,7 +520,9 @@ if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] 
== "Linux":
+         
"/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
+         
"/third_party/libwebrtc/api/audio_codecs/isac/audio_encoder_isac_float_gn",
+         "/third_party/libwebrtc/modules/audio_coding/isac_c_gn",
+-        "/third_party/libwebrtc/modules/audio_coding/isac_gn"
++        "/third_party/libwebrtc/modules/audio_coding/isac_gn",
++        "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
++        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
+     ]
+ 
+ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
+

diff --git a/www-client/firefox/firefox-109.0.ebuild 
b/www-client/firefox/firefox-109.0.ebuild
index 62bacfdb5569..55a7abd6da29 100644
--- a/www-client/firefox/firefox-109.0.ebuild
+++ b/www-client/firefox/firefox-109.0.ebuild
@@ -612,6 +612,13 @@ src_unpack() {
 src_prepare() {
        use lto && rm -v 
"${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
        ! use ppc64 && rm -v 
"${WORKDIR}"/firefox-patches/*bmo-1775202-ppc64*.patch
+       
+       # workaround for https://bugs.gentoo.org/891389 until new patch gets 
into tarball
+       if use ppc64; then
+               rm -v 
"${WORKDIR}"/firefox-patches/0030-bmo-1775202-ppc64-webrtc-missing-conditions.patch
+               eapply 
"${FILESDIR}"/0030-bmo-1775202-ppc64-webrtc-missing-conditions-109.patch
+       fi
+
        eapply "${WORKDIR}/firefox-patches"
 
        # Allow user to apply any additional patches without modifing ebuild

Reply via email to