From: Mike Hommey Date: Fri, 18 May 2018 21:58:29 +0000 (+0900) Subject: Attempt to fix building webrtc on non-x86 X-Git-Tag: archive/raspbian/60.6.1esr-1+rpi1^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c0bb6b478adfae52079f9421ba6f9b4612485082;p=firefox-esr.git Attempt to fix building webrtc on non-x86 Gbp-Pq: Topic debian-hacks Gbp-Pq: Name Attempt-to-fix-building-webrtc-on-non-x86.patch --- diff --git a/media/webrtc/trunk/moz.build b/media/webrtc/trunk/moz.build index 880b277c107..f409f0df70c 100644 --- a/media/webrtc/trunk/moz.build +++ b/media/webrtc/trunk/moz.build @@ -84,88 +84,22 @@ DIRS += [ "/media/webrtc/trunk/webrtc/webrtc_gn" ] -if CONFIG["OS_TARGET"] == "WINNT": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" - ] - -if CONFIG["OS_TARGET"] == "DragonFly": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" - ] - -if CONFIG["OS_TARGET"] == "Darwin": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" - ] - -if CONFIG["OS_TARGET"] == "FreeBSD": - +if CONFIG["OS_TARGET"] != "Android": DIRS += [ "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" ] -if CONFIG["OS_TARGET"] == "NetBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" - ] +DIRS += [ + "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", + "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" +] if CONFIG["OS_TARGET"] == "Linux": - DIRS += [ - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", "/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" ] -if CONFIG["OS_TARGET"] == "OpenBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn", - "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "OpenBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "OpenBSD": - +if CONFIG["CPU_ARCH"] in ("x86", "x86_64"): DIRS += [ "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", @@ -173,8 +107,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "OpenBSD": "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" ] -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "OpenBSD": - +if CONFIG["CPU_ARCH"] in ("aarch64", "arm"): DIRS += [ "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", @@ -183,140 +116,3 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "OpenBSD": "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "NetBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "NetBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "OpenBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "NetBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "NetBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ] - -if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn", - "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn" - ] - -if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": - - DIRS += [ - "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn", - "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn" - ]