From 65fef64808b3c3801629ef9b2815ff8fc1f35b2f387ea3f2c8f7388bc4a7760a Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <alarrosa@suse.com>
Date: Fri, 14 Apr 2023 07:59:11 +0000
Subject: [PATCH 1/2] Accepting request 1079324 from home:XRevan86

- Update to version 0.3.69.

OBS-URL: https://build.opensuse.org/request/show/1079324
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=120
---
 _service                |  2 +-
 pipewire-0.3.68.obscpio |  3 ---
 pipewire-0.3.69.obscpio |  3 +++
 pipewire.changes        | 56 +++++++++++++++++++++++++++++++++++++++++
 pipewire.obsinfo        |  6 ++---
 pipewire.spec           |  3 +--
 6 files changed, 64 insertions(+), 9 deletions(-)
 delete mode 100644 pipewire-0.3.68.obscpio
 create mode 100644 pipewire-0.3.69.obscpio

diff --git a/_service b/_service
index 5aa6888..4d12884 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.freedesktop.org/pipewire/pipewire.git</param>
-    <param name="revision">0.3.68</param>
+    <param name="revision">0.3.69</param>
     <param name="versionformat">@PARENT_TAG@</param>
 <!--
     <param name="revision">master</param>
diff --git a/pipewire-0.3.68.obscpio b/pipewire-0.3.68.obscpio
deleted file mode 100644
index aedb74d..0000000
--- a/pipewire-0.3.68.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ff5e704b31dc5ea6aeaef5afffa0362fdf21e26fdcdec6d0c69935ab6dd64ef
-size 11545613
diff --git a/pipewire-0.3.69.obscpio b/pipewire-0.3.69.obscpio
new file mode 100644
index 0000000..02df489
--- /dev/null
+++ b/pipewire-0.3.69.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a53ff8fd8d1bd344e2e9c1d1ed851110b2410ddf7aa9a8aa65a7607c0126a55
+size 11575821
diff --git a/pipewire.changes b/pipewire.changes
index 055c064..bc26c27 100644
--- a/pipewire.changes
+++ b/pipewire.changes
@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Thu Apr 13 19:23:05 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 0.3.69:
+  * Highlights:
+    - Reverted the UCM changes, they seem to cause regressions
+      causing audio to be muted in some cases.
+    - Fix a regression in the scheduler where a driver node might
+      not be marked as runnable in some cases, like when
+      echo-cancel is used.
+    - Handle links from the driver to itself. This makes the midi
+      bridge work again.
+    - ALSA rate matching for sources was fixed. It would previously
+      wait too long for rate matching and then cause drift. This
+      should reduce crackling and stuttering whan capturing in
+      low latency.
+    - Fix the GStreamer clock to make cheese video recording work
+      again.
+    - More fixes and improvements.
+  * PipeWire:
+    - Fix a regression in the scheduler where a driver node might
+      not be marked as runnable in some cases, like when
+      echo-cancel is used.
+    - Handle links from the driver to itself. This makes the midi
+      bridge work again.
+    - Some man pages were improved.
+    - Fix a potential crash when thread-loop is destroyed before
+      the loop.
+  * Modules:
+    - A new raw biquad filter was added to filter-chain. You can
+      manually set the 6 parameters and you can use this to create
+      custom filters per sample rate.
+    - The echo-canceller now supports different channels for the
+      capture and playback streams.
+  * SPA:
+    - A SB Audigy specific profile set was added to make better use
+      of the controls.
+    - More ALSA IRQ based scheduling improvements.
+    - ALSA rate matching for sources was fixed. It would previously
+      wait too long for rate matching and then cause drift. This
+      should reduce crackling and stuttering whan capturing in
+      low latency.
+    - The echo-cancel plugin API has a new method to make it
+      possible to have different channels for capture, source and
+      playback.
+    - Reverted the UCM changes, they seem to cause regressions
+      causing audio to be muted in some cases.
+  * Bluetooth:
+    - Many more BAP fixes and improvements. Devices are now
+      created as a set and can be combined into one device by the
+      session manager.
+  * GStreamer:
+    - Fix the GStreamer clock to make cheese video recording work
+      again.
+- Enable gstreamer-device-provider (rh#2183691).
+
 -------------------------------------------------------------------
 Thu Apr  6 14:12:51 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
 
diff --git a/pipewire.obsinfo b/pipewire.obsinfo
index a573472..bcfa4e0 100644
--- a/pipewire.obsinfo
+++ b/pipewire.obsinfo
@@ -1,4 +1,4 @@
 name: pipewire
-version: 0.3.68
-mtime: 1680777283
-commit: 950c4487e96c7941f58311a066f4ba8289ca984a
+version: 0.3.69
+mtime: 1681374012
+commit: cd8be0ba3b27542253f7744b699c2ede159e2d7c
diff --git a/pipewire.spec b/pipewire.spec
index 2ac552e..f77f8ec 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -54,7 +54,7 @@
 %bcond_with aptx
 
 Name:           pipewire
-Version:        0.3.68
+Version:        0.3.69
 Release:        0
 Summary:        A Multimedia Framework designed to be an audio and video server and more
 License:        MIT
@@ -363,7 +363,6 @@ export CXX=g++-9
     -Dffmpeg=disabled \
     -Dsystemd=enabled \
     -Dsystemd-user-unit-dir=%{_userunitdir} \
-    -Dgstreamer-device-provider=disabled \
     -Droc=disabled \
 %if %{with_vulkan}
     -Dvulkan=enabled \

From f8f49c3b4bf87fcdf42c14b193b373c0d1e30761e18d3e1ad2886ac2cc7eeb08 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <alarrosa@suse.com>
Date: Fri, 14 Apr 2023 09:09:22 +0000
Subject: [PATCH 2/2] Accepting request 1079410 from
 home:alarrosa:branches:multimedia:libs

- Add patch to build pipewire in Leap 15.4:
  * reduce-meson-dependency.patch

OBS-URL: https://build.opensuse.org/request/show/1079410
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=121
---
 pipewire.changes              |  6 ++++
 pipewire.spec                 |  1 +
 reduce-meson-dependency.patch | 57 +++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 reduce-meson-dependency.patch

diff --git a/pipewire.changes b/pipewire.changes
index bc26c27..082125e 100644
--- a/pipewire.changes
+++ b/pipewire.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 14 08:58:53 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add patch to build pipewire in Leap 15.4:
+  * reduce-meson-dependency.patch
+
 -------------------------------------------------------------------
 Thu Apr 13 19:23:05 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
 
diff --git a/pipewire.spec b/pipewire.spec
index f77f8ec..521fe93 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -62,6 +62,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://pipewire.org/
 Source0:        %{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+Patch0:         reduce-meson-dependency.patch
 BuildRequires:  docutils
 BuildRequires:  doxygen
 BuildRequires:  fdupes
diff --git a/reduce-meson-dependency.patch b/reduce-meson-dependency.patch
new file mode 100644
index 0000000..661a58d
--- /dev/null
+++ b/reduce-meson-dependency.patch
@@ -0,0 +1,57 @@
+Index: pipewire-0.3.69/meson.build
+===================================================================
+--- pipewire-0.3.69.orig/meson.build
++++ pipewire-0.3.69/meson.build
+@@ -1,7 +1,7 @@
+ project('pipewire', ['c' ],
+   version : '0.3.69',
+   license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
+-  meson_version : '>= 0.61.1',
++  meson_version : '>= 0.59.4',
+   default_options : [ 'warning_level=3',
+                       'c_std=gnu11',
+                       'cpp_std=c++17',
+Index: pipewire-0.3.69/src/daemon/meson.build
+===================================================================
+--- pipewire-0.3.69.orig/src/daemon/meson.build
++++ pipewire-0.3.69/src/daemon/meson.build
+@@ -116,11 +116,12 @@ foreach alias : ['pipewire-pulse', 'pipe
+     input: pipewire_exec,
+     output: alias,
+   )
+-  install_symlink(
+-    alias,
+-    pointing_to: pipewire_exec.name(),
+-    install_dir: pipewire_bindir,
+-  )
++  #install_symlink(
++    #  alias,
++    #  pointing_to: pipewire_exec.name(),
++    #  install_dir: pipewire_bindir,
++    #)
++  meson.add_install_script('sh', '-c', 'ln -s ' + pipewire_exec.name() + ' $DESTDIR/' + pipewire_bindir + '/' + alias)
+ endforeach
+ 
+ custom_target('pipewire-uninstalled',
+Index: pipewire-0.3.69/src/tools/meson.build
+===================================================================
+--- pipewire-0.3.69.orig/src/tools/meson.build
++++ pipewire-0.3.69/src/tools/meson.build
+@@ -73,11 +73,12 @@ if get_option('pw-cat').allowed() and sn
+       input: pw_cat,
+       output: alias,
+     )
+-    install_symlink(
+-      alias,
+-      pointing_to: pw_cat.name(),
+-      install_dir: pipewire_bindir,
+-    )
++    #install_symlink(
++      #  alias,
++      #  pointing_to: pw_cat.name(),
++      #  install_dir: pipewire_bindir,
++      #)
++    meson.add_install_script('sh', '-c', 'ln -s ' + pw_cat.name() + ' $DESTDIR/' + pipewire_bindir + '/' + alias)
+   endforeach
+ elif not sndfile_dep.found() and get_option('pw-cat').enabled()
+   error('pw-cat is enabled but required dependency `sndfile` was not found.')