diff -up firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild.disable-pipewire firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild --- firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild.disable-pipewire 2024-07-17 14:01:36.290603114 +0200 +++ firefox-128.0/dom/media/webrtc/third_party_build/webrtc.mozbuild 2024-07-17 14:52:02.039208338 +0200 @@ -31,7 +31,7 @@ if CONFIG["MOZ_WEBRTC"]: and CONFIG["TARGET_CPU"].startswith("mips") ) ): - DEFINES["WEBRTC_USE_PIPEWIRE"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = False elif CONFIG["OS_TARGET"] == "Darwin": DEFINES["WEBRTC_MAC"] = True elif CONFIG["OS_TARGET"] == "WINNT": diff -up firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build --- firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build.disable-pipewire 2024-07-17 14:01:36.291603109 +0200 +++ firefox-128.0/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build 2024-07-17 14:56:35.419826494 +0200 @@ -241,102 +241,6 @@ if CONFIG["TARGET_CPU"] == "aarch64": DEFINES["WEBRTC_ARCH_ARM64"] = True DEFINES["WEBRTC_HAS_NEON"] = True -if CONFIG["TARGET_CPU"] == "arm": - - CXXFLAGS += [ - "-mfpu=neon" - ] - - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = 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/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["TARGET_CPU"] == "mips32": - - DEFINES["MIPS32_LE"] = True - DEFINES["MIPS_FPU_LE"] = 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/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["TARGET_CPU"] == "mips64": - - 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/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - if CONFIG["TARGET_CPU"] == "ppc64": DEFINES["USE_X11"] = "1" @@ -389,35 +293,6 @@ if CONFIG["MOZ_DEBUG"] == "1" and CONFIG DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0" -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - 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/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64": DEFINES["USE_X11"] = "1" @@ -446,95 +321,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CO "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" ] -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86": - - CXXFLAGS += [ - "-msse2" - ] - - 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/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64": - - 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/" - ] - - SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc" - ] - -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64": - - DEFINES["USE_X11"] = "1" - DEFINES["WEBRTC_USE_X11"] = True - - OS_LIBS += [ - "X11", - "Xcomposite", - "Xdamage", - "Xext", - "Xfixes", - "Xrandr", - "Xrender" - ] - - UNIFIED_SOURCES += [ - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/screen_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/shared_x_display.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_capturer_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_finder_x11.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/window_list_utils.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_atom_cache.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_error_trap.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc", - "/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc" - ] if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm": diff -up firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build --- firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build.disable-pipewire 2024-07-04 18:20:41.000000000 +0200 +++ firefox-128.0/third_party/libwebrtc/modules/portal/portal_gn/moz.build 2024-07-17 14:01:36.291603109 +0200 @@ -27,7 +27,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" -DEFINES["WEBRTC_USE_PIPEWIRE"] = True +DEFINES["WEBRTC_USE_PIPEWIRE"] = False DEFINES["_FILE_OFFSET_BITS"] = "64" DEFINES["_GNU_SOURCE"] = True DEFINES["_LARGEFILE64_SOURCE"] = True diff -up firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build.disable-pipewire firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build --- firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build.disable-pipewire 2024-07-04 18:20:41.000000000 +0200 +++ firefox-128.0/third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build 2024-07-17 14:01:36.291603109 +0200 @@ -25,7 +25,7 @@ DEFINES["WEBRTC_MOZILLA_BUILD"] = True DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" DEFINES["WEBRTC_POSIX"] = True DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0" -DEFINES["WEBRTC_USE_PIPEWIRE"] = True +DEFINES["WEBRTC_USE_PIPEWIRE"] = False DEFINES["_FILE_OFFSET_BITS"] = "64" DEFINES["_GNU_SOURCE"] = True DEFINES["_LARGEFILE64_SOURCE"] = True