forked from pool/MozillaFirefox
This commit is contained in:
parent
119d807d14
commit
9f4536dddd
@ -227,8 +227,7 @@ Patch19: mozilla-bmo531915.patch
|
||||
Patch20: one_swizzle_to_rule_them_all.patch
|
||||
Patch21: svg-rendering.patch
|
||||
Patch22: mozilla-partial-revert-1768632.patch
|
||||
#Patch23: mozilla-bmo1775202.patch
|
||||
Patch24: mozilla-rust-disable-future-incompat.patch
|
||||
Patch23: mozilla-rust-disable-future-incompat.patch
|
||||
# Firefox/browser
|
||||
Patch101: firefox-kde.patch
|
||||
Patch102: firefox-branded-icons.patch
|
||||
|
@ -1,76 +0,0 @@
|
||||
From: Mike Hommey <mh@glandium.org>
|
||||
Date: Sun, 14 Aug 2022 07:01:33 +0900
|
||||
Subject: Work around bz#1775202 to fix FTBFS on ppc64el
|
||||
|
||||
---
|
||||
third_party/libwebrtc/moz.build | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build b/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
|
||||
--- a/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
|
||||
+++ b/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
|
||||
@@ -318,9 +318,32 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CO
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
"/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc",
|
||||
"/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc",
|
||||
"/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc",
|
||||
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
|
||||
]
|
||||
|
||||
+if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
|
||||
+
|
||||
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
|
||||
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
||||
+ DEFINES["_GNU_SOURCE"] = True
|
||||
+
|
||||
+ LOCAL_INCLUDES += [
|
||||
+ "/gfx/angle/checkout/include/",
|
||||
+ "/third_party/drm/drm/",
|
||||
+ "/third_party/drm/drm/include/",
|
||||
+ "/third_party/drm/drm/include/libdrm/",
|
||||
+ "/third_party/gbm/gbm/",
|
||||
+ "/third_party/libepoxy/libepoxy/include/",
|
||||
+ "/third_party/pipewire/"
|
||||
+ ]
|
||||
+
|
||||
+ UNIFIED_SOURCES += [
|
||||
+ "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc",
|
||||
+ "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc",
|
||||
+ "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc",
|
||||
+ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
|
||||
+ ]
|
||||
+
|
||||
Library("video_capture_internal_impl_gn")
|
||||
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
|
||||
--- a/third_party/libwebrtc/moz.build
|
||||
+++ b/third_party/libwebrtc/moz.build
|
||||
@@ -603,16 +603,28 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CO
|
||||
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
|
||||
"/third_party/libwebrtc/modules/portal/portal_gn",
|
||||
"/third_party/libwebrtc/third_party/drm/drm_gn",
|
||||
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
|
||||
"/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
|
||||
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
|
||||
]
|
||||
|
||||
+if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
|
||||
+
|
||||
+ DIRS += [
|
||||
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
|
||||
+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
|
||||
+ "/third_party/libwebrtc/modules/portal/portal_gn",
|
||||
+ "/third_party/libwebrtc/third_party/drm/drm_gn",
|
||||
+ "/third_party/libwebrtc/third_party/gbm/gbm_gn",
|
||||
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
|
||||
+ "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
|
||||
+ ]
|
||||
+
|
||||
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
|
||||
|
||||
DIRS += [
|
||||
"/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
|
||||
"/third_party/libwebrtc/common_audio/common_audio_neon_gn"
|
||||
]
|
||||
|
||||
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
|
Loading…
Reference in New Issue
Block a user