From bbd965454b303be390f91eb3afe271d2dee6703d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 15 Jan 2020 12:28:22 +0100 Subject: [PATCH] Update to 0.2.91 --- .gitignore | 1 + 0001-protocol-improve-old-version-check.patch | 27 +++++++ pipewire.spec | 72 +++++++++++++++---- sources | 2 +- 4 files changed, 88 insertions(+), 14 deletions(-) create mode 100644 0001-protocol-improve-old-version-check.patch diff --git a/.gitignore b/.gitignore index c85711b..5c12a3d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /0.2.5.tar.gz /0.2.6.tar.gz /pipewire-0.2.7.tar.gz +/pipewire-0.2.91.tar.gz diff --git a/0001-protocol-improve-old-version-check.patch b/0001-protocol-improve-old-version-check.patch new file mode 100644 index 0000000..626e315 --- /dev/null +++ b/0001-protocol-improve-old-version-check.patch @@ -0,0 +1,27 @@ +From 1cedfade3a9ac93f81dbb4230522d7494c7b7ea2 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Wed, 15 Jan 2020 12:24:11 +0100 +Subject: [PATCH] protocol: improve old version check + +Check if the pod size is > 4 because the unit test adds one fd +in the first message. +--- + src/modules/module-protocol-native/connection.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c +index f99f33ed..b5de3063 100644 +--- a/src/modules/module-protocol-native/connection.c ++++ b/src/modules/module-protocol-native/connection.c +@@ -313,7 +313,7 @@ static int prepare_packet(struct pw_protocol_native_connection *conn, struct buf + + if (buf->first) { + buf->first = false; +- if (p[3] != 0) { ++ if (p[3] >= 4) { + pw_log_warn("old version detected"); + impl->version = 0; + impl->hdr_size = 8; +-- +2.24.1 + diff --git a/pipewire.spec b/pipewire.spec index c6bbba1..c1cca49 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,4 +1,4 @@ -%global apiversion 0.2 +%global apiversion 0.3 %global spaversion 0.1 #global snap 20141103 @@ -14,9 +14,9 @@ Name: pipewire Summary: Media Sharing Server -Version: 0.2.7 -Release: 2%{?snap:.%{snap}git%{shortcommit}}%{?dist} -License: LGPLv2+ +Version: 0.2.91 +Release: 1%{?snap:.%{snap}git%{shortcommit}}%{?dist} +License: MIT URL: https://pipewire.org/ %if 0%{?gitrel} # git clone git://anongit.freedesktop.org/gstreamer/pipewire @@ -27,6 +27,7 @@ Source0: https://github.com/PipeWire/pipewire/archive/%{version}/pipewire-%{vers %endif ## upstream patches +Patch0: 0001-protocol-improve-old-version-check.patch ## upstreamable patches @@ -67,7 +68,7 @@ systems. %package libs Summary: Libraries for PipeWire clients -License: LGPLv2+ +License: MIT Recommends: %{name}%{?_isa} = %{version}-%{release} %description libs @@ -76,7 +77,7 @@ to interface with a PipeWire media server. %package devel Summary: Headers and libraries for PipeWire client development -License: LGPLv2+ +License: MIT Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel Headers and libraries for developing applications that can communicate with @@ -84,25 +85,54 @@ a PipeWire media server. %package doc Summary: PipeWire media server documentation -License: LGPLv2+ +License: MIT %description doc This package contains documentation for the PipeWire media server. %package utils Summary: PipeWire media server utilities -License: LGPLv2+ +License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description utils This package contains command line utilities for the PipeWire media server. +%package alsa +Summary: PipeWire media server ALSA support +License: MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description alsa +This package contains an ALSA plugin for the PipeWire media server. + +%package jack +Summary: PipeWire media server JACK support +License: MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description jack +This package contains a JACK library for the PipeWire media server. + +%package pulseaudio +Summary: PipeWire media server PulseAudio support +License: MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description pulseaudio +This package contains a PulseAudio library for the PipeWire media server. + %prep %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}} +%patch0 -p1 -b .0000 + %build -%meson -D docs=true -D man=true -D gstreamer=enabled -D systemd=true +%meson -D docs=true -D man=true -D gstreamer=true -D systemd=true %meson_build %install @@ -123,13 +153,14 @@ exit 0 %ldconfig_scriptlets libs %files -%license LICENSE GPL LGPL -%doc README +%license LICENSE COPYING +%doc README.md %if 0%{?systemd} %{_userunitdir}/pipewire.* %{_userunitdir}/sockets.target.wants/pipewire.socket %endif %{_bindir}/pipewire +%{_bindir}/pipewire-media-session %{_libdir}/pipewire-%{apiversion}/ %{_mandir}/man1/pipewire.1* %dir %{_sysconfdir}/pipewire/ @@ -137,8 +168,8 @@ exit 0 %{_mandir}/man5/pipewire.conf.5* %files libs -%license LICENSE GPL LGPL -%doc README +%license LICENSE COPYING +%doc README.md %{_libdir}/gstreamer-1.0/libgstpipewire.* %{_libdir}/libpipewire-%{apiversion}.so.* %{_libdir}/spa/ @@ -156,12 +187,27 @@ exit 0 %files utils %{_bindir}/pipewire-monitor %{_bindir}/pipewire-cli +%{_bindir}/pipewire-dot %{_mandir}/man1/pipewire-monitor.1* %{_mandir}/man1/pipewire-cli.1* %{_bindir}/spa-monitor %{_bindir}/spa-inspect +%files alsa +%{_libdir}/alsa-lib/libasound_module_pcm_pipewire.so + +%files jack + +%files pulseaudio + + %changelog +* Wed Jan 15 2020 Wim Taymans - 0.2.91-1 +- Update to 0.2.91 + +* Mon Jan 13 2019 Wim Taymans - 0.2.90-1 +- Update to 0.2.90 + * Thu Nov 28 2019 Kalev Lember - 0.2.7-2 - Move spa plugins to -libs subpackage diff --git a/sources b/sources index bae961b..3ebea24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pipewire-0.2.7.tar.gz) = 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334 +SHA512 (pipewire-0.2.91.tar.gz) = 8928082b61e9f85368e9fbb15e21236f37807d6768ec950e7ad2384463f7a08b9d87f11f321d748a134b31363d03317e55d6de02a1943fd19e0f1f4eb0fb686a