From 8ba0b8b121ed3c460d1a053dcf0323cf0de7a41c Mon Sep 17 00:00:00 2001
From: zuozhiwei <zuozhiwei@kylinos.cn>
Date: Wed, 10 Apr 2024 14:22:48 +0800
Subject: [PATCH] Apply patches on new upstream 1.0.0

---
 debian/changelog                              |  6 +++
 debian/patches/0002-fix-build-error.patch     | 49 +++----------------
 ...-echo-cancel-module-reloading-issues.patch |  4 +-
 debian/patches/series                         |  2 +
 4 files changed, 16 insertions(+), 45 deletions(-)
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 9bda2df..c9c722a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pipewire (1.0.0-1ok1) nile; urgency=medium
+
+  * Build for openkylin
+
+ -- zuozhiwei <zuozhiwei@kylinos.cn>  Wed, 10 Apr 2024 14:19:57 +0800
+
 pipewire (0.3.79-2ok2) yangtze; urgency=medium
 
   * Solve platform compilation problems.
diff --git a/debian/patches/0002-fix-build-error.patch b/debian/patches/0002-fix-build-error.patch
index 3c7f86e..62b7b10 100644
--- a/debian/patches/0002-fix-build-error.patch
+++ b/debian/patches/0002-fix-build-error.patch
@@ -9,48 +9,11 @@ Description: build error
 
 Log: 解决平台编译报错的问题
 ---
- spa/plugins/audioconvert/meson.build              | 11 +++++++++--
- src/daemon/systemd/user/pipewire-pulse.service.in |  4 ++--
- src/daemon/systemd/user/pipewire.service.in       |  1 +
- src/daemon/systemd/user/pipewire.socket           |  1 +
- 4 files changed, 13 insertions(+), 4 deletions(-)
+ src/daemon/systemd/user/pipewire-pulse.service.in | 4 ++--
+ src/daemon/systemd/user/pipewire.service.in       | 1 +
+ src/daemon/systemd/user/pipewire.socket           | 1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
-index f8e56f1..dfc1dcc 100644
---- a/spa/plugins/audioconvert/meson.build
-+++ b/spa/plugins/audioconvert/meson.build
-@@ -7,6 +7,13 @@ audioconvert_sources = [
- simd_cargs = []
- simd_dependencies = []
- 
-+opt_flags = []
-+if host_machine.cpu_family() != 'alpha'
-+  opt_flags += '-Ofast'
-+else
-+  opt_flags += '-O3'
-+endif
-+
- audioconvert_c = static_library('audioconvert_c',
-   [ 'channelmix-ops-c.c',
-     'biquad.c',
-@@ -15,7 +22,7 @@ audioconvert_c = static_library('audioconvert_c',
-     'peaks-ops-c.c',
-     'resample-native-c.c',
-     'fmt-ops-c.c' ],
--  c_args : ['-Ofast', '-ffast-math'],
-+  c_args : [ opt_flags ],
-   dependencies : [ spa_dep ],
-   install : false
-   )
-@@ -27,7 +34,7 @@ if have_sse
-       'volume-ops-sse.c',
-       'peaks-ops-sse.c',
-       'channelmix-ops-sse.c' ],
--    c_args : [sse_args, '-Ofast', '-DHAVE_SSE'],
-+    c_args : [sse_args, opt_flags, '-DHAVE_SSE'],
-     dependencies : [ spa_dep ],
-     install : false
-     )
 diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in
 index 73d22e5..482f2e7 100644
 --- a/src/daemon/systemd/user/pipewire-pulse.service.in
@@ -79,12 +42,12 @@ index b9b1373..4236c6b 100644
  [Service]
  LockPersonality=yes
 diff --git a/src/daemon/systemd/user/pipewire.socket b/src/daemon/systemd/user/pipewire.socket
-index 232bbb8..96bea66 100644
+index 16e23a7..890342a 100644
 --- a/src/daemon/systemd/user/pipewire.socket
 +++ b/src/daemon/systemd/user/pipewire.socket
 @@ -1,5 +1,6 @@
  [Unit]
- Description=PipeWire Multimedia System Socket
+ Description=PipeWire Multimedia System Sockets
 +ConditionUser=!root
  
  [Socket]
diff --git a/debian/patches/0002-fix-echo-cancel-module-reloading-issues.patch b/debian/patches/0002-fix-echo-cancel-module-reloading-issues.patch
index 8f3c945..9c538c8 100644
--- a/debian/patches/0002-fix-echo-cancel-module-reloading-issues.patch
+++ b/debian/patches/0002-fix-echo-cancel-module-reloading-issues.patch
@@ -8,10 +8,10 @@ Description: echo cancel module reloading issues
  1 file changed, 1 insertion(+)
 
 diff --git a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
-index 87b778e..a8bbd51 100644
+index 9737266..75bb5e1 100644
 --- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
 +++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
-@@ -326,6 +326,7 @@ out:
+@@ -348,6 +348,7 @@ out:
  
  DEFINE_MODULE_INFO(module_echo_cancel) = {
  	.name = "module-echo-cancel",
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e83cd79
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0002-fix-echo-cancel-module-reloading-issues.patch
+0002-fix-build-error.patch