projects / firefox-esr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed2258e)
Attempt to fix building webrtc on non-x86
authorMike Hommey <mh@glandium.org>
Fri, 18 May 2018 21:58:29 +0000 (06:58 +0900)
committerMike Hommey <glandium@debian.org>
Sat, 23 Mar 2019 23:15:11 +0000 (23:15 +0000)
Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Attempt-to-fix-building-webrtc-on-non-x86.patch

media/webrtc/trunk/moz.build patch | blob | history

diff --git a/media/webrtc/trunk/moz.build b/media/webrtc/trunk/moz.build
index 880b277c107bfecfbc9f076b22b66411b3ff847e..f409f0df70c017f9215f8f662d4458753046194d 100644 (file)
--- 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"
-    ]
Unnamed repository; edit this file 'description' to name the repository.