diff --git a/_service b/_service index 001703f..bc3b522 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://gitlab.freedesktop.org/pipewire/pipewire.git - 0.3.5 + 0.3.6 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/fix-meson-required-version.patch b/fix-meson-required-version.patch new file mode 100644 index 0000000..216f9d8 --- /dev/null +++ b/fix-meson-required-version.patch @@ -0,0 +1,13 @@ +Index: pipewire/meson.build +=================================================================== +--- pipewire.orig/meson.build ++++ pipewire/meson.build +@@ -1,7 +1,7 @@ + project('pipewire', ['c' ], + version : '0.3.6', + license : 'MIT', +- meson_version : '>= 0.49.0', ++ meson_version : '>= 0.46.0', + default_options : [ 'warning_level=3', + 'c_std=gnu99', + 'buildtype=debugoptimized' ]) diff --git a/pipewire-0.3.5.obscpio b/pipewire-0.3.5.obscpio deleted file mode 100644 index 22b90e9..0000000 --- a/pipewire-0.3.5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3083c324a1de8ce784d9b5be282f2d3a13049a602e7e86d6ab8130bd073e0fb7 -size 5389837 diff --git a/pipewire-0.3.6.obscpio b/pipewire-0.3.6.obscpio new file mode 100644 index 0000000..018779b --- /dev/null +++ b/pipewire-0.3.6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44f078c3c8640a3ec8931da60094f265221588b319cf37b5cb5ca1c697ca2fdd +size 5608461 diff --git a/pipewire.changes b/pipewire.changes index 02be0ae..a51b86b 100644 --- a/pipewire.changes +++ b/pipewire.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Jun 16 09:04:18 UTC 2020 - Antonio Larrosa + +- Update to version 0.3.6: + * Extensive memory leak fixing and stress testing was done. + A big leak in screen sharing with DMA-BUF was fixed. + * Compile fixes + * Stability improvements in jack and pulseaudio layers. + * Added the old portal module to make the Camera portal + work again. This will be moved to the session manager in + future versions. + * Improvements to the GStreamer source and sink shutdown. + * Fix compatibility with v2 clients again when negotiating + buffers. +- Disable vulkan if the vulkan package is too old (as in + SLE 15 SP0 and SP1) +- Add patch to build with meson >= 0.46.0 since 0.50.0 is not + really needed: + * fix-meson-required-version.patch + ------------------------------------------------------------------- Thu May 21 08:50:18 UTC 2020 - Antonio Larrosa diff --git a/pipewire.obsinfo b/pipewire.obsinfo index 55a73a2..f97ef49 100644 --- a/pipewire.obsinfo +++ b/pipewire.obsinfo @@ -1,5 +1,5 @@ name: pipewire -version: 0.3.5 -mtime: 1589196932 -commit: ba215efed0da8d6c9f3f2414d76a8e2c75352501 +version: 0.3.6 +mtime: 1591782812 +commit: b04552b2522a2cdae9a246be6ed77bb5ae31cda3 diff --git a/pipewire.spec b/pipewire.spec index 4cd5586..8f766aa 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -22,16 +22,21 @@ %global provfind sh -c "grep -v -e 'libpulse.*\\.so' -e 'libjack.*\\.so' | %__find_provides" %global __find_provides %provfind -%define sover 0_3_5 +%define sover 0_3_6 %define apiver 0.3 %define apiver_str 0_3 %define spa_ver 0.2 %define spa_ver_str 0_2 %define libpipewire libpipewire-%{apiver_str}-0 +%if %{pkg_vcmp pkgconfig(vulkan) >= 1.1} +%define with_vulkan 1 +%else +%define with_vulkan 0 +%endif Name: pipewire -Version: 0.3.5 +Version: 0.3.6 Release: 0 Summary: A Multimedia Framework designed to be an audio and video server and more License: MIT @@ -41,6 +46,7 @@ Source0: %{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc Patch0: fix-memfd_create-call.patch Patch1: do-not-use-snd_pcm_ioplug_hw_avail.patch +Patch2: fix-meson-required-version.patch BuildRequires: doxygen BuildRequires: fdupes @@ -254,6 +260,7 @@ This package contains documentation for the PipeWire media server. %if %{pkg_vcmp alsa-devel < 1.2.2} %patch1 -p1 %endif +%patch2 -p1 %build %if %{pkg_vcmp gcc < 8} @@ -265,7 +272,11 @@ export CC=gcc-9 -Dgstreamer=true \ -Dffmpeg=true \ -Dsystemd=true \ +%if %{with_vulkan} -Dvulkan=true \ +%else + -Dvulkan=false \ +%endif -Dtest=true \ -Daudiotestsrc=true \ %{nil} @@ -286,6 +297,11 @@ for wrapper in pw-pulse pw-jack ; do ln -s -f %{_sysconfdir}/alternatives/$wrapper %{buildroot}%{_bindir}/$wrapper done +for manpage in pw-jack pw-pulse ; do + mv %{buildroot}%{_mandir}/man1/$manpage.1 %{buildroot}%{_mandir}/man1/$manpage-%{apiver}.1 + ln -s -f %{_sysconfdir}/alternatives/$manpage.1%{ext_man} %{buildroot}%{_mandir}/man1/$manpage.1%{ext_man} +done + %fdupes -s %{buildroot}/%{_datadir}/doc/pipewire/html %check @@ -295,7 +311,8 @@ done %postun -n %{libpipewire} -p /sbin/ldconfig %post libpulse-%{apiver_str} -%{_sbindir}/update-alternatives --install %{_bindir}/pw-pulse pw-pulse %{_bindir}/pw-pulse-%{apiver} 20 +%{_sbindir}/update-alternatives --install %{_bindir}/pw-pulse pw-pulse %{_bindir}/pw-pulse-%{apiver} 20 \ + --slave %{_mandir}/man1/pw-pulse.1%{ext_man} pw-pulse.1%{ext_man} %{_mandir}/man1/pw-pulse-%{apiver}.1%{ext_man} %postun libpulse-%{apiver_str} if [ ! -e %{_bindir}/pw-pulse-%{apiver} ] ; then @@ -303,7 +320,8 @@ if [ ! -e %{_bindir}/pw-pulse-%{apiver} ] ; then fi %post libjack-%{apiver_str} -%{_sbindir}/update-alternatives --install %{_bindir}/pw-jack pw-jack %{_bindir}/pw-jack-%{apiver} 20 +%{_sbindir}/update-alternatives --install %{_bindir}/pw-jack pw-jack %{_bindir}/pw-jack-%{apiver} 20 \ + --slave %{_mandir}/man1/pw-jack.1%{ext_man} pw-jack.1%{ext_man} %{_mandir}/man1/pw-jack-%{apiver}.1%{ext_man} %postun libjack-%{apiver_str} if [ ! -e %{_bindir}/pw-jack-%{apiver} ] ; then @@ -342,8 +360,11 @@ fi %{_libdir}/pipewire-%{apiver}/jack/libjacknet.so* %{_libdir}/pipewire-%{apiver}/jack/libjackserver.so* %ghost %{_sysconfdir}/alternatives/pw-jack +%ghost %{_sysconfdir}/alternatives/pw-jack.1%{ext_man} %{_bindir}/pw-jack-%{apiver} %{_bindir}/pw-jack +%{_mandir}/man1/pw-jack-%{apiver}.1%{ext_man} +%{_mandir}/man1/pw-jack.1%{ext_man} %files libpulse-%{apiver_str} %license pipewire-pulseaudio/LICENSE @@ -352,8 +373,11 @@ fi %{_libdir}/pipewire-%{apiver}/pulse/libpulse-simple.so* %{_libdir}/pipewire-%{apiver}/pulse/libpulse-mainloop-glib.so* %ghost %{_sysconfdir}/alternatives/pw-pulse +%ghost %{_sysconfdir}/alternatives/pw-pulse.1%{ext_man} %{_bindir}/pw-pulse-%{apiver} %{_bindir}/pw-pulse +%{_mandir}/man1/pw-pulse-%{apiver}.1%{ext_man} +%{_mandir}/man1/pw-pulse.1%{ext_man} %files -n gstreamer-plugin-pipewire %{_libdir}/gstreamer-1.0/libgstpipewire.so @@ -390,6 +414,7 @@ fi %{_libdir}/pipewire-%{apiver}/libpipewire-module-client-node.so %{_libdir}/pipewire-%{apiver}/libpipewire-module-link-factory.so %{_libdir}/pipewire-%{apiver}/libpipewire-module-metadata.so +%{_libdir}/pipewire-%{apiver}/libpipewire-module-portal.so %{_libdir}/pipewire-%{apiver}/libpipewire-module-profiler.so %{_libdir}/pipewire-%{apiver}/libpipewire-module-protocol-native.so %{_libdir}/pipewire-%{apiver}/libpipewire-module-rtkit.so @@ -411,7 +436,9 @@ fi %{_libdir}/spa-%{spa_ver}/support/libspa-support.so %{_libdir}/spa-%{spa_ver}/v4l2/libspa-v4l2.so %{_libdir}/spa-%{spa_ver}/videoconvert/libspa-videoconvert.so +%if %{with_vulkan} %{_libdir}/spa-%{spa_ver}/vulkan/libspa-vulkan.so +%endif %{_libdir}/spa-%{spa_ver}/audiotestsrc/libspa-audiotestsrc.so %{_libdir}/spa-%{spa_ver}/test/libspa-test.so @@ -426,7 +453,9 @@ fi %dir %{_libdir}/spa-%{spa_ver}/support %dir %{_libdir}/spa-%{spa_ver}/v4l2 %dir %{_libdir}/spa-%{spa_ver}/videoconvert +%if %{with_vulkan} %dir %{_libdir}/spa-%{spa_ver}/vulkan +%endif %dir %{_libdir}/spa-%{spa_ver}/audiotestsrc %dir %{_libdir}/spa-%{spa_ver}/test