Bug 1766646 - (fix-c0a4316825a) fixes to deal with forked moz_base_capturer_pipewire.cc - moz.build file updates

This commit is contained in:
Michael Froman 2022-08-21 22:28:43 -05:00 коммит произвёл Connor Sheehan
Родитель bc4f1def84
Коммит 5d9e1bfb41
3 изменённых файлов: 1 добавлений и 13 удалений

Просмотреть файл

@ -22,5 +22,5 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Modified build files in third_party/libwebrtc - Bug 1766646 - Vendor libwebrtc from c0a4316825a
Modified build files in third_party/libwebrtc - Bug 1766646 - (fix-c0a4316825a) fixes to deal with forked moz_base_capturer_pipewire.cc

Просмотреть файл

@ -234,7 +234,6 @@ if CONFIG["CPU_ARCH"] == "arm":
DEFINES["WEBRTC_ARCH_ARM"] = True
DEFINES["WEBRTC_ARCH_ARM_V7"] = True
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@ -291,7 +290,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
@ -302,7 +300,6 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
@ -313,7 +310,6 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True

Просмотреть файл

@ -139,10 +139,8 @@ if CONFIG["CPU_ARCH"] == "arm":
DEFINES["WEBRTC_ARCH_ARM"] = True
DEFINES["WEBRTC_ARCH_ARM_V7"] = True
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "ppc64":
@ -179,23 +177,17 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["WEBRTC_DLOPEN_PIPEWIRE"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":