diff --git a/do-not-use-snd_pcm_ioplug_hw_avail.patch b/do-not-use-snd_pcm_ioplug_hw_avail.patch index d9f3366..4fc0128 100644 --- a/do-not-use-snd_pcm_ioplug_hw_avail.patch +++ b/do-not-use-snd_pcm_ioplug_hw_avail.patch @@ -34,7 +34,7 @@ Index: pipewire-0.3.5/pipewire-alsa/alsa-plugins/pcm_pipewire.c + avail = maxsize; index = d[0].chunk->offset; - do { + if (avail < maxsize) @@ -309,7 +309,9 @@ snd_pcm_pipewire_process_record(snd_pcm_ pw->hw_ptr -= pw->boundary; xfer += frames; diff --git a/fix-memfd_create-call.patch b/fix-memfd_create-call.patch index 44be8b7..3a529fd 100644 --- a/fix-memfd_create-call.patch +++ b/fix-memfd_create-call.patch @@ -9,7 +9,7 @@ Index: pipewire-0.3.0/src/examples/video-src-alloc.c +#include #include - #include + @@ -45,6 +46,46 @@ #define M_PI_M2 ( M_PI + M_PI ) @@ -55,5 +55,5 @@ Index: pipewire-0.3.0/src/examples/video-src-alloc.c + + struct data { - struct pw_main_loop *loop; + struct pw_thread_loop *loop; struct spa_source *timer; diff --git a/pipewire.changes b/pipewire.changes index a51b86b..00a0896 100644 --- a/pipewire.changes +++ b/pipewire.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Fri Jul 3 08:29:04 UTC 2020 - Antonio Larrosa + +- Rebase patches used in SLE/Leap: + * do-not-use-snd_pcm_ioplug_hw_avail.patch + * fix-memfd_create-call.patch + ------------------------------------------------------------------- Tue Jun 16 09:04:18 UTC 2020 - Antonio Larrosa -- Update to version 0.3.6: +- Update to version 0.3.6 (boo#1171433): * Extensive memory leak fixing and stress testing was done. A big leak in screen sharing with DMA-BUF was fixed. * Compile fixes diff --git a/pipewire.spec b/pipewire.spec index 8f766aa..c36961b 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -257,8 +257,9 @@ This package contains documentation for the PipeWire media server. %patch0 -p1 %endif -%if %{pkg_vcmp alsa-devel < 1.2.2} +%if %{pkg_vcmp alsa-devel < 1.1.7} %patch1 -p1 +sed -i -e "s/dependency('alsa', version : '>=1.1.7')/dependency('alsa', version : '>=1.1.5')/" meson.build %endif %patch2 -p1