|
 |
dd1d2c |
diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild
|
|
|
dd1d2c |
--- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire 2019-07-01 22:30:26.000000000 +0200
|
|
|
dd1d2c |
+++ firefox-68.0/config/system-headers.mozbuild 2019-07-08 15:26:15.397161627 +0200
|
|
|
dd1d2c |
@@ -314,6 +314,7 @@ system_headers = [
|
|
|
dd1d2c |
'Gestalt.h',
|
|
|
dd1d2c |
'getopt.h',
|
|
|
dd1d2c |
'gio/gio.h',
|
|
|
dd1d2c |
+ 'gio/gunixfdlist.h',
|
|
|
dd1d2c |
'glibconfig.h',
|
|
|
dd1d2c |
'glib.h',
|
|
|
dd1d2c |
'glib-object.h',
|
|
|
dd1d2c |
@@ -607,6 +608,7 @@ system_headers = [
|
|
|
dd1d2c |
'Pgenerr.h',
|
|
|
dd1d2c |
'PGenErr.h',
|
|
|
dd1d2c |
'Ph.h',
|
|
|
dd1d2c |
+ 'pipewire/pipewire.h',
|
|
|
dd1d2c |
'pixman.h',
|
|
|
dd1d2c |
'pk11func.h',
|
|
|
dd1d2c |
'pk11pqg.h',
|
|
|
dd1d2c |
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
|
dd1d2c |
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire 2019-07-01 22:30:33.000000000 +0200
|
|
|
dd1d2c |
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build 2019-07-08 15:26:15.397161627 +0200
|
|
|
dd1d2c |
@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux":
|
|
|
dd1d2c |
"/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
|
|
|
dd1d2c |
]
|
|
|
dd1d2c |
|
|
|
dd1d2c |
+# PipeWire specific files
|
|
|
dd1d2c |
+if CONFIG["OS_TARGET"] == "Linux":
|
|
|
dd1d2c |
+
|
|
|
dd1d2c |
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
|
|
|
dd1d2c |
+
|
|
|
dd1d2c |
+ OS_LIBS += [
|
|
|
dd1d2c |
+ "rt",
|
|
|
dd1d2c |
+ "pipewire-0.2",
|
|
|
dd1d2c |
+ "glib-2.0",
|
|
|
dd1d2c |
+ "gio-2.0",
|
|
|
dd1d2c |
+ "gobject-2.0"
|
|
|
dd1d2c |
+ ]
|
|
|
dd1d2c |
+
|
|
|
dd1d2c |
+ CXXFLAGS += CONFIG['TK_CFLAGS']
|
|
|
dd1d2c |
+
|
|
|
dd1d2c |
+ UNIFIED_SOURCES += [
|
|
|
dd1d2c |
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
|
|
|
dd1d2c |
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
|
|
|
dd1d2c |
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
|
|
|
dd1d2c |
+ ]
|
|
|
dd1d2c |
+
|
|
|
dd1d2c |
+
|
|
|
dd1d2c |
if CONFIG["OS_TARGET"] == "NetBSD":
|
|
|
dd1d2c |
|
|
|
dd1d2c |
DEFINES["USE_X11"] = "1"
|
|
|
dd1d2c |
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
|
dd1d2c |
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire 2019-07-08 16:42:13.936254926 +0200
|
|
|
dd1d2c |
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h 2019-07-08 16:42:17.509264974 +0200
|
|
|
dd1d2c |
@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
|
|
|
dd1d2c |
bool disable_effects_ = true;
|
|
|
dd1d2c |
bool detect_updated_region_ = false;
|
|
|
dd1d2c |
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
|
dd1d2c |
- bool allow_pipewire_ = false;
|
|
|
dd1d2c |
+ bool allow_pipewire_ = true;
|
|
|
dd1d2c |
#endif
|
|
|
dd1d2c |
};
|
|
|
dd1d2c |
|