Bug 1739142 [Linux] Enable PipeWire on Linux, r=mjf

Differential Revision: https://phabricator.services.mozilla.com/D131907
This commit is contained in:
stransky 2021-11-24 09:37:47 +00:00
parent e2a75283ac
commit 4c21d96ccd
8 changed files with 27 additions and 2 deletions

View File

@ -28154,6 +28154,7 @@
],
"defines": [
"MULTI_MONITOR_SCREENSHARE",
"WEBRTC_USE_PIPEWIRE",
"USE_UDEV",
"USE_AURA=1",
"USE_GLIB=1",
@ -28207,6 +28208,7 @@
"/media/libyuv/",
"/media/libyuv/libyuv/include/",
"/third_party/pipewire/",
"/third_party/pipewire/",
"//",
"//third_party/abseil-cpp/"
],

View File

@ -28156,6 +28156,7 @@
],
"defines": [
"MULTI_MONITOR_SCREENSHARE",
"WEBRTC_USE_PIPEWIRE",
"USE_UDEV",
"USE_AURA=1",
"USE_GLIB=1",
@ -28208,6 +28209,7 @@
"/media/libyuv/",
"/media/libyuv/libyuv/include/",
"/third_party/pipewire/",
"/third_party/pipewire/",
"//",
"//third_party/abseil-cpp/"
],

View File

@ -28630,6 +28630,7 @@
],
"defines": [
"MULTI_MONITOR_SCREENSHARE",
"WEBRTC_USE_PIPEWIRE",
"USE_UDEV",
"USE_AURA=1",
"USE_GLIB=1",
@ -28682,6 +28683,7 @@
"/media/libyuv/",
"/media/libyuv/libyuv/include/",
"/third_party/pipewire/",
"/third_party/pipewire/",
"//",
"//third_party/abseil-cpp/"
],

View File

@ -27921,6 +27921,7 @@
],
"defines": [
"MULTI_MONITOR_SCREENSHARE",
"WEBRTC_USE_PIPEWIRE",
"USE_UDEV",
"USE_AURA=1",
"USE_GLIB=1",
@ -27972,6 +27973,7 @@
"/media/libyuv/",
"/media/libyuv/libyuv/include/",
"/third_party/pipewire/",
"/third_party/pipewire/",
"//",
"//third_party/abseil-cpp/"
],

View File

@ -27921,6 +27921,7 @@
],
"defines": [
"MULTI_MONITOR_SCREENSHARE",
"WEBRTC_USE_PIPEWIRE",
"USE_UDEV",
"USE_AURA=1",
"USE_GLIB=1",
@ -27971,6 +27972,7 @@
"/media/libyuv/",
"/media/libyuv/libyuv/include/",
"/third_party/pipewire/",
"/third_party/pipewire/",
"//",
"//third_party/abseil-cpp/"
],

View File

@ -28158,6 +28158,7 @@
],
"defines": [
"MULTI_MONITOR_SCREENSHARE",
"WEBRTC_USE_PIPEWIRE",
"USE_UDEV",
"USE_AURA=1",
"USE_GLIB=1",
@ -28208,6 +28209,7 @@
"/media/libyuv/",
"/media/libyuv/libyuv/include/",
"/third_party/pipewire/",
"/third_party/pipewire/",
"//",
"//third_party/abseil-cpp/"
],

View File

@ -31,7 +31,6 @@ LOCAL_INCLUDES += [
"/media/libyuv/libyuv/include/",
"/third_party/libwebrtc/",
"/third_party/libwebrtc/third_party/abseil-cpp/",
"/third_party/pipewire/",
"/tools/profiler/public"
]
@ -78,6 +77,10 @@ if CONFIG["OS_TARGET"] == "Darwin":
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/"
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc",
"/third_party/libwebrtc/modules/desktop_capture/mac/full_screen_mac_application_handler.cc",
@ -94,6 +97,7 @@ if CONFIG["OS_TARGET"] == "Linux":
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_LINUX"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["WEBRTC_USE_X11"] = True
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_GNU_SOURCE"] = True
@ -102,6 +106,11 @@ if CONFIG["OS_TARGET"] == "Linux":
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/",
"/third_party/pipewire/"
]
OS_LIBS += [
"dl",
"rt",
@ -163,6 +172,10 @@ if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["_WINDOWS"] = True
DEFINES["__STD_C"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/"
]
OS_LIBS += [
"crypt32",
"d3d11",

View File

@ -131,7 +131,7 @@ declare_args() {
rtc_use_pipewire = is_desktop_linux && use_sysroot
# Set this to link PipeWire directly instead of using the dlopen.
rtc_link_pipewire = true
rtc_link_pipewire = !build_with_mozilla
# Experimental: enable use of Android AAudio which requires Android SDK 26 or above
# and NDK r16 or above.