Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1833237 - (fix-f0be3bee1f) remove portal:pipewire_base ref, remove pid, adapt new api;r=pehrsons - moz.build file updates

Browse Source
This commit is contained in:
Nico Grunbaum 2023-06-08 14:29:35 -07:00
parent d2108bc832
commit 243038ee2d
3 changed files with 101 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -23,4 +23,4 @@
# don't change CLOBBER for WebIDL changes any more.
Merge day clobber 2023-06-05
Modified build files in third_party/libwebrtc - Bug 1833237 - (fix-f0be3bee1f) remove portal:pipewire_base ref, remove pid, adapt new api;r?pehrsons

84
third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build vendored
View File

@ -30,6 +30,10 @@ LOCAL_INCLUDES += [
"/tools/profiler/public"
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
]
if not CONFIG["MOZ_DEBUG"]:
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
@ -172,6 +176,10 @@ if CONFIG["CPU_ARCH"] == "aarch64":
if CONFIG["CPU_ARCH"] == "arm":
CXXFLAGS += [
"-mfpu=neon"
]
DEFINES["WEBRTC_ARCH_ARM"] = True
DEFINES["WEBRTC_ARCH_ARM_V7"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
@ -209,6 +217,10 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
CXXFLAGS += [
"-msse2"
]
OS_LIBS += [
"android_support"
]
@ -216,16 +228,46 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
if CONFIG["CPU_ARCH"] == "aarch64" 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/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"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
CXXFLAGS += [
"-mfpu=neon"
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/"
]
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["_GNU_SOURCE"] = True
UNIFIED_SOURCES += [
"/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"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
@ -234,11 +276,45 @@ if CONFIG["CPU_ARCH"] == "x86" 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/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"] == "x86_64" 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/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")

20
third_party/libwebrtc/webrtc_gn/moz.build vendored
View File

@ -220,21 +220,41 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/"
]
if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/"
]
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/"
]
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
LOCAL_INCLUDES += [
"/third_party/pipewire/"
]
Library("webrtc_gn")