Quelle  0074.patch   Sprache: unbekannt

From: Nico Grunbaum <na-g@nostrum.com>
Date: Tue, 6 Jun 2023 16:37:00 -0700
Subject: Bug 1833237 - (fix-f0be3bee1f) remove reference to
 portal:pipewire_base;r?pehrsons

Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8ff886a4d366b4be35b329d1ef733a6df542067c
---
 modules/video_capture/BUILD.gn                      | 4 ++++
 modules/video_capture/linux/device_info_pipewire.cc | 4 ++--
 modules/video_capture/linux/device_info_pipewire.h  | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index a2bf27f645..d9b3471572 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -108,6 +108,10 @@ if (!build_with_chromium || is_linux || is_chromeos) {
           "../../media:rtc_media_base",
           "../portal",
         ]
+        if (build_with_mozilla) {
+          configs -= [ "../portal:pipewire_base" ]
+          public_deps = [ "//third_party/pipewire" ]
+        }
       }
     }
     if (is_win) {
diff --git a/modules/video_capture/linux/device_info_pipewire.cc b/modules/video_capture/linux/device_info_pipewire.cc
index 0ec0da3933..b802fe580c 100644
--- a/modules/video_capture/linux/device_info_pipewire.cc
+++ b/modules/video_capture/linux/device_info_pipewire.cc
@@ -49,9 +49,9 @@ int32_t DeviceInfoPipeWire::GetDeviceName(uint32_t deviceNumber,
                                           char* deviceUniqueIdUTF8,
                                           uint32_t deviceUniqueIdUTF8Length,
                                           char* productUniqueIdUTF8,
-                                          uint32_t productUniqueIdUTF8Length) {
+                                          uint32_t productUniqueIdUTF8Length,
+                                          pid_t* pid) {
   RTC_CHECK(pipewire_session_);
-
   if (deviceNumber >= NumberOfDevices())
     return -1;
 
diff --git a/modules/video_capture/linux/device_info_pipewire.h b/modules/video_capture/linux/device_info_pipewire.h
index 4da0c7a90b..8a33d75892 100644
--- a/modules/video_capture/linux/device_info_pipewire.h
+++ b/modules/video_capture/linux/device_info_pipewire.h
@@ -29,7 +29,8 @@ class DeviceInfoPipeWire : public DeviceInfoImpl {
                         char* deviceUniqueIdUTF8,
                         uint32_t deviceUniqueIdUTF8Length,
                         char* productUniqueIdUTF8 = nullptr,
-                        uint32_t productUniqueIdUTF8Length = 0) override;
+                        uint32_t productUniqueIdUTF8Length = 0,
+                        pid_t* pid = 0) override;
   /*
    * Fills the membervariable _captureCapabilities with capabilites for the
    * given device name.