|
1190
|
1 |
From: Mike Hommey <mh@glandium.org>
|
|
|
2 |
Date: Sun, 14 Aug 2022 07:01:33 +0900
|
|
|
3 |
Subject: Work around bz#1775202 to fix FTBFS on ppc64el
|
|
|
4 |
|
|
|
5 |
---
|
|
|
6 |
third_party/libwebrtc/moz.build | 7 +++++++
|
|
|
7 |
1 file changed, 7 insertions(+)
|
|
|
8 |
|
|
1191
|
9 |
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
|
|
|
10 |
--- a/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
|
|
|
11 |
+++ b/third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
|
|
|
12 |
@@ -318,9 +318,32 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CO
|
|
|
13 |
|
|
|
14 |
UNIFIED_SOURCES += [
|
|
|
15 |
"/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc",
|
|
|
16 |
"/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc",
|
|
|
17 |
"/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc",
|
|
|
18 |
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
|
|
|
19 |
]
|
|
|
20 |
|
|
|
21 |
+if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
|
|
|
22 |
+
|
|
|
23 |
+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
|
|
|
24 |
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
|
|
|
25 |
+ DEFINES["_GNU_SOURCE"] = True
|
|
|
26 |
+
|
|
|
27 |
+ LOCAL_INCLUDES += [
|
|
|
28 |
+ "/gfx/angle/checkout/include/",
|
|
|
29 |
+ "/third_party/drm/drm/",
|
|
|
30 |
+ "/third_party/drm/drm/include/",
|
|
|
31 |
+ "/third_party/drm/drm/include/libdrm/",
|
|
|
32 |
+ "/third_party/gbm/gbm/",
|
|
|
33 |
+ "/third_party/libepoxy/libepoxy/include/",
|
|
|
34 |
+ "/third_party/pipewire/"
|
|
|
35 |
+ ]
|
|
|
36 |
+
|
|
|
37 |
+ UNIFIED_SOURCES += [
|
|
|
38 |
+ "/third_party/libwebrtc/modules/video_capture/linux/camera_portal.cc",
|
|
|
39 |
+ "/third_party/libwebrtc/modules/video_capture/linux/device_info_pipewire.cc",
|
|
|
40 |
+ "/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc",
|
|
|
41 |
+ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
|
|
|
42 |
+ ]
|
|
|
43 |
+
|
|
|
44 |
Library("video_capture_internal_impl_gn")
|
|
1190
|
45 |
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
|
|
|
46 |
--- a/third_party/libwebrtc/moz.build
|
|
|
47 |
+++ b/third_party/libwebrtc/moz.build
|
|
1191
|
48 |
@@ -603,16 +603,28 @@ if CONFIG["CPU_ARCH"] == "x86_64" and CO
|
|
|
49 |
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
|
|
|
50 |
"/third_party/libwebrtc/modules/portal/portal_gn",
|
|
|
51 |
"/third_party/libwebrtc/third_party/drm/drm_gn",
|
|
|
52 |
"/third_party/libwebrtc/third_party/gbm/gbm_gn",
|
|
|
53 |
"/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
|
|
1190
|
54 |
"/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
|
|
|
55 |
]
|
|
|
56 |
|
|
|
57 |
+if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux":
|
|
|
58 |
+
|
|
|
59 |
+ DIRS += [
|
|
|
60 |
+ "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
|
|
|
61 |
+ "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
|
|
1191
|
62 |
+ "/third_party/libwebrtc/modules/portal/portal_gn",
|
|
|
63 |
+ "/third_party/libwebrtc/third_party/drm/drm_gn",
|
|
|
64 |
+ "/third_party/libwebrtc/third_party/gbm/gbm_gn",
|
|
|
65 |
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
|
|
|
66 |
+ "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
|
|
1190
|
67 |
+ ]
|
|
|
68 |
+
|
|
1191
|
69 |
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD":
|
|
1190
|
70 |
|
|
|
71 |
DIRS += [
|
|
1191
|
72 |
"/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
|
|
|
73 |
"/third_party/libwebrtc/common_audio/common_audio_neon_gn"
|
|
|
74 |
]
|
|
|
75 |
|
|
|
76 |
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD":
|